更新工程师结算方式-按照商品规格计算

app/api/controller/IndexController.php

@@ -17,6 +17,9 @@ namespace app\api\controller;
 
 use app\api\logic\IndexLogic;
 use app\common\model\dict\DictData;
+use app\common\model\orders\RechargeOrder;
+use app\common\model\recharge\OrderGoods;
+use app\common\model\works\ServiceWork;
 use think\response\Json;
 
 
@@ -43,6 +46,10 @@ class IndexController extends BaseApiController
      */
     public function index()
     {
+        $work = ServiceWork::where('id',44)->findOrEmpty();
+        $order_sns = RechargeOrder::where('work_id',$work->id)->column('sn');
+        $goods_id = OrderGoods::whereIn('sn',$order_sns)->value('goods_id');
+        dd($goods_id);
         $result = IndexLogic::getIndexData();
         return $this->data($result);
     }

app/api/logic/PerformanceLogic.php

@@ -9,6 +9,7 @@ use app\common\logic\WorkerAccountLogLogic;
 use app\common\model\master_worker\MasterWorker;
 use app\common\model\orders\RechargeOrder;
 use app\common\model\performance\PerformanceRules;
+use app\common\model\recharge\OrderGoods;
 use think\facade\Db;
 use think\facade\Log;
 
@@ -28,7 +29,10 @@ class PerformanceLogic extends BaseLogic
     {
         Log::info('calculatePerformance:'.json_encode($work->toArray()));
         //工单已完结，进行结算,结算完成后设置work_pay_status为2，已结算
-        $rule = PerformanceRules::whereFindInSet('goods_category_ids',$work->goods_category_id)->findOrEmpty();
+        //获取工单对应的商品id
+        $order_sns = RechargeOrder::where('work_id',$work->id)->column('sn');
+        $goods_id = OrderGoods::whereIn('sn',$order_sns)->value('goods_id');
+        $rule = PerformanceRules::whereFindInSet('goods_id',$goods_id)->findOrEmpty();
         if($rule->isEmpty()){
             $work->work_pay_status = 3;
         }else{