完善

app/admin/controller/marketing/DeptPremisesController.php

@@ -6,10 +6,12 @@ use app\admin\service\sys_manage\DeptService;
 use app\admin\validate\sys_manage\DeptValidate;
 use app\controller\Curd;
 use app\model\SysDept;
+use app\model\SysUser;
 use support\Db;
 use support\exception\BusinessException;
 use support\Request;
 use support\Response;
+use Tinywan\Jwt\JwtToken;
 
 class DeptPremisesController extends Curd
 {
@@ -23,13 +25,27 @@ class DeptPremisesController extends Curd
     public function selectList(Request $request)
     {
         $category = $request->get('category','');
+        $type = $request->get('type','');
+
         if ($category == 'dishes'){
             $category = '餐厅';
         }else{
             $category = '营业场所';
         }
-        $premisses = SysDept::where('dept_category', $category)
-            ->select('dept_id as key', 'dept_name as label','dept_address as address','dept_position as position','dept_extend_json')
+
+        $deptId = '';
+        if ($type == 'user'){
+            $user = SysUser::where('user_id',JwtToken::getCurrentId())->first();
+            if (!empty($user->join_user_dept_id)){
+                $deptId = $user->join_user_dept_id;
+            }
+        }
+
+        $premisses = SysDept::where('dept_category', $category);
+        if (!empty($deptId)){
+            $premisses = $premisses->where('dept_id',$deptId);
+        }
+        $premisses = $premisses->select('dept_id as key', 'dept_name as label','dept_address as address','dept_position as position','dept_extend_json')
             ->get()
             ->toArray();
 

app/admin/controller/member/MemberController.php

@@ -29,6 +29,8 @@ class MemberController
             ->leftjoin('member_info', 'member.member_id', '=', 'member_info.join_info_member_id')
             ->select('member.member_id', 'member.member_mobile', 'member_cert.member_cert_name','member_info.member_info_nickname')
             ->where('member.member_is_owner', $isOwner)
+            ->where('member_status','ACTIVED')
+            // ->where('member_mobile','<>','0000')
             ->where(function ($query) use ($keywords) {
                 $query->where('member.member_mobile', 'like', '%' . $keywords . '%')
                     ->orWhere("member.member_id", 'like', '%' . $keywords . '%')
@@ -44,9 +46,17 @@ class MemberController
             }else if(!empty($item->member_info_nickname)){
                 $name = $item->member_info_nickname;
             }
+            $value = !empty($name) ? $name : '';
+            if ($item->member_mobile != '0000'){
+                $value .= '-' . $item->member_mobile;
+            }
+            if (empty($value)){
+                $value = $item->member_mobile;
+            }
+            $value = 
             $data[] = [
                 'key' => $item->member_id,
-                'value' => !empty($name) ? $name . '-' . $item->member_mobile : $item->member_mobile,
+                'value' => $value,
             ];
         }
 
@@ -333,7 +343,6 @@ class MemberController
 
     public function list(Request $request)
     {
-
         return MemberService::list($request);
     }
 

app/admin/controller/order/WholeController.php

@@ -264,6 +264,7 @@ class WholeController extends Curd
                 $query->select('join_return_order_id', 'order_return_status');
             }
         ])->where('join_sheet_order_id', $orderId)
+            ->orderBy('order_sheet_id','DESC')
             ->get()
             ->toArray();
 
@@ -488,6 +489,9 @@ class WholeController extends Curd
             if (isset($orderConfigJson['table'])) {
                 $order->table = $orderConfigJson['table'];
             }
+            if (isset($orderConfigJson['eat'])) {
+                $order->eat = $orderConfigJson['eat'];
+            }
             if(isset($orderConfigJson['express'])){
                 $order->express = $orderConfigJson['express'];
             }
@@ -503,7 +507,7 @@ class WholeController extends Curd
             $order->referee = $orderExtendJson['referee'] ?? '';
         }
 
-        $order->premises = $premises;
+        $order->premises = $order->premises ?? $premises;
         $data = [
             'order' => $order,
             'refund' => $refund,
@@ -572,7 +576,9 @@ class WholeController extends Curd
                 $orderConfigJson['table']=$table->dept_name ?? 0;
                 $orderConfigJson['tableid']=$params['dept_table_id'];
             }
-
+            if (!empty($params['eat'])){
+                $orderConfigJson['eat'] = $params['eat'];
+            }
 
             $data = [
                 'order_amount_pay'=>$params['order_amount_pay'],
@@ -1215,7 +1221,6 @@ class WholeController extends Curd
         if (!empty($params['dept_premises_id'])){
             $premises = SysDept::where('dept_name', $params['dept_premises_id'])->first();
         }
-        
 
         Db::beginTransaction();
         try {
@@ -1262,7 +1267,7 @@ class WholeController extends Curd
                     return json_fail("密码错误，请重新输入");
                 }
             }
-            $qrcodePayAmount = 0;
+            // 下单账户
             if (empty($params['join_order_member_id']) && !empty($params['mobile'])){
                 if (Member::where('member_mobile',$params['mobile'])->exists()){
                     Db::rollBack();
@@ -1271,9 +1276,15 @@ class WholeController extends Curd
                 $params['join_order_member_id'] = $params['member_id'] = 'MR'.date('YmdHis').random_string(6,'up');
                 // 创建会员
                 MemberService::createMember($params);
+            }else if(empty($params['join_order_member_id']) && empty($params['mobile'])){
+                $params['join_order_member_id'] = Member::where('member_mobile','0000')->value('member_id');
+            }
+            if (empty($params['join_order_member_id'])){
+                Db::rollBack();
+                return json_fail("检查下单账户");
             }
             
-
+            $qrcodePayAmount = 0;
             $goods = Goods::where('goods_id', $params['join_sheet_goods_id'])
                 ->select('goods_id', 'goods_name', 'goods_classify')
                 ->first();
@@ -1482,10 +1493,6 @@ class WholeController extends Curd
                 // 不组合或者组合后需要付款码的金额>0
                 if($params['pay_constitute'] == 'N' || ($params['pay_constitute'] == 'Y' && $qrcodePayAmount > 0)){
                     $result = OrderService::qrcodePay($params);
-                    // $result = [
-                    //     'return_code'=>'SUCCESS',
-                    //     'result_code' => 'SUCCESS'
-                    // ];
                     $result = json_encode($result);
                     $params['pay_json_response'] = $result;
                     $result = json_decode($result,true);
@@ -1566,6 +1573,10 @@ class WholeController extends Curd
                 $orderConfigJson['table'] = !empty($table) ? $table->dept_name : null;
                 $orderConfigJson['express'] = "到店吃";
                 $orderConfigJson['tableid'] = $params['dept_table_id'] ?? null;
+                if (!empty($params['eat'])){
+                    $orderConfigJson['eat'] = $params['eat'] ?? null;
+                }
+                
 
                 if ($params['settlement_now'] == 'N' && !empty($params['dept_table_id'])){
                     // 桌台设为使用中
@@ -2026,6 +2037,11 @@ class WholeController extends Curd
                     'order_sheet_addtimes' => time(),
                     'order_sheet_extend_json'=>$sheet->order_sheet_extend_json ?? '[]'
                 ];
+                if ($params['give'] == 1){
+                    $data['order_sheet_status'] = 'FREE';
+                    $data['order_sheet_amount'] = 0;
+                    $data['order_sheet_pay'] = 0;
+                }
 
                 $order->order_amount_total = $order->order_amount_total + $data['order_sheet_amount'];
                 $order->order_amount_pay = $order->order_amount_pay + $data['order_sheet_pay'];

app/admin/service/member/MemberService.php

@@ -42,6 +42,7 @@ class MemberService
                 }
             ])
             ->where('member_is_owner', 'N')
+            ->where('member_mobile','<>', '0000')
             ->leftJoin('member_info', 'member_info.join_info_member_id', 'member.member_id')
             ->leftJoin('member_cert', 'member_cert.join_cert_member_id', 'member.member_id')
 //            ->leftjoin('member_account', 'member.member_id', '=', 'member_account.join_account_member_id')
@@ -194,6 +195,7 @@ class MemberService
 
         $rows = Member::with('account')
             ->where('member_is_owner', 'N')
+            ->where('member_mobile','<>', '0000')
             ->leftJoin('member_info', 'member_info.join_info_member_id', 'member.member_id')
             ->leftJoin('member_cert', 'member_cert.join_cert_member_id', 'member.member_id')
 //            ->leftjoin('member_account', 'member.member_id', '=', 'member_account.join_account_member_id')