完善

app/admin/controller/member/MemberController.php

@@ -53,7 +53,7 @@ class MemberController
             if (empty($value)){
                 $value = $item->member_mobile;
             }
-            $value = 
+            $value = rtrim($value,'-');
             $data[] = [
                 'key' => $item->member_id,
                 'value' => $value,

app/admin/controller/order/WholeController.php

@@ -1617,20 +1617,22 @@ class WholeController extends Curd
                 $params['order_express_extend_json'] = json_encode(['pick_code'=>random_string(4,'number')]);
 
                 $this->saveExpress($params);
-            } 
-            // else if ($params['delivery'] == 'ARRIVAL') {
-            //     $premises = SysDept::where('dept_name', $params['dept_premises_id'])->first();
-            //     $params['order_express_type'] = '到店';
-            //     if (!$premises) {
-            //         throw new BusinessException('门店不存在');
-            //     }
+            } else if ($params['delivery'] == 'ARRIVAL') {
+                $premises = SysDept::where('dept_name', $params['dept_premises_id'])->first();
+                $params['order_express_type'] = '到店';
+                if (isset($params['submit_goods_classify']) && $params['submit_goods_classify'] == 'MEALS'){
+                    $params['order_express_type'] = '到店吃';
+                }
+                if (!$premises) {
+                    throw new BusinessException('门店不存在');
+                }
 
-            //     $params['order_express_city'] = $premises->dept_city;
-            //     $params['order_express_address'] = $premises->dept_address;
-            //     $params['order_express_telephone'] = $premises->dept_telephone;
+                $params['order_express_city'] = $premises->dept_city;
+                $params['order_express_address'] = $premises->dept_address;
+                $params['order_express_telephone'] = $premises->dept_telephone;
 
-            //     $this->saveExpress($params);
-            // }
+                $this->saveExpress($params);
+            }
 
             // 买的单个服务
             // $writeOffDate = [];