1. 客户端订单支持活动赔款特别显示

2. 快递采用老的处理方式-本地处理

app/admin/controller/order/StoreOrder.php

@@ -318,14 +318,15 @@ class StoreOrder extends AuthController
      * */
     public function order_goods($id = 0)
     {
-//        $list = Express::where('is_show', 1)->order('sort desc')->column('name', 'id');
-        try {
-            $list = ExpressService::init()->express(1, 1, 1000);
-        } catch (\Throwable $e) {
-            $list = [];
-        }
+        $list = Express::where('is_show', 1)->order('sort desc')->field('name', 'id')->select();
+        // try {
+        //     $list = ExpressService::init()->express(1, 1, 1000);
+        // } catch (\Throwable $e) {
+        //     echo $e;
+        //     $list = [];
+        // }
         $this->assign([
-            'list' => $list['data'] ?? [],
+            'list' => $list,
             'id' => $id
         ]);
         return $this->fetch();

app/admin/view/order/store_order/index.php

@@ -195,11 +195,16 @@
                                      src="{{item.cart_info.productInfo.attrInfo.image}}">
                                 </a>
                             </span>
-                            {{# if(item.result == 1) { }}
-                            <span style="color:forestgreen">{{item.cart_info.productInfo.store_name}}&nbsp;{{item.cart_info.productInfo.attrInfo.suk}}</span>
+                            {{# if(item.activity && item.result == 1) { }}
+                            <span style="color:red">{{item.cart_info.productInfo.store_name}}&nbsp;{{item.cart_info.productInfo.attrInfo.suk}}</span>
                             <span style="color:black"> | ￥{{item.cart_info.truePrice}}×{{item.cart_info.cart_num}}</span>
                             <span>| {{item.mine ? '已' : '未' }}启动</span>
-                            <span style="color:red"> | 赔付 ￥{{ item.reparation }}</span>
+                            <span style="color:red"> | 已赔付 ￥{{ item.reparation }}</span>
+                            {{# } else if (!item.activity) { }}
+                            <span style="color:blue">{{item.cart_info.productInfo.store_name}}&nbsp;{{item.cart_info.productInfo.attrInfo.suk}}</span>
+                            <span style="color:black"> | ￥{{item.cart_info.truePrice}}×{{item.cart_info.cart_num}}</span>
+                            <span>| {{item.mine ? '已' : '未' }}启动</span>
+                            <span style="color:blue">未统计</span>
                             {{# }else{ }}
                             <span>{{item.cart_info.productInfo.store_name}}&nbsp;{{item.cart_info.productInfo.attrInfo.suk}}</span>
                             <span> | ￥{{item.cart_info.truePrice}}×{{item.cart_info.cart_num}}</span>

app/api/controller/order/StoreOrderController.php

@@ -486,7 +486,7 @@ class StoreOrderController
 //        if (!$result) {
         if (true) {
             try {
-                $result = ExpressService::query($order['delivery_id'], $order['delivery_name']);
+                $result = ExpressService::oldquery($order['delivery_id'], $order['delivery_name']);
             } catch (\Throwable $e) {
                 $result = [];
             }

app/models/store/StoreOrder.php

@@ -915,15 +915,20 @@ class StoreOrder extends BaseModel
     public static function tidyOrder($order, $detail = false, $isPic = false)
     {
         if ($detail == true && isset($order['id'])) {
-            $cartInfo = StoreOrderCartInfo::where('oid', $order['id'])->column('cart_info', 'unique') ?: [];
+            $cartInfo = StoreOrderCartInfo::where('oid', $order['id'])->column('*', 'unique') ?: [];
             $info = [];
             foreach ($cartInfo as $k => $cart) {
-                $cart = json_decode($cart, true);
-                $cart['unique'] = $k;
+                $cart_info = json_decode($cart['cart_info'], true);
+                $cart_info['unique'] = $k;
+
                 //新增是否评价字段
-                $cart['is_reply'] = StoreProductReply::where('unique', $k)->count();
-                array_push($info, $cart);
-                unset($cart);
+                $cart_info['is_reply'] = StoreProductReply::where('unique', $k)->count();
+                $cart_info['activity'] = $cart['activity'];
+                $cart_info['result'] = $cart['result'];
+                $cart_info['reparation'] = floatval($cart['reparation']);
+                $cart_info['mine'] = $cart['mine'];
+                array_push($info, $cart_info);
+                unset($cart_info);
             }
             $order['cartInfo'] = $info;
         }