Merge branch 'develop'

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: 97386bd54f4c23cce1e94e1ed1602aaa7512b695
+  newTag: 34b4b0fe49b4db7d18da22632ff1ad9276019f47

release-service/src/main/java/com/mmc/csf/release/dao/RequirementsDao.java

@@ -9,6 +9,7 @@ import com.mmc.csf.infomation.qo.MyPublishQO;
 import com.mmc.csf.infomation.vo.LiabilityProblemVO;
 import com.mmc.csf.infomation.vo.ServiceSettleAccountsVO;
 import com.mmc.csf.release.entity.requirements.*;
+import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.math.BigDecimal;
@@ -342,4 +343,6 @@ public interface RequirementsDao {
      */
     Integer selectServiceFlowIdFromAgreePilot(Integer requireId,Integer userAccountId);
 
+    RequirementsServicePilotInfoDO selectPilotInfoByRequireId(Integer requireId);
+
 }

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

+package com.mmc.csf.release.entity.requirements;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Admin
+ * @date 2023/11/11
+ */
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class RequirementsServicePilotInfoDO {
+    @ApiModelProperty(value = "抢单飞手id")
+    Integer pilotCertificationId;
+    @ApiModelProperty(value ="抢单飞手用户id")
+    Integer pilotCertificationUserId;
+}

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

@@ -108,6 +108,8 @@ public class RequirementsServiceImpl implements RequirementsService {
 //            return ResultBody.error(ResultEnum.COMPANY_NOT_VERIFY_ERROR);
 //        }
 
+
+
         RequirementsInfoDO requirementsInfoDO = new RequirementsInfoDO(requirementsInfoVO);
         requirementsInfoDO.setPublisherNumber(randomOrderCode());
         requirementsDao.addRequirementsInfo(requirementsInfoDO);
@@ -2773,13 +2775,6 @@ public class RequirementsServiceImpl implements RequirementsService {
             requirementsDao.addAmount(requirementsAmountDO);
             if (sum == 1) {
                 requirementsDao.insertPlatformOrderEarnings(new BigDecimal(0), requirementsInfoDO.getId(), 0);
-                if (requirementsAmountDO.getCashAmount().compareTo(BigDecimal.ZERO) != 0
-                        || requirementsAmountDO.getSalaryAmount().compareTo(BigDecimal.ZERO) != 0
-                        || requirementsAmountDO.getLevelCashAmount().compareTo(BigDecimal.ZERO) != 0
-                        || requirementsAmountDO.getLevelSalaryAmount().compareTo(BigDecimal.ZERO) != 0) {
-                    feignWalletFlow(publisherWalletFlowVO, request.getHeader("token"));
-                }
-                return ResultBody.success();
             } else {
                 //循环添加子订单
                 for (int i = 0; i < sum; i++) {
@@ -2794,15 +2789,15 @@ public class RequirementsServiceImpl implements RequirementsService {
                     System.out.println("-------------------------");
                     requirementsDao.addAmount(requirementsAmountSonDO);
                     requirementsDao.insertPlatformOrderEarnings(new BigDecimal(0), requirementsSonDO.getId(), 0);
-                    if (requirementsAmountSonDO.getCashAmount().compareTo(BigDecimal.ZERO) != 0
-                            || requirementsAmountSonDO.getSalaryAmount().compareTo(BigDecimal.ZERO) != 0
-                            || requirementsAmountSonDO.getLevelCashAmount().compareTo(BigDecimal.ZERO) != 0
-                            || requirementsAmountSonDO.getLevelSalaryAmount().compareTo(BigDecimal.ZERO) != 0) {
-                        feignWalletFlow(publisherWalletFlowVO, request.getHeader("token"));
-                    }
                 }
-                return ResultBody.success();
             }
+            if (requirementsAmountDO.getCashAmount().compareTo(BigDecimal.ZERO) != 0
+                    || requirementsAmountDO.getSalaryAmount().compareTo(BigDecimal.ZERO) != 0
+                    || requirementsAmountDO.getLevelCashAmount().compareTo(BigDecimal.ZERO) != 0
+                    || requirementsAmountDO.getLevelSalaryAmount().compareTo(BigDecimal.ZERO) != 0) {
+                feignWalletFlow(publisherWalletFlowVO, request.getHeader("token"));
+            }
+            return ResultBody.success();
         } else {
             //云享金和佣金扣除完成，但是还不足支付订单金额，并且没有选择微信支付，所以支付不合法
             return ResultBody.success("下单失败");
@@ -3189,6 +3184,15 @@ public class RequirementsServiceImpl implements RequirementsService {
         param.setUserAccountId(userAccountId);
         int count = requirementsDao.myPublishcount(param);
         List<RequirementsInfoDO> requirementsInfoDOS = requirementsDao.selectRequireSonInfo(param);
+
+        for(RequirementsInfoDO requirementsInfoDO : requirementsInfoDOS) {
+            if (requirementsInfoDO.getServiceFlowId() != 1) {
+                RequirementsServicePilotInfoDO pilotInfo = requirementsDao.selectPilotInfoByRequireId(requirementsInfoDO.getId());
+                requirementsInfoDO.setPilotCertificationId(pilotInfo.getPilotCertificationId());
+                requirementsInfoDO.setPilotCertificationUserId(pilotInfo.getPilotCertificationUserId());
+            }
+        }
+
         List<RequirementsInfoVO> collect = requirementsInfoDOS.stream().map(RequirementsInfoDO::buildRequirementsInfoVO).collect(Collectors.toList());
         List<IndustryTypeDTO> industryTypeDTOS = listIndustry();
         for (RequirementsInfoVO requirementsInfoVO : collect) {

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

@@ -1622,6 +1622,7 @@
         ri.task_address,
         ri.longitude,
         ri.latitude,
+        ri.service_flow_id,
         ri.require_url,
         ri.require_description,
         ri.requirement_type_id,
@@ -1641,17 +1642,17 @@
         sf.order_status,
         ri.publish,
         rau.update_order_amount,
-        ri.father_require_id,
-        rs.pilot_certification_id,
-        rs.pilot_certification_user_id
+        ri.father_require_id
+#         rs.pilot_certification_id,
+#         rs.pilot_certification_user_id
         FROM
         requirements_info ri
         LEFT JOIN requirements_type rt ON rt.id = ri.requirement_type_id
         LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
         LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
         LEFT JOIN requirements_amount_update rau ON rau.requirements_info_id = ri.id
-        left join requirements_service rs on ri.id = rs.requirements_info_id
-        WHERE ri.user_account_id = #{userAccountId} and ri.is_deleted!=1 and (rs.service_flow_id != 11 or rs.service_flow_id is NULL)
+#         left join requirements_service rs on ri.id = rs.requirements_info_id
+        WHERE ri.user_account_id = #{userAccountId} and ri.is_deleted!=1
         <if test=" requirementsInfoId != null  ">
             and ri.father_require_id=#{requirementsInfoId}
         </if>
@@ -1755,6 +1756,10 @@
             AND ra.user_account_id = ri.user_account_id
         WHERE ri.id = #{id} and (rs.service_flow_id = 11 or rs.service_flow_id is NULL)
     </select>
+    <select id="selectPilotInfoByRequireId"
+            resultType="com.mmc.csf.release.entity.requirements.RequirementsServicePilotInfoDO">
+        select pilot_certification_id,pilot_certification_user_id from requirements_service where service_flow_id != 11 and is_deleted != 1 and requirements_info_id = #{requireId}
+    </select>
     <delete id="deleteRequirementsServiceInfo">
         delete from requirements_service  where requirements_info_id = #{requireId} and pilot_certification_user_id = #{userAccountId}
     </delete>