手机号脱敏

app/admin/controller/order/DishesController.php

@@ -40,6 +40,7 @@ class DishesController extends Curd{
         // $where['order_category'] = 'DISHES';
         if (!empty($where['order_status_system']) && in_array($where['order_status_system'], ['PENDING', 'WAITING', 'SENDING', 'RECVING', 'SIGNED', 'CONFIRM'])) {
             $where['order_is_complete'] = 'N';
+            $where['order_category'] = ['<>','RETURN'];
         }
 
         // if (!empty($where['order_status_system']) && $where['order_status_system'] == 'RETURN') {

app/admin/controller/order/GoodsController.php

@@ -39,6 +39,9 @@ class GoodsController extends Curd{
         $field = $field ?? 'order_addtimes';
         // $where['pay_detail.pay_category'] = 'GOODS';
         if (!empty($where['order_status_system']) && in_array($where['order_status_system'], ['PENDING', 'WAITING', 'SENDING', 'RECVING', 'SIGNED', 'CONFIRM'])) {
+            if ($where['order_status_system'] == 'SENDING'){
+                $where['order_express.order_express_type'] = '配送';
+            }
             $where['order_is_complete'] = 'N';
         }
 
@@ -76,6 +79,13 @@ class GoodsController extends Curd{
                 }
             }
         // }
+        
+        // 自提订单        
+        if (!empty($where['order_status_system']) && $where['order_status_system'] == 'PICKUP'){
+            $where['order_is_complete'] = 'N';
+            $where['order_status_system'] = 'SENDING';
+            $where['order_express.order_express_type'] = '自提';
+        }
 
         $query = $this->doSelect($where, $field, $order);
         return $this->doFormat($query, $format, $limit);
@@ -100,10 +110,11 @@ class GoodsController extends Curd{
 //                }
 //                $query->select('orders_return_id', 'join_return_order_id', 'order_return_status');
 //            },
-            'express' => function ($query) {
-                $query->select('join_express_order_id', 'order_express_type');
-            }
-        ])->leftJoin('order_return','order_return.join_return_order_id','=','order.order_id');
+            // 'express' => function ($query) {
+            //     $query->select('join_express_order_id', 'order_express_type');
+            // }
+        ])->leftJoin('order_return','order_return.join_return_order_id','=','order.order_id')
+        ->leftJoin('order_express','order_express.join_express_order_id','=','order.order_id');
         // ->leftJoin('order_sheet','join_sheet_order_id','=','order.order_id');
         foreach ($where as $column => $value) {
             if (is_array($value)) {
@@ -137,7 +148,7 @@ class GoodsController extends Curd{
         if ($field) {
             $model = $model->orderBy($field, $order);
         }
-        $model = $model->select('order.*','order_return.orders_return_id', 'order_return.join_return_order_id', 'order_return.order_return_status','order_return.order_return_apply_json','order_return.order_return_remark');
+        $model = $model->select('order.*','order_express.join_express_order_id','order_express.order_express_type','order_return.orders_return_id', 'order_return.join_return_order_id', 'order_return.order_return_status','order_return.order_return_apply_json','order_return.order_return_remark');
         return $model;
     }
 
@@ -165,6 +176,13 @@ class GoodsController extends Curd{
                     'order_return_remark'=>$item['order_return_remark']
                 ];
             }
+            if (isset($item['join_express_order_id'])){
+                $item['express'] = [
+                    'join_express_order_id'=>$item['join_express_order_id'],
+                    'order_express_type'=>$item['order_express_type']
+                ];
+                unset($item['join_express_order_id'],$item['order_express_type']);
+            }
         }
 
         return $items;

app/admin/controller/order/ServicesController.php

@@ -40,6 +40,7 @@ class ServicesController extends Curd{
         // $where['order_category'] = ['in','SERVICE,CHNMED,CHNNCD'];
         if (!empty($where['order_status_system']) && in_array($where['order_status_system'], ['PENDING', 'WAITING', 'SENDING', 'RECVING', 'SIGNED', 'CONFIRM'])) {
             $where['order_is_complete'] = 'N';
+            $where['order_category'] = ['<>','RETURN'];
         }
 
         // if (!empty($where['order_status_system']) && $where['order_status_system'] == 'RETURN') {

app/admin/controller/order/WholeController.php

@@ -73,6 +73,9 @@ class WholeController extends Curd
         $order = $request->get('order', 'desc');
         $field = $field ?? 'order_addtimes';
         if (!empty($where['order_status_system']) && in_array($where['order_status_system'], ['PENDING', 'WAITING', 'SENDING', 'RECVING', 'SIGNED', 'CONFIRM'])) {
+            if ($where['order_status_system'] == 'SENDING'){
+                $where['order_express.order_express_type'] = '配送';
+            }
             $where['order_is_complete'] = 'N';
             $where['order_category'] = isset($where['order_category']) ? $where['order_category'] : ['in','SYSTEM,NORMAL,DISHES'];
         }
@@ -115,6 +118,12 @@ class WholeController extends Curd
             // 充值订单不显示
             $where['order_category'] = ['<>','RECHARGE'];
         }
+        // 自提订单        
+        if (!empty($where['order_status_system']) && $where['order_status_system'] == 'PICKUP'){
+            $where['order_is_complete'] = 'N';
+            $where['order_status_system'] = 'SENDING';
+            $where['order_express.order_express_type'] = '自提';
+        }
 
         $query = $this->doSelect($where, $field, $order);
         return $this->doFormat($query, $format, $limit);
@@ -139,10 +148,11 @@ class WholeController extends Curd
 //                }
 //                $query->select('orders_return_id', 'join_return_order_id', 'order_return_status');
 //            },
-            'express' => function ($query) {
-                $query->select('join_express_order_id', 'order_express_type');
-            }
-        ])->leftJoin('order_return','order_return.join_return_order_id','=','order.order_id');
+            // 'express' => function ($query) {
+            //     $query->select('join_express_order_id', 'order_express_type');
+            // }
+        ])->leftJoin('order_return','order_return.join_return_order_id','=','order.order_id')
+        ->leftJoin('order_express','order_express.join_express_order_id','=','order.order_id');
         // ->leftJoin('order_sheet','join_sheet_order_id','=','order.order_id');
         foreach ($where as $column => $value) {
             if (is_array($value)) {
@@ -176,7 +186,7 @@ class WholeController extends Curd
         if ($field) {
             $model = $model->orderBy($field, $order);
         }
-        $model = $model->select('order.*','order_return.orders_return_id', 'order_return.join_return_order_id', 'order_return.order_return_status','order_return.order_return_apply_json','order_return.order_return_remark');
+        $model = $model->select('order.*','order_express.join_express_order_id','order_express.order_express_type','order_return.orders_return_id', 'order_return.join_return_order_id', 'order_return.order_return_status','order_return.order_return_apply_json','order_return.order_return_remark');
         return $model;
     }
 
@@ -204,6 +214,13 @@ class WholeController extends Curd
                     'order_return_remark'=>$item['order_return_remark']
                 ];
             }
+            if (isset($item['join_express_order_id'])){
+                $item['express'] = [
+                    'join_express_order_id'=>$item['join_express_order_id'],
+                    'order_express_type'=>$item['order_express_type']
+                ];
+                unset($item['join_express_order_id'],$item['order_express_type']);
+            }
         }
 
         return $items;

app/admin/service/member/MemberService.php

@@ -77,6 +77,7 @@ class MemberService
             ->toArray();
 
         foreach ($rows as &$row) {
+            $row['member_mobile'] = substr($row['member_mobile'],0,3).'****'.substr($row['member_mobile'],7);
             $row['info'] = [
                 'member_info_nickname' => !empty($row['member_info_nickname']) ? $row['member_info_nickname'] : substr($row['member_mobile'],-4,4).'用户',
                 'member_info_headimg' => !empty($row['member_info_headimg']) ? $row['member_info_headimg'] : ''
@@ -701,7 +702,7 @@ class MemberService
                 'member_is_owner' => $params['is_owner'],
                 'member_classify' => $params['member_classify'],
                 'member_status' => $params['status'],
-                'member_mobile' => $params['mobile'],
+                // 'member_mobile' => $params['mobile'],
 //                'member_from' => $params['source'],
                 'member_extend_json' => json_encode($extendJson)
             ];

app/admin/validate/member/MemberValidate.php

@@ -16,7 +16,7 @@ class MemberValidate extends Validate
         // 'birth|生日' => 'require',
         // 'gender|性别' => 'require',
         // 'status|状态' => 'require|in:ACTIVED,DISABLED',
-        'mobile|手机号' => 'mobile',
+        // 'mobile|手机号' => 'mobile',
         // 'addr|具体地址' => 'require',
         // 'cert_name证件姓名' => 'require',
         'cert_nbr|身份证号' => 'idCard',