rabin 2 years ago
parent
commit
d4db8f013d

+ 1 - 0
app/card/src/Api.php

@@ -187,6 +187,7 @@ class Api extends Core
                 $agent = Dever::db('agent/member_goods')->find($where);
                 if ($agent) {
                     Dever::db('agent/member_goods')->update(array('where_id' => $agent['id'], 'sell_num' => $agent['total_num']));
+                    Dever::load('agent/lib/member_set')->log($agent['mid'], '', $agent['type'], $agent['type_id'], $agent['sku_id'], 1, $agent['total_num'], 0, $agent['name'], '礼品卡' . $data['card'] . '已兑换,兑换人手机号:' . $this->user['mobile']);
                 }
             }
         }

+ 0 - 7
service/agent/database/member_goods.php

@@ -9,13 +9,6 @@ $type = array
     3 => '名额',
 );
 
-$import = array
-(
-    1 => '最新系统',
-    2 => 'v2旧系统导入',
-    3 => 'v1旧系统导入',
-);
-
 $button = array();
 $info = '';
 

+ 1 - 1
service/agent/lib/Manage.php

@@ -800,7 +800,7 @@ class Manage
         } elseif ($type == 2) {
             $code = Dever::db('card/code')->find($sku_id);
             $card = Dever::db('card/info')->find($code['card_id']);
-            return array('name' => $card['name'] . '('.$type_id.')', 'price' => $code['total_cash']);
+            return array('name' => $card['name'] . '('.$type_id.') <br /> ' . $code['card'], 'price' => $code['total_cash']);
         } elseif ($type == 3) {
             $prize = Dever::db('setting/prize')->find($type_id);
 

+ 3 - 3
service/agent/lib/Tool.php

@@ -358,7 +358,7 @@ class Tool
     }
 
     # 生成权益
-    private function createGoods($member, $num, $type, $type_id, $sku_id, $time = '', $name = '', $price = 0)
+    private function createGoods($member, $num, $type, $type_id, $sku_id, $time = '', $name = '', $set_pirce = 0)
     {
         # 生成新的权益
         $desc = '发放权益';
@@ -402,8 +402,8 @@ class Tool
             if (!$card) {
                 return;
             }
-            if ($price > 0) {
-                $card['value'] = $price;
+            if ($set_pirce > 0) {
+                $card['value'] = $set_pirce;
             }
             $name = $card['name'];
             if ($card['create_type'] == 2) {