rabin 3 år sedan
förälder
incheckning
f5a3ef2aac
3 ändrade filer med 36 tillägg och 16 borttagningar
  1. 9 0
      service/agent/database/order_cash.php
  2. 6 0
      service/agent/lib/Manage.php
  3. 21 16
      service/agent/lib/Order.php

+ 9 - 0
service/agent/database/order_cash.php

@@ -100,6 +100,15 @@ return array
             'match'     => 'is_numeric',
         ),
 
+        'goods'      => array
+        (
+            'type'      => 'text-255',
+            'name'      => '奖励的权益',
+            'default'   => '',
+            'desc'      => '奖励的权益',
+            'match'     => 'is_string',
+        ),
+
         'state'     => array
         (
             'type'      => 'tinyint-1',

+ 6 - 0
service/agent/lib/Manage.php

@@ -670,6 +670,9 @@ class Manage
                     if (isset($t['prize_id'])) {
                         $insert['prize_id'] = $t['prize_id'];
                     }
+                    if (isset($t['goods'])) {
+                        $insert['goods'] = Dever::array_encode($t['goods']);
+                    }
                     Dever::db('agent/order_cash')->insert($insert);
                 } else {
                     $update['where_id'] = $info['id'];
@@ -678,6 +681,9 @@ class Manage
                     if (isset($t['prize_id'])) {
                         $update['prize_id'] = $t['prize_id'];
                     }
+                    if (isset($t['goods'])) {
+                        $update['goods'] = Dever::array_encode($t['goods']);
+                    }
                     Dever::db('agent/order_cash')->update($update);
                 }
 

+ 21 - 16
service/agent/lib/Order.php

@@ -984,20 +984,7 @@ class Order
                                     $prize_goods = Dever::db('setting/prize_goods')->select(array('prize_id' => $parent_prize['id']));
                                     if ($prize_goods) {
                                         foreach ($prize_goods as $pk => $pv) {
-                                            if ($pv['type'] == 1) {
-                                                $goods_info = Dever::load('goods/lib/info')->getInfoBySku($pv['type_id'], $pv['sku_id']);
-                                                if (isset($goods_info['sku'])) {
-                                                    $sku = '-' . $goods_info['sku']['string'];
-                                                } else {
-                                                    $sku = '';
-                                                }
-                                                $prize_goods[$pk]['name'] = '<a style="color:blue">' . $goods_info['name'] . $sku . '</a>';
-                                            } elseif ($pv['type'] == 2) {
-                                                $card = Dever::db('card/info')->find($pv['type_id']);
-                                                $pv['price'] = round($info['price']*($pv['num']/100), 2);
-                                                $prize_goods[$pk]['name'] = '<a style="color:blue">' . $pv['price'] . '元' . $card['name'] . '</a>';
-                                                $prize_goods[$pk]['num'] = $pv['num'] . '%';
-                                            }
+                                            $param['goods'][] = $pv;
                                         }
                                     }
 
@@ -1065,13 +1052,31 @@ class Order
             if ($order_cash['prize_id'] && $order_cash['prize_id'] > 0) {
                 $prize = Dever::db('setting/prize')->find($order_cash['prize_id']);
             }
+
+            if ($order_cash['goods'] && $order_cash['goods'] > 0) {
+                $param['goods'] = Dever::array_decode($order_cash['goods']);
+            }
         }
 
         if (isset($prize) && $prize) {
             $table['body'][] = array('赠送名额', $parent_info['name'], $parent_info['mobile'], $parent_role['name'], $parent_level['name'], '1', $prize['name']);
         }
-        if (isset($prize_goods)) {
-            foreach ($prize_goods as $pv) {
+        if (isset($param['goods'])) {
+            foreach ($param['goods'] as $pv) {
+                if ($pv['type'] == 1) {
+                    $goods_info = Dever::load('goods/lib/info')->getInfoBySku($pv['type_id'], $pv['sku_id']);
+                    if (isset($goods_info['sku'])) {
+                        $sku = '-' . $goods_info['sku']['string'];
+                    } else {
+                        $sku = '';
+                    }
+                    $pv['name'] = '<a style="color:blue">' . $goods_info['name'] . $sku . '</a>';
+                } elseif ($pv['type'] == 2) {
+                    $card = Dever::db('card/info')->find($pv['type_id']);
+                    $pv['price'] = round($info['price']*($pv['num']/100), 2);
+                    $pv['name'] = '<a style="color:blue">' . $pv['price'] . '元' . $card['name'] . '</a>';
+                    $pv['num'] = $pv['num'] . '%';
+                }
                 $table['body'][] = array('赠送权益', $parent_info['name'], $parent_info['mobile'], $parent_role['name'], $parent_level['name'], $pv['num'], $pv['name']);
             }
         }