diff --git a/app/api/lists/order/CartList.php b/app/api/lists/order/CartList.php index def9aa0ce..30bde717d 100644 --- a/app/api/lists/order/CartList.php +++ b/app/api/lists/order/CartList.php @@ -65,14 +65,15 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists ->toArray(); $off_activity = Config::where('name', 'off_activity')->value('value'); $user_ship = User::where('id', $userId)->value('user_ship'); + $field='product_id,image,price,cost,store_name,unit,delete_time,vip_price'; if (in_array($user_ship, [4, 5, 6, 7])) { - $off_activity=1; + $field='product_id,image,cost price,cost,store_name,unit,delete_time,vip_price'; } $this->user_ship=$user_ship; $this->off_activity=$off_activity; foreach ($list as $key => &$item) { $find = StoreBranchProduct::where(['product_id' => $item['product_id'], 'store_id' => $item['store_id']]) - ->field('product_id,image,price,cost,store_name,unit,delete_time,vip_price') + ->field($field) ->withTrashed() ->find(); diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php index f1a8e3126..a12126843 100644 --- a/app/api/lists/product/ProductLists.php +++ b/app/api/lists/product/ProductLists.php @@ -95,7 +95,7 @@ class ProductLists extends BaseApiDataLists implements ListsSearchInterface, Lis if ($uid>0) { $user_ship = User::where('id', $uid)->value('user_ship'); if (in_array($user_ship, [4, 5, 6, 7])) { - $off_activity = 1; + $fields = 'id,product_id,cate_id,store_name,cost,store_id,vip_price,purchase,cost price,bar_code,image,sales,store_info,delete_time,unit,batch,top_cate_id,two_cate_id,stock'; } } $this->off_activity = $off_activity; diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index ad7de5414..ef06cc7a0 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -276,7 +276,7 @@ class OrderLogic extends BaseLogic $_order['uid'] = $uid; $_order['spread_uid'] = $params['spread_uid'] ?? 0; $_order['real_name'] = $user['real_name'] ?? ''; - $_order['mobile'] = $user['mobile'] ?? ''; + $_order['user_phone'] = $user['mobile'] ?? ''; $_order['pay_type'] = $orderInfo['order']['pay_type']; $_order['verify_code'] = $verify_code; $_order['reservation_time'] = null;