commit

app/admin/model/order/StoreOrder.php

@@ -158,9 +158,9 @@ class StoreOrder extends BaseModel
                 $item['status_name'] = '待收货';
             } else if ($item['paid'] == 1 && $item['status'] == 1 && $item['shipping_type'] == 2 && $item['refund_status'] == 0) {
                 $item['status_name'] = '未核销';
-            } else if ($item['paid'] == 1 && $item['status'] == 2 && $item['refund_status'] == 0) {
-                $item['status_name'] = '待评价';
-            } else if ($item['paid'] == 1 && $item['status'] == 3 && $item['refund_status'] == 0) {
+            } else if ($item['paid'] == 1 && $item['status'] == 2 && $item['refund_status'] == 0 && $item['use'] == 0) {
+                $item['status_name'] = '未使用';
+            } else if ($item['paid'] == 1 && $item['status'] == 3 && $item['refund_status'] == 0 && $item['use'] == 1) {
                 $item['status_name'] = '已完成';
             } else if ($item['paid'] == 1 && $item['refund_status'] == 1) {
                 $refundReasonTime = date('Y-m-d H:i', $item['refund_reason_time']);

app/api/controller/admin/StoreOrderController.php

@@ -504,7 +504,7 @@ class StoreOrderController
             $res = $coupon->save();
             $pon = StoreCouponUser::where('order_id', $coupon['order_id'])->where('code', '<>', $verify_code)->where('status', 0)->select();
             if (count($pon) == 0){
-                StoreOrder::where('order_id', $coupon['order_id'])->update(['use' => 1]);
+                StoreOrder::where('order_id', $coupon['order_id'])->update(['use' => 1, 'status' => 3]);
             }
             StoreCouponUser::commitTrans();
             if ($res) return app('json')->success('核销成功');

app/models/store/StoreOrder.php

@@ -822,6 +822,9 @@ class StoreOrder extends BaseModel
             }
             if ($product['id'] == 1){
                 // 如果是2999礼包
+                $order['status'] = 3;
+                $order['use'] = 1;
+                $order->save();
                 if ($user['spread_uid']) self::superior_push($user['spread_uid']);
                 if ($user['level'] < 2) $user['level'] = 2;
             }else if ($product['id'] = 2){
@@ -1144,7 +1147,7 @@ class StoreOrder extends BaseModel
             $status['_title'] = '待评价';
             $status['_msg'] = '已收货,快去评价一下吧';
             $status['_class'] = 'state-ypj';
-        } else if ($order['use'] == 1) {
+        } else if ($order['status'] == 3) {
             $status['_type'] = 4;
             $status['_title'] = '交易完成';
             $status['_msg'] = '交易完成,感谢您的支持';