1

app/api/controller/Goods.php

@@ -113,7 +113,8 @@ class Goods extends Controller
                     $data = $suning->shoppingCartPrice([$goods->toArray()], $city->sn_code, $district->sn_code);
                     $data['goods_name'] = $goods['goods_name'];
                     $data['goods_id'] = $goods['goods_id'];
-                    $data['promise_info'] = "预计".(GoodsDeliveryTime::data()[$goods['delivery_time']] ?? "72小时")."内发货";
+                    //$data['promise_info'] = "预计".(GoodsDeliveryTime::data()[$goods['delivery_time']] ?? "72小时")."内发货";
+                    $data['promise_info'] = "预计48小时内发货";
                     break;
                 case 'jd':
                 case 'jd1':
@@ -136,7 +137,8 @@ class Goods extends Controller
                         'state' => $res,
                         'goods_name' => $goods['goods_name'],
                         'goods_id' => $goods['goods_id'],
-                        'promise_info' => $ret['promiseInfo'] ?? "预计72小时内发货",
+                        //'promise_info' => $ret['promiseInfo'] ?? "预计72小时内发货",
+                        'promise_info' => "预计48小时内发货",
                     ];
                     break;
                 default:

app/store/model/Order.php

@@ -110,7 +110,8 @@ class Order extends OrderModel
             $filter[] = ['user.user_id', '=', $param['user_id']];
         }
         if (!empty($param['delivery_type'])) {
-            $filter[] = ['order.delivery_type', '=', DeliveryType::EXPRESS];
+            //$filter[] = ['order.delivery_type', '=', DeliveryType::EXPRESS];
+            $filter[] = ['order.delivery_type', '=', $param['delivery_type']];
         }
         $filterOr = [];
         if (!empty($param['searchValue']) && $param['searchType'] == 'all') {
@@ -360,17 +361,18 @@ class Order extends OrderModel
      */
     public function updateRemark(array $data): bool
     {
-        $data = [];
+        $data1 = [];
         if (isset($data['content']) && $data['content']) {
-            $data['merchant_remark'] = $data['content'];
+            $data1['merchant_remark'] = $data['content'];
         }
         if (isset($data['jd_link']) && $data['jd_link']) {
-            $data['jd_link'] = $data['jd_link'];
+            $data1['jd_link'] = $data['jd_link'];
         }
-        if (!$data) {
+       
+        if (!$data1) {
             return true;
         }
-        return $this->save($data);
+        return $this->save($data1);
     }
 
     /**