up - 用户确认报价

app/adminapi/logic/works/ServiceWorkLogic.php

@@ -1079,7 +1079,14 @@ class ServiceWorkLogic extends BaseLogic
                 throw new Exception('工单不存在');
             }
             $encryptedData = encrypt($params['work_sn'], \think\facade\Config::get('project.work_sn_key'));
-            return ['url'=>\think\facade\Config::get('project.user_website').'?code='.$encryptedData];
+            $user_website = \think\facade\Config::get('project.user_website');
+            $type = $params['type']??1;
+            if($type == 1){
+                $user_website .= '?code='.$encryptedData;
+            }elseif($type == 2){
+                $user_website .= 'pages/quoted_price?code='.$encryptedData;
+            }
+            return ['url'=>$user_website];
         }catch  (\Exception $e) {
             self::setError($e->getMessage());
             return false;

app/api/logic/ServiceOrderLogic.php

@@ -859,10 +859,6 @@ class ServiceOrderLogic extends BaseLogic
             }
 
             $service_work = ServiceWork::find($work_id);
-            if(!isset($params['admin_id']) && $service_work->user_confirm_status!=3){
-                //throw new Exception('请勿重复操作');
-            }
-
             $orders = RechargeOrder::where(['work_id'=>$work_id,'user_id'=>$params['user_id']])->select()->toArray();
 
             //确认所有订单总金额和结算金额
@@ -876,6 +872,17 @@ class ServiceOrderLogic extends BaseLogic
                 $service_work->work_status = 6;
                 $service_work->user_confirm_status = 4;
             }
+            if(isset($params['admin_id']) && $service_work->user_confirm_status!=3){
+                \app\common\model\recharge\RechargeOrder::where([
+                    'order_type' => 0,
+                    'user_id' => $params['user_id'],
+                    'pay_status' => 0,
+                    'payment_type' => 2,
+                    'sn'=>$params['sn']
+                ])->update(['pay_status'=>1]);
+                $service_work->work_status = 7;
+                $service_work->user_confirm_status = 5;
+            }
             $service_work->finished_time = time();
             $service_work->save();