合并分支 'Branch_liuzhen' 到 'master'

Branch liuzhen



查看合并请求 !157

@@ -129,6 +129,14 @@ class Litestoreorder extends Model
                 $item['sku_image'] = $item['spec']['spec_image']=='' ? '' : cdnurl($item['spec']['spec_image'], true);
                 $goodsList[] = $item;
             }
+            // 判断状态
+            if($v['pay_status'] == '10' && $v['order_status'] == '10') {
+                $v['status'] = 1;
+            } elseif($v['pay_status'] == '20' && $v['order_status'] == '10') {
+                $v['status'] = 2;
+            } elseif($v['pay_status'] == '20' && $v['order_status'] == '30') {
+                $v['status'] = 3;
+            }
             $v['goods'] = $goodsList;
         }
         return $list;
@@ -142,6 +150,14 @@ class Litestoreorder extends Model
         ], ['goods'=>['spec','goods']])) {
             throw new BaseException(['msg' => '订单不存在']);
         }
+        // 判断状态
+        if($order['pay_status'] == '10' && $order['order_status'] == '10') {
+            $order['status'] = 1;
+        } elseif($order['pay_status'] == '20' && $order['order_status'] == '10') {
+            $order['status'] = 2;
+        } elseif($order['pay_status'] == '20' && $order['order_status'] == '30') {
+            $order['status'] = 3;
+        }
         $goodsList = [];
         foreach ($order['goods'] as $index => $item) {
             $item['image'] = cdnurl(explode(",",$item['images'])[0], true);

@@ -614,6 +614,7 @@ class Goods extends Api
         "total_price": "3299.00", //商品总价
         "pay_price": "3299.00", //实际支付金额
         "pay_status": "10", //支付状态:10=未支付,20=已支付
+        "status": "1", //订单状态:1=待付款,2=待使用,3=已完成
         "pay_time": 0, //支付事件
         "express_price": "0.00",
         "express_company": "",
@@ -680,6 +681,7 @@ class Goods extends Api
             "total_price": "订单金额", //订单金额
             "pay_price": "3299.00",
             "pay_status": "支付状态10=未支付20=已支付",
+            "status": "1", //订单状态:1=待付款,2=待使用,3=已完成
             "pay_time": 0,
             "order_status": "订单状态10=进行中20=取消30=已完成",
             "transaction_id": "",