Merge branch 'develop'

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

+package com.mmc.csf.infomation.vo;
+
+import com.mmc.csf.release.model.group.Update;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author small
+ * @Date 2023/9/8 15:23
+ * @Version 1.0
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class LiabilityProblemVO {
+
+    @ApiModelProperty(value = "id")
+    @NotNull(message = "修改id不能为空", groups = {Update.class})
+    private Integer requirementsInfoId;
+
+    @ApiModelProperty(value = "责任问题 1:双方无责 2:发布者责任 3：飞手责任 ",example = "1")
+    @NotNull(message = "责任类型不能为空")
+    private Integer  duty;
+
+
+
+}

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: 1d00ed9ee09a9eab2d4faf70f775dc6b67c4362a
+  newTag: 4c17e602fcf7dc229e48e61efbd20115d3dabc9f

release-service/src/main/java/com/mmc/csf/release/commit/NotRepeatSubmitConfig.java

@@ -105,8 +105,8 @@ public class NotRepeatSubmitConfig extends BaseController {
                 if (wechatPayOrderNumber != null) {
                     UserPayInfoVO userPayInfoVO = queryUserPayInfo(wechatPayOrderNumber, request);
                     System.out.println(userPayInfoVO);
-                    if (userPayInfoVO.getTradeState() != "SUCCESS") {
-                        ResultBody delete = getDelete(requirementsInfoId, request);
+                    if (!userPayInfoVO.getTradeState().equals("SUCCESS")) {
+                      ResultBody delete = getDelete(requirementsInfoId, request);
                         requirementsDao.updateRepertory(requirementsInfoId);
                     }
 

release-service/src/main/java/com/mmc/csf/release/controller/RequirementsController.java

@@ -7,6 +7,7 @@ import com.mmc.csf.infomation.qo.MyPreemptQO;
 import com.mmc.csf.infomation.qo.MyPublishQO;
 import com.mmc.csf.infomation.vo.*;
 import com.mmc.csf.release.commit.NotRepeatSubmit;
+import com.mmc.csf.release.entity.requirements.ServiceRequirementsDO;
 import com.mmc.csf.release.model.group.Insert;
 import com.mmc.csf.release.model.group.Page;
 import com.mmc.csf.release.model.group.Update;
@@ -87,6 +88,16 @@ public class RequirementsController extends BaseController {
     }
 
 
+    @ApiOperation(value = "内部调用")
+    @GetMapping("/repertory")
+    public ServiceRequirementsDO repertory(@ApiParam(value = "需求发布id", required = true) @RequestParam Integer requirementsInfoId, HttpServletRequest request){
+        GrabTheOrderVO grabTheOrderVO = new GrabTheOrderVO();
+        grabTheOrderVO.setRequirementsInfoId(requirementsInfoId);
+      return  requirementsService.getRepertory(grabTheOrderVO, request);
+    }
+
+
+
     @ApiOperation(value = "小程序——发布服务需求订单编号单独接口")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("publisherNumber")
@@ -302,12 +313,12 @@ public class RequirementsController extends BaseController {
         return requirementsService.updateAmountGetNumber(getNumberVO, request);
     }
 
-    @ApiOperation(value = "new——后台管理取消订单(取消发布者与飞手共同建立的订单)")
+    @ApiOperation(value = "new2——后台管理取消订单(取消发布者与飞手共同建立的订单)")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
-    @GetMapping("cancelAll")
-    public ResultBody cancelAll(HttpServletRequest request, @ApiParam(value = "发布服务需求id", required = true) @RequestParam Integer requirementsInfoId) {
+    @PostMapping("cancelAll")
+    public ResultBody cancelAll(HttpServletRequest request, @RequestBody LiabilityProblemVO liabilityProblemVO) {
         Integer userAccountId = this.getUserLoginInfoFromRedis(request).getUserAccountId();
-        return requirementsService.cancelAll(requirementsInfoId, userAccountId);
+        return requirementsService.cancelAll(liabilityProblemVO, userAccountId,request);
     }
 
 

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

@@ -116,8 +116,12 @@ public interface RequirementsDao {
 
     RequirementsServiceDO droneFlyerCancel(Integer requirementsInfoId, Integer userAccountId);
 
+    RequirementsServiceDO customerDroneFlyerCancel(Integer requirementsInfoId);
+
     RequirementsInfoDO publisherCancel(Integer requirementsInfoId, Integer userAccountId);
 
+    RequirementsInfoDO customerPublisherCancel(Integer requirementsInfoId, Integer userAccountId);
+
     RequirementsInfoDO publisherCancelFlyer(Integer requirementsInfoId);
 
     RequirementsInfoDO publisherOrderNumber(String publisherNumber);

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

@@ -239,6 +239,7 @@ public class RequirementsInfoDO implements Serializable {
         this.latitude = requirementsEditVO.getLatitude();
         this.adcode = requirementsEditVO.getAdcode();
         this.orderAmount = requirementsEditVO.getOrderAmount();
+        this.insurance=requirementsEditVO.getInsurance();
     }
 
 

release-service/src/main/java/com/mmc/csf/release/service/RequirementsService.java

@@ -7,6 +7,7 @@ import com.mmc.csf.infomation.qo.IndustryCaseQO;
 import com.mmc.csf.infomation.qo.MyPreemptQO;
 import com.mmc.csf.infomation.qo.MyPublishQO;
 import com.mmc.csf.infomation.vo.*;
+import com.mmc.csf.release.entity.requirements.ServiceRequirementsDO;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -103,7 +104,7 @@ public interface RequirementsService {
 
     ResultBody publisherCancel(Integer requirementsInfoId, Integer userAccountId, HttpServletRequest request);
 
-    ResultBody cancelAll(Integer requirementsInfoId, Integer userAccountId);
+    ResultBody cancelAll(LiabilityProblemVO liabilityProblemVO, Integer userAccountId,HttpServletRequest request);
 
 
     ResultBody updatePublisherCancel(RequirementsAmountVO amountVO, HttpServletRequest request);
@@ -123,4 +124,6 @@ public interface RequirementsService {
     ResultBody deletePreempt(Integer requirementsInfoId, Integer userAccountId);
 
     ResultBody flyHandAgree(FlyHandAgreeVO agreeVO, HttpServletRequest request);
+
+    ServiceRequirementsDO getRepertory(GrabTheOrderVO grabTheOrderVO, HttpServletRequest request);
 }

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

@@ -1241,16 +1241,89 @@ public class RequirementsServiceImpl implements RequirementsService {
     /**
      * 全额退回
      *
-     * @param requirementsInfoId
+     * @param liabilityProblemVO
      * @param userAccountId
      * @return
      */
     @Override
-    public ResultBody cancelAll(Integer requirementsInfoId, Integer userAccountId) {
-        RequirementsServiceDO requirementsServiceDO = requirementsDao.droneFlyerCancel(requirementsInfoId, userAccountId);
-        RequirementsInfoDO requirementsInfoDO = requirementsDao.publisherCancel(requirementsInfoId, userAccountId);
-        requirementsDao.updateInfo(requirementsInfoId, 7);
-        requirementsDao.updateScene(requirementsInfoId, 7);
+    public ResultBody cancelAll(LiabilityProblemVO liabilityProblemVO, Integer userAccountId,HttpServletRequest request) {
+        RequirementsServiceDO requirementsServiceDO = requirementsDao.customerDroneFlyerCancel(liabilityProblemVO.getRequirementsInfoId());
+        RequirementsInfoDO requirementsInfoDO = requirementsDao.customerPublisherCancel(liabilityProblemVO.getRequirementsInfoId(), userAccountId);
+        //双方无责
+        if (liabilityProblemVO.getDuty().equals(1)){
+           requirementsDao.updateInfo(liabilityProblemVO.getRequirementsInfoId(), 7);
+            requirementsDao.updateScene(liabilityProblemVO.getRequirementsInfoId(), 7);
+            WalletFlowVO walletFlowVO = new WalletFlowVO();
+            PublisherWalletFlowVO publisherWalletFlowVO = new PublisherWalletFlowVO();
+            FlyerWalletFlowVO flyerWalletFlowVO = new FlyerWalletFlowVO();
+            IsNullConvertZeroUtil.checkIsNull(publisherWalletFlowVO);
+            IsNullConvertZeroUtil.checkIsNull(flyerWalletFlowVO);
+            IsNullConvertZeroUtil.checkIsNull(requirementsServiceDO);
+            IsNullConvertZeroUtil.checkIsNull(requirementsInfoDO);
+
+            //退发布者费用
+            if (requirementsInfoDO.getWechatPayOrderNumber()!=null){
+                ApplyRefundVO applyRefundVO = new ApplyRefundVO();
+                applyRefundVO.setReason("客服介入退款");
+                applyRefundVO.setRefund(requirementsInfoDO.getWeChat().multiply(new BigDecimal(100)).longValue());
+                applyRefundVO.setOutTradeNo(requirementsInfoDO.getWechatPayOrderNumber());
+                applyRefund(applyRefundVO, request.getHeader("token"));
+            }
+            //退飞手费用
+            if (requirementsServiceDO.getWechatPayOrderNumber()!=null){
+                ApplyRefundVO applyRefundVO = new ApplyRefundVO();
+                applyRefundVO.setReason("客服介入退款");
+                applyRefundVO.setRefund(requirementsServiceDO.getWeChat().multiply(new BigDecimal(100)).longValue());
+                applyRefundVO.setOutTradeNo(requirementsServiceDO.getWechatPayOrderNumber());
+                applyRefund(applyRefundVO, request.getHeader("token"));
+            }
+            //退云享金及余额
+            if (requirementsInfoDO.getCashAmount().compareTo(BigDecimal.ZERO)!=0 ||
+            requirementsInfoDO.getSalaryAmount().compareTo(BigDecimal.ZERO)!=0 ||
+            requirementsServiceDO.getCashAmount().compareTo(BigDecimal.ZERO)!=0 ||
+            requirementsServiceDO.getSalaryAmount().compareTo(BigDecimal.ZERO)!=0){
+
+             publisherWalletFlowVO.setModeOfPayment(500);
+             publisherWalletFlowVO.setUserAccountId(requirementsInfoDO.getUserAccountId());
+             publisherWalletFlowVO.setOperateUserAccountId(userAccountId);
+             publisherWalletFlowVO.setCashAmount(requirementsInfoDO.getCashAmount());
+             publisherWalletFlowVO.setSalaryAmount(requirementsInfoDO.getSalaryAmount());
+
+             flyerWalletFlowVO.setModeOfPayment(500);
+             flyerWalletFlowVO.setUserAccountId(requirementsServiceDO.getUserAccountId());
+             flyerWalletFlowVO.setOperateUserAccountId(userAccountId);
+             flyerWalletFlowVO.setCashAmount(requirementsServiceDO.getCashAmount());
+             flyerWalletFlowVO.setSalaryAmount(requirementsInfoDO.getSalaryAmount());
+
+             walletFlowVO.setPublisherWalletFlowVO(publisherWalletFlowVO);
+             walletFlowVO.setFlyerWalletFlowVO(flyerWalletFlowVO);
+
+            flyerCancel(walletFlowVO,request.getHeader("token"));
+            return ResultBody.success();
+
+            }
+
+
+
+
+
+
+
+
+
+
+
+        }
+        //发布者责任
+        if (liabilityProblemVO.getDuty().equals(2)){
+            publisherCancel(liabilityProblemVO.getRequirementsInfoId(),requirementsInfoDO.getUserAccountId(),request);
+            return ResultBody.success();
+        }
+        //飞手责任
+        if (liabilityProblemVO.getDuty().equals(3)){
+            droneFlyerCancel(liabilityProblemVO.getRequirementsInfoId(),requirementsServiceDO.getUserAccountId(),request);
+            return ResultBody.success();
+        }
         return ResultBody.success();
     }
 
@@ -1786,6 +1859,8 @@ public class RequirementsServiceImpl implements RequirementsService {
     }
 
 
+
+
     @Override
     public ResultBody publishService(ServiceRequirementsVO serviceRequirementsVO, HttpServletRequest request) {
 
@@ -2130,6 +2205,12 @@ public class RequirementsServiceImpl implements RequirementsService {
 
     }
 
+    @Override
+    public ServiceRequirementsDO getRepertory(GrabTheOrderVO grabTheOrderVO, HttpServletRequest request) {
+        return  requirementsDao.grabTheOrder(grabTheOrderVO.getRequirementsInfoId());
+
+    }
+
 
     @Override
     public ResultBody grabTheOrder(GrabTheOrderVO grabTheOrderVO, HttpServletRequest request) {

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

@@ -149,7 +149,7 @@
     <update id="updateRequirementsInfo" parameterType="com.mmc.csf.release.entity.requirements.RequirementsInfoDO">
         update requirements_info
         <set>
-            <if test=" requireDescription != null and  requireDescription!='' ">
+            <if test="requireDescription !='' and  requireDescription != null">
                 require_description = #{requireDescription},
             </if>
             <if test=" taskStartTime != null  ">
@@ -164,16 +164,16 @@
             <if test=" longitude != null  ">
                 longitude = #{longitude},
             </if>
-            <if test=" insurance != null  and insurance != ' ' ">
+            <if test="insurance != '' and  insurance != null  ">
                 insurance = #{insurance},
             </if>
-            <if test=" adcode != null  and adcode != ' ' ">
+            <if test="adcode != '' and adcode != null   ">
                 adcode = #{adcode},
             </if>
             <if test=" serviceId != null   ">
                 service_id = #{serviceId},
             </if>
-            <if test=" serviceName != null  and  serviceName!='' ">
+            <if test="serviceName!='' and  serviceName != null ">
                 service_name = #{serviceName},
             </if>
             update_time=NOW(),
@@ -820,6 +820,49 @@
           AND rs.requirements_info_id = #{requirementsInfoId}
     </select>
 
+    <select id="customerDroneFlyerCancel" resultType="com.mmc.csf.release.entity.requirements.RequirementsServiceDO">
+        SELECT ri.id,
+               ri.task_title,
+               ri.task_start_time,
+               ri.task_end_time,
+               ri.task_address,
+               ri.longitude,
+               ri.latitude,
+               ri.require_url,
+               ri.require_description,
+               ri.requirement_type_id,
+               ri.user_account_id,
+               rt.type_name AS requirementTypeName,
+               ri.publish_phone,
+               ri.publisher_number,
+               ri.service_id,
+               ra.total_amount,
+               ri.insurance,
+               rs.create_time,
+               sf.doing,
+               sf.waiting,
+               sf.user_port,
+               sf.flyer_port,
+               sf.order_status,
+               ri.publish,
+               rs.preempt_total_amount,
+               rs.cash_amount,
+               rs.we_chat,
+               rs.salary_amount,
+               rs.wechat_pay_order_number,
+               rs.preempt_total_amount,
+               rs.service_flow_id,
+               ra.order_amount,
+               ri.openid,
+               ra.order_earnings
+        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
+                 INNER JOIN requirements_service rs ON ri.id = rs.requirements_info_id
+        WHERE  rs.requirements_info_id = #{requirementsInfoId}
+    </select>
+
     <select id="publisherCancel" resultType="com.mmc.csf.release.entity.requirements.RequirementsInfoDO">
         SELECT ri.id,
                ri.task_title,
@@ -870,6 +913,56 @@
           AND ri.id = #{requirementsInfoId}
     </select>
 
+
+    <select id="customerPublisherCancel" resultType="com.mmc.csf.release.entity.requirements.RequirementsInfoDO">
+        SELECT ri.id,
+               ri.task_title,
+               ri.task_start_time,
+               ri.task_end_time,
+               ri.task_address,
+               ri.longitude,
+               ri.latitude,
+               ri.require_url,
+               ri.require_description,
+               ri.requirement_type_id,
+               ri.user_account_id,
+               rt.type_name AS requirementTypeName,
+               ri.publish_phone,
+               ri.publisher_number,
+               ri.service_id,
+               ra.total_amount,
+               ri.insurance,
+               ra.order_level,
+               ra.order_amount,
+               sf.doing,
+               sf.waiting,
+               sf.user_port,
+               sf.flyer_port,
+               sf.order_status,
+               ri.publish,
+               ra.order_amount,
+               ra.we_chat,
+               ra.salary_amount,
+               ra.cash_amount,
+               ra.level_cash_amount,
+               ra.level_salary_amount,
+               ra.level_we_chat_amount,
+               ra.wechat_pay_order_number,
+               ri.service_flow_id,
+               rs.pilot_certification_user_id,
+               rs.openid    as flyerOpenid,
+               ri.create_time,
+               ra.order_level_amount,
+               ra.order_earnings
+        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_service rs ON rs.requirements_info_id = ri.id
+        WHERE ri.id = #{requirementsInfoId}
+    </select>
+
     <select id="publisherCancelFlyer" resultType="com.mmc.csf.release.entity.requirements.RequirementsInfoDO">
         SELECT ri.id,
                ri.task_title,