Merge branch 'develop'

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/ServiceRequirementsVO.java

@@ -118,4 +118,7 @@ public class ServiceRequirementsVO implements Serializable {
 
     @ApiModelProperty(value = "订单项目号")
     private String projectCode;
+
+    @ApiModelProperty(value = "二级服务分类")
+    private String inspectionId;
 }

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 4f378f9545a0a77c8b9ae9aa198de2befdf42a82
+  newTag: bb21775c1267a05a05dc92f2a325a423a1f148b3

release-service/src/main/java/com/mmc/csf/release/entity/requirements/ServiceRequirementsDO.java

@@ -150,6 +150,9 @@ public class ServiceRequirementsDO {
 
     @ApiModelProperty(value = "订单项目号")
     private String projectCode;
+
+    @ApiModelProperty(value = "二级服务分类")
+    private String inspectionId;
     public ServiceRequirementsDO(ServiceRequirementsVO serviceRequirementsVO) {
         this.id = serviceRequirementsVO.getId();
         this.userAccountId = serviceRequirementsVO.getUserAccountId();
@@ -178,6 +181,7 @@ public class ServiceRequirementsDO {
         this.districtCode = serviceRequirementsVO.getDistrictCode();
         this.requireNum = serviceRequirementsVO.getRequireNum();
         this.projectCode = serviceRequirementsVO.getProjectCode();
+        this.inspectionId = serviceRequirementsVO.getInspectionId();
     }
 
 

release-service/src/main/java/com/mmc/csf/release/entity/requirements/ServiceRequirementsSonDO.java

@@ -150,6 +150,9 @@ public class ServiceRequirementsSonDO {
 
     @ApiModelProperty(value = "订单项目号")
     private String projectCode;
+
+    @ApiModelProperty(value = "二级服务分类")
+    private String inspectionId;
     public ServiceRequirementsSonDO(ServiceRequirementsDO serviceRequirementsDO) {
         BigDecimal decimalSum = new BigDecimal(serviceRequirementsDO.getRequireNum());
         this.serviceId = serviceRequirementsDO.getServiceId();
@@ -187,5 +190,6 @@ public class ServiceRequirementsSonDO {
         this.requireNum = 1;
         this.fatherRequireId = serviceRequirementsDO.getId();
         this.projectCode = serviceRequirementsDO.getProjectCode();
+        this.inspectionId = serviceRequirementsDO.getInspectionId();
     }
 }

release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java

@@ -2552,14 +2552,15 @@ public class RequirementsServiceImpl implements RequirementsService {
         //这个是几个人的订单
         Integer sum = serviceRequirementsVO.getRequireNum();
         //获取用户基本信息
-        UserAccountSimpleDTO userAccountSimpleDTO = feignGetUserSimpleInfo(serviceRequirementsVO.getUserAccountId(), request);
+        Integer userAccountId = serviceRequirementsVO.getUserAccountId();
+        UserAccountSimpleDTO userAccountSimpleDTO = feignGetUserSimpleInfo(userAccountId, request);
         String openid = userAccountSimpleDTO.getOpenid();
         //需要冻结的金额
         WalletFlowVO walletFlowVO = new WalletFlowVO();
         // PublisherWalletFlowVO publisherWalletFlowVO = walletFlowVO.getPublisherWalletFlowVO();
         PublisherWalletFlowVO publisherWalletFlowVO = new PublisherWalletFlowVO();
-        publisherWalletFlowVO.setUserAccountId(serviceRequirementsVO.getUserAccountId());
-        publisherWalletFlowVO.setOperateUserAccountId(serviceRequirementsVO.getUserAccountId());
+        publisherWalletFlowVO.setUserAccountId(userAccountId);
+        publisherWalletFlowVO.setOperateUserAccountId(userAccountId);
         ServiceRequirementsDO requirementsInfoDO = new ServiceRequirementsDO(serviceRequirementsVO);
         requirementsInfoDO.setPublisherNumber(randomOrderCode());
         IsNullConvertZeroUtil.checkIsNull(publisherWalletFlowVO);

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -519,12 +519,12 @@
                                       require_description, create_time,
                                       update_time, task_start_time, task_end_time, task_address, longitude,
                                       latitude, publisher_number, insurance, publish,
-                                      service_flow_id, adcode, order_level_amount, openid, service_name,province_code,city_code,district_code,require_num,repertory,project_code)
+                                      service_flow_id, adcode, order_level_amount, openid, service_name,province_code,city_code,district_code,require_num,repertory,project_code,inspection_id)
         VALUES (#{serviceId}, #{userAccountId}, #{publishName}, #{publishPhone},
                 #{requireDescription}, NOW(),
                 NOW(), #{taskStartTime}, #{taskEndTime}, #{taskAddress}, #{longitude},
                 #{latitude}, #{publisherNumber}, #{insurance}, 1, 1, #{adcode}, #{orderLevelAmount}, #{openid},
-                #{serviceName},#{provinceCode},#{cityCode},#{districtCode},#{requireNum},#{repertory},#{projectCode});
+                #{serviceName},#{provinceCode},#{cityCode},#{districtCode},#{requireNum},#{repertory},#{projectCode},#{inspectionId});
     </insert>
 
     <insert id="addPublishServiceSon" parameterType="com.mmc.csf.release.entity.requirements.ServiceRequirementsSonDO"
@@ -533,12 +533,12 @@
                                       require_description, create_time,
                                       update_time, task_start_time, task_end_time, task_address, longitude,
                                       latitude, publisher_number, insurance, publish,
-                                      service_flow_id, adcode, order_level_amount, openid, service_name,province_code,city_code,district_code,father_require_id,project_code)
+                                      service_flow_id, adcode, order_level_amount, openid, service_name,province_code,city_code,district_code,father_require_id,project_code,inspection_id)
         VALUES (#{serviceId}, #{userAccountId}, #{publishName}, #{publishPhone},
                 #{requireDescription}, NOW(),
                 NOW(), #{taskStartTime}, #{taskEndTime}, #{taskAddress}, #{longitude},
                 #{latitude}, #{publisherNumber}, #{insurance}, 1, 1, #{adcode}, #{orderLevelAmount}, #{openid},
-                #{serviceName},#{provinceCode},#{cityCode},#{districtCode},#{fatherRequireId},#{projectCode});
+                #{serviceName},#{provinceCode},#{cityCode},#{districtCode},#{fatherRequireId},#{projectCode},#{inspectionId});
     </insert>
 
     <insert id="addAmount" parameterType="com.mmc.csf.release.entity.requirements.RequirementsAmountDO"