up - 新增状态/销售组

app/adminapi/lists/master_worker/MasterWorkerServiceOrderLists.php

@@ -5,6 +5,7 @@ use app\adminapi\lists\BaseAdminDataLists;
 use app\common\lists\ListsSearchInterface;
 use app\common\model\goods_category\GoodsCategory;
 use app\common\model\master_worker\MasterWorker;
+use app\common\model\master_worker_register\MasterWorkerRegister;
 use app\common\model\works\ServiceWorkAllocateWorkerLog;
 use think\facade\Db;
 use think\facade\Log;
@@ -136,10 +137,13 @@ class MasterWorkerServiceOrderLists extends BaseAdminDataLists implements ListsS
             ->limit($this->limitOffset, $this->limitLength)
             ->select()->toArray();
         $categoryData = GoodsCategory::select()->toArray();
+        $ids = array_column($lists,'id');
+        $masterWorkerRegisters = array_column(MasterWorkerRegister::with(['sale'])->whereIn('worker_id',$ids)->select()->toArray(), null,'worker_id');
         foreach ($lists as &$item) {
             $item['labels'] = $item['labels']?array_map(function ($item) { return intval($item); },explode(',',$item['labels'])):'';
             $item['category_name'] = $item['category_ids']?implode('、',array_column(get_parent_info($categoryData,explode(',',$item['category_ids'])),'name')):'';
             $item['allocate_num'] = ServiceWorkAllocateWorkerLog::where(['master_worker_id'=>$item['id']])->count();
+            $item['register_info'] = $masterWorkerRegisters[$item['id']]??[];
         }
         return $lists;
     }

app/api/logic/ServiceOrderLogic.php

@@ -15,6 +15,7 @@ use app\common\logic\RefundLogic;
 use app\common\model\coupon\CouponCategory;
 use app\common\model\coupon\UserCoupon;
 use app\common\model\dict\DictData;
+use app\common\model\equity\UserEquity;
 use app\common\model\goods\Goods;
 use app\common\model\master_commission\MasterWorkerCommissionConfig;
 use app\common\model\master_commission\MasterWorkerCommissionNotice;
@@ -186,6 +187,10 @@ class ServiceOrderLogic extends BaseLogic
 
             //使用权益卡时订单应支付金额=0
             if(isset($params['user_equity_id']) && $params['user_equity_id']){
+                $userEquity = UserEquity::with(['equityConfig'])->where(['status'=>1,'user_id'=>$params['user_id'],'id'=>$params['user_equity_id']])->findOrEmpty();
+                if($userEquity->isEmpty() || (int)$userEquity['equityConfig']['status'] === 2){
+                    throw new Exception('您的权益卡已关闭，请重新选择权益卡！');
+                }
                 $order_total = 0;
                 $order_amount = 0;
             }

app/common/model/master_worker_register/MasterWorkerRegister.php

@@ -81,7 +81,7 @@ class MasterWorkerRegister extends BaseModel
 
     public function sale()
     {
-        return $this->hasOne(Sale::class, 'id', 'sale_id');
+        return $this->hasOne(Sale::class, 'id', 'sale_id')->with(['saleGroupInfo']);
     }