dongxiaoqin 8 месяцев назад
Родитель
Сommit
6647337238
1 измененных файлов с 3 добавлено и 2 удалено
  1. 3 2
      app/adminapi/logic/master_worker/MasterWorkerLogic.php

+ 3 - 2
app/adminapi/logic/master_worker/MasterWorkerLogic.php

@@ -402,9 +402,10 @@ class MasterWorkerLogic extends BaseLogic
         } else {
             $order_amount = (float)$params['amount'] ?? 0;
         }
-        $order = MasterWorkerRetentionMoneyOrder::where(['worker_id'=>$params['worker_id']])->order('id','desc')->findOrEmpty();
+        $order = $is_reg == 0 ? 'desc' : 'asc';
+        $order = MasterWorkerRetentionMoneyOrder::where(['worker_id'=>$params['worker_id']])->order('id',$order)->findOrEmpty();
 
-        if($order->isEmpty() || $order->order_status === 2){
+        if($order->isEmpty() || ($is_reg == 0 && $order->order_status === 2)){
             $sn = generate_sn(MasterWorkerRetentionMoneyOrder::class, 'sn');
             $order = MasterWorkerRetentionMoneyOrder::create(['sn' => $sn, 'order_status'=>1,'worker_id'=>$params['worker_id'],'order_amount'=>$order_amount]);
         }else{