add - goods_type

app/api/controller/ServiceOrderController.php

@@ -97,7 +97,7 @@ class ServiceOrderController extends BaseApiController
         if (false === $result) {
             return $this->fail(ServiceOrderLogic::getError());
         }
-        ActivityLogic::createPropertyOrder($params);
+        ActivityLogic::createPropertyOrder($params,$result);
         return $this->data($result);
     }
 

app/api/logic/ActivityLogic.php

@@ -49,10 +49,9 @@ class ActivityLogic extends BaseLogic
             $res['coupons'] = CouponRules::where('property_activity_id',$params['property_activity_id'])
                 ->select()
                 ->toArray();
-            $res['goods'] =  Goods::order(['category_type' => 'desc'])
-                ->where('property_activity_id',$params['property_activity_id'])
+            $res['goods'] =  Goods::where('property_activity_id',$params['property_activity_id'])
                 ->where('is_agent',1)
-                ->visible(['id','goods_name','goods_image','base_service_fee','service_total','service_fee'])
+                ->visible(['id','goods_name','goods_image','base_service_fee','service_total','service_fee','goods_type'])
                 ->order('is_recommend desc')
                 ->select()
                 ->toArray();
@@ -63,7 +62,7 @@ class ActivityLogic extends BaseLogic
     }
 
 
-    public static function createPropertyOrder($params){
+    public static function createPropertyOrder($params,$serviceOrder){
         try{
             // 判断商品是否为 代理活动商品
             $goods = Goods::findOrEmpty($params['goods_id']);
@@ -89,6 +88,8 @@ class ActivityLogic extends BaseLogic
                     'householder_name' => $params['user_info']['real_name'],
                     'address' => $params['address'],
                     'remark' => '',
+                    'order_status' => 1,
+                    'work_id' => $serviceOrder['work_id'],
                 ]));
                 if($result === false){
                     throw new \Exception('生成代理单失败');

app/api/logic/PropertyOrderLogic.php

@@ -52,6 +52,8 @@ class PropertyOrderLogic extends BaseLogic
                 'property_user_id' => $propertyUserId,
                 'remark' => $params['remark']??'',
                 'address' => $address??'',
+                'order_status' => isset($params['order_status'])?$params['order_status']:0,
+                'work_id' => isset($params['work_id'])?$params['work_id']:0,
             ]);
             Db::commit();
             $propertyHeadInfo =  PropertyHeadLogic::detail(['id'=>$params['property_head_id']]);