Merge branch 'develop'

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/dto/RequirementsAmountUpdateDTO.java

@@ -32,4 +32,8 @@ public class RequirementsAmountUpdateDTO {
 
     @ApiModelProperty(value = "服务需求id", required = true)
     private Integer requirementsInfoId;
+
+    @ApiModelProperty(value = "图片地址", example = "http://")
+    private String url;
+
 }

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

+package com.mmc.csf.infomation.vo;
+
+import com.mmc.csf.infomation.dto.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Admin
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class RequireEveryStatusVO {
+    //抵达现场地址
+    // service_arrive_scene
+    @ApiModelProperty(value = "抵达现场", example = "抵达现场")
+    private ServiceArriveSceneDTO serviceArriveSceneDTO;
+
+    //完成任务
+    //    service_fulfil_a_task
+    @ApiModelProperty(value = "完成任务", example = "完成任务")
+    private ServiceFulfilATaskDTO serviceFulfilATaskDTO;
+
+    //评价
+    //       service_evaluate
+    @ApiModelProperty(value = "评价", example = "评价")
+    private ServiceEvaluateDTO serviceEvaluateDTO;
+
+    @ApiModelProperty(value = "修改任务佣金", example = "修改任务佣金")
+    private RequirementsAmountUpdateDTO amountUpdate;
+
+    private ServiceOrderFormDetailsDTO serviceOrderFormDetailsDTO;
+}

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: 34b4b0fe49b4db7d18da22632ff1ad9276019f47
+  newTag: 5bd4e8dd9ae7f5a5ffae6b947e72f2b57b0fb2c8

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

@@ -3,11 +3,12 @@ package com.mmc.csf.release.service.impl;
 import com.mmc.csf.common.util.page.PageResult;
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.config.IsNullConvertZeroUtil;
-import com.mmc.csf.infomation.dto.ServiceOrderFormDTO;
-import com.mmc.csf.infomation.dto.ServiceOrderFormDetailsDTO;
+import com.mmc.csf.infomation.dto.*;
 import com.mmc.csf.infomation.qo.ServiceOrderQO;
 import com.mmc.csf.release.auth.dto.LoginSuccessDTO;
 import com.mmc.csf.release.dao.BackRequirementsDao;
+import com.mmc.csf.release.dao.RequirementsDao;
+import com.mmc.csf.infomation.vo.RequireEveryStatusVO;
 import com.mmc.csf.release.entity.requirements.ServiceOrderFormDO;
 import com.mmc.csf.release.entity.requirements.ServiceOrderFormDetailsDO;
 import com.mmc.csf.release.service.BackRequirementsService;
@@ -27,6 +28,8 @@ public class BackRequirementsServiceImpl implements BackRequirementsService {
 
     @Autowired
     private BackRequirementsDao backRequirementsDao;
+    @Autowired
+    private RequirementsDao requirementsDao;
 
     @Override
     public PageResult serviceOrderFormList(ServiceOrderQO param, LoginSuccessDTO userLoginInfoFromRedis) {
@@ -44,9 +47,27 @@ public class BackRequirementsServiceImpl implements BackRequirementsService {
 
     @Override
     public ResultBody serviceOrderFormDetails(Integer requirementsInfoId, LoginSuccessDTO userLoginInfoFromRedis) {
+
+        RequireEveryStatusVO requireEveryStatusVO = new RequireEveryStatusVO();
+        //抵达现场
+        ServiceArriveSceneDTO arriveSceneDTO = requirementsDao.serviceArriveSceneDTO(requirementsInfoId);
+        requireEveryStatusVO.setServiceArriveSceneDTO(arriveSceneDTO);
+        //完成任务
+        ServiceFulfilATaskDTO fulfilATaskDTO = requirementsDao.serviceFulfilATaskDTO(requirementsInfoId);
+        requireEveryStatusVO.setServiceFulfilATaskDTO(fulfilATaskDTO);
+        //评价
+        ServiceEvaluateDTO serviceEvaluateDTO = requirementsDao.serviceEvaluateDTO(requirementsInfoId);
+        requireEveryStatusVO.setServiceEvaluateDTO(serviceEvaluateDTO);
+//修改金额
+        RequirementsAmountUpdateDTO requirementsAmountUpdateDTO = requirementsDao.amountUpdateDTO(requirementsInfoId);
+        requireEveryStatusVO.setAmountUpdate(requirementsAmountUpdateDTO);
+
         ServiceOrderFormDetailsDO orderFormDetailsDO = backRequirementsDao.serviceOrderFormDetails(requirementsInfoId);
         ServiceOrderFormDetailsDTO serviceOrderFormDetailsDTO = orderFormDetailsDO.buildOrderFormDetails();
         IsNullConvertZeroUtil.checkIsNull(serviceOrderFormDetailsDTO);
-        return ResultBody.success(serviceOrderFormDetailsDTO);
+
+        requireEveryStatusVO.setServiceOrderFormDetailsDTO(serviceOrderFormDetailsDTO);
+
+        return ResultBody.success(requireEveryStatusVO);
     }
 }

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

@@ -2113,6 +2113,10 @@ public class RequirementsServiceImpl implements RequirementsService {
         ApplyRefundVO applyRefundVO = new ApplyRefundVO();
         for (RequirementsInfoDO requirementsInfoDO : requirementsInfoDOS) {
             IsNullConvertZeroUtil.checkIsNull(requirementsInfoDO);
+            //父订单不退钱
+            if(requirementsInfoDO.getRequireNum() != null && requirementsInfoDO.getRequireNum() > 1) {
+                continue;
+            }
             if (requirementsInfoDO.getCashAmount().compareTo(BigDecimal.ZERO) != 0 ||
                     requirementsInfoDO.getSalaryAmount().compareTo(BigDecimal.ZERO) != 0) {
                 publisherWalletFlowVO.setModeOfPayment(200);
@@ -2791,6 +2795,7 @@ public class RequirementsServiceImpl implements RequirementsService {
                     requirementsDao.insertPlatformOrderEarnings(new BigDecimal(0), requirementsSonDO.getId(), 0);
                 }
             }
+
             if (requirementsAmountDO.getCashAmount().compareTo(BigDecimal.ZERO) != 0
                     || requirementsAmountDO.getSalaryAmount().compareTo(BigDecimal.ZERO) != 0
                     || requirementsAmountDO.getLevelCashAmount().compareTo(BigDecimal.ZERO) != 0
@@ -3186,7 +3191,7 @@ public class RequirementsServiceImpl implements RequirementsService {
         List<RequirementsInfoDO> requirementsInfoDOS = requirementsDao.selectRequireSonInfo(param);
 
         for(RequirementsInfoDO requirementsInfoDO : requirementsInfoDOS) {
-            if (requirementsInfoDO.getServiceFlowId() != 1) {
+            if (requirementsInfoDO.getServiceFlowId() != 1 && requirementsInfoDO.getServiceFlowId() != 7) {
                 RequirementsServicePilotInfoDO pilotInfo = requirementsDao.selectPilotInfoByRequireId(requirementsInfoDO.getId());
                 requirementsInfoDO.setPilotCertificationId(pilotInfo.getPilotCertificationId());
                 requirementsInfoDO.setPilotCertificationUserId(pilotInfo.getPilotCertificationUserId());

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

@@ -901,6 +901,7 @@
                ra.salary_amount,
                ra.we_chat,
                ra.wechat_pay_order_number
+                ,ri.require_num
         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