Merge remote-tracking branch 'origin/master'

app/api/lists/recharge/ServiceOrderLists.php

@@ -46,7 +46,7 @@ class ServiceOrderLists extends BaseApiDataLists
             }
         })->column('id');
         if($service_status != 'all'){
-            $where['pay_status'] = 1;
+            $where['pay_status'] = $service_status==4?2:1;
         }
         $work_ids = !empty($work_ids)?implode(',',$work_ids):'999999';
 

app/api/logic/ServiceOrderLogic.php

@@ -297,7 +297,8 @@ class ServiceOrderLogic extends BaseLogic
             }
             //软删除订单
             $cancel_order = \app\common\model\recharge\RechargeOrder::where(['user_id'=>$params['user_id'],'work_id'=>$work_id])->findOrEmpty();
-            $cancel_order->delete();
+            $cancel_order->pay_status = 2;
+            $cancel_order->save();
             //更新工单状态为已取消
             $service_work = ServiceWork::find($work_id);
             $service_work->service_status = 4;