edit

app/goods/database/card_code.php

@@ -1,10 +1,11 @@
 <?php
 $status = array
 (
-    1 => '未兑换',
-    2 => '已使用',
-    3 => '已完成',
-    4 => '已过期',
+    1 => '已生成',
+    2 => '未兑换',
+    3 => '已使用',
+    4 => '已完成',
+    5 => '已过期',
 );
 
 return array

app/mshop/src/Data.php

@@ -134,7 +134,7 @@ class Data extends Core
             if ($info['pay_method'] == 3 && $info['card_code_id']) {
                 # 更新礼品卡状态
                 $card_update['where_id'] = $info['card_code_id'];
-                $card_update['status'] = 3;
+                $card_update['status'] = 4;
                 Dever::db('goods/card_code')->update($card_update);
             }
             return 'ok';

app/shop/lib/Sell.php

@@ -463,12 +463,27 @@ class Sell
                 Dever::alert('卡号/密码错误');
             }
             if (time() > $data['card']['edate']) {
+                # 更新礼品卡状态
+                $card_update['where_id'] = $data['card']['id'];
+                $card_update['uid'] = $data['uid'];
+                $card_update['shop_id'] = $data['shop']['id'];
+                $card_update['status'] = 5;
+                Dever::db('goods/card_code')->update($card_update);
                 Dever::alert('礼品卡已失效');
             }
             $card_info = Dever::db('goods/card')->find($data['card']['card_id']);
             if (!$card_info) {
                 Dever::alert('卡号/密码错误');
             }
+
+            # 更新礼品卡状态
+            $card_update['where_id'] = $data['card']['id'];
+            $card_update['status'] = 2;
+            $card_update['uid'] = $data['uid'];
+            $card_update['shop_id'] = $data['shop']['id'];
+            $card_update['ddate'] = time();
+            Dever::db('goods/card_code')->update($card_update);
+
             $goods = Dever::array_decode($card_info['goods']);
 
             $goods_id = array();
@@ -641,11 +656,8 @@ class Sell
             if ($card) {
                 # 更新礼品卡状态
                 $card_update['where_id'] = $card['id'];
-                $card_update['status'] = 2;
-                $card_update['uid'] = $uid;
-                $card_update['shop_id'] = $shop['id'];
+                $card_update['status'] = 3;
                 $card_update['order_id'] = $id;
-                $card_update['ddate'] = time();
                 Dever::db('goods/card_code')->update($card_update);
             }
         	return array