订单页再次购买

app/api/controller/ServiceOrderController.php

@@ -33,6 +33,8 @@ class ServiceOrderController extends BaseApiController
     {
         $params = (new ServiceOrderValidate())->goCheck('detail',[
             'user_id' => $this->userId,
+            'user_info' => $this->userInfo,
+            'domain'=>$this->request->domain()
         ]);
         $result = ServiceOrderLogic::detail($params);
         if (false === $result) {

app/api/logic/ServiceOrderLogic.php

@@ -18,6 +18,7 @@ use app\common\model\goods\Goods;
 use app\common\model\master_worker\MasterWorker;
 use app\common\model\master_worker\MasterWorkerRule;
 use app\common\model\orders\RechargeOrder;
+use app\common\model\property\PropertyActivity;
 use app\common\model\recharge\OrderGoods;
 use app\common\model\refund\RefundRecord;
 use app\common\model\spare_part\SparePart;
@@ -148,6 +149,7 @@ class ServiceOrderLogic extends BaseLogic
                 'user_id'=>$params['user_id'],
                 'lon'=>!empty($params['lon'])?$params['lon']:0,
                 'lat'=>!empty($params['lat'])?$params['lat']:0,
+                'property_activity_id'=>!empty($params['property_activity_id'])?$params['property_activity_id']:0,
             ];
 
             //判断是否是加单
@@ -184,7 +186,6 @@ class ServiceOrderLogic extends BaseLogic
                 'order_total' => $order_total,
                 'order_amount' => $order_amount,
             ];
-
             $order = RechargeOrder::create($data);
             //生成订单服务详情
             OrderGoods::create([
@@ -412,7 +413,7 @@ class ServiceOrderLogic extends BaseLogic
             $order_info =  \app\common\model\recharge\RechargeOrder::with(['order_goods'=>function ($query) {
                 $query->visible(['goods_name','goods_image','goods_number','good_unit']);
             },'service_work'=>function ($query) {
-                $query->visible(['work_sn','real_name','mobile','address','service_status','appointment_time','master_worker_id','work_images','explanation','finished_images','finished_time','spare_total','service_work_spare_id','refund_approval'])->append(['service_status_text','user_service_status','user_service_status_text']);
+                $query->visible(['work_sn','real_name','mobile','address','service_status','appointment_time','master_worker_id','work_images','explanation','finished_images','finished_time','spare_total','service_work_spare_id','refund_approval','property_activity_id'])->append(['service_status_text','user_service_status','user_service_status_text']);
             }])
                 ->visible(['id','sn','payment_type','order_total','order_amount','paid_amount','pay_status','create_time','title','work_id'])
                 ->where([
@@ -525,6 +526,13 @@ class ServiceOrderLogic extends BaseLogic
                     $order_info['appoint_list'][$k1+1]['appointment_time'] = date('Y-m-d H:i:s',$v1['last_appointment_time']);
                 }
             }
+
+            //获取是否是活动工单
+            if(!empty($order_info['service_work']['property_activity_id'])){
+                $propertyActivity = PropertyActivity::findOrEmpty($order_info['service_work']['property_activity_id']);
+                $order_info['service_work']['url_page'] = rawurlencode($params['domain'].'/static/wxapp/H5/'.$propertyActivity['url_page'].'/index.html?property_activity_id='.$propertyActivity['id'].'&token='.$params['user_info']['token']);;
+            }
+
             return $order_info;
         }
         catch (\Exception $e) {