Req(update)

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

@@ -994,7 +994,9 @@ public class RequirementsServiceImpl implements RequirementsService {
     public ResultBody publisherCancel(Integer requirementsInfoId, Integer userAccountId, HttpServletRequest request) {
         RequirementsInfoDO requirementsInfoDO = requirementsDao.publisherCancel(requirementsInfoId, userAccountId);
         RequirementsServiceDO serviceDO = requirementsDao.serviceReq(requirementsInfoId);
-        IsNullConvertZeroUtil.checkIsNull(serviceDO);
+        if (serviceDO != null) {
+            IsNullConvertZeroUtil.checkIsNull(serviceDO);
+        }
         if (requirementsInfoDO == null) {
             return ResultBody.error("当前订单不存在");
         }
@@ -1013,12 +1015,22 @@ public class RequirementsServiceImpl implements RequirementsService {
             //飞手无责取消 将全部退回 不包含加急或者置顶
             //支付
             if (requirementsInfoDO.getCashAmount().compareTo(BigDecimal.ZERO) != 0 ||
-                    requirementsInfoDO.getSalaryAmount().compareTo(BigDecimal.ZERO) != 0) {
+                    requirementsInfoDO.getSalaryAmount().compareTo(BigDecimal.ZERO) != 0 ||
+                    requirementsInfoDO.getLevelSalaryAmount().compareTo(BigDecimal.ZERO) != 0 ||
+                    requirementsInfoDO.getLevelCashAmount().compareTo(BigDecimal.ZERO) != 0) {
                 publisherWalletFlowVO.setModeOfPayment(200);
                 publisherWalletFlowVO.setUserAccountId(userAccountId);
                 publisherWalletFlowVO.setOperateUserAccountId(userAccountId);
                 publisherWalletFlowVO.setSalaryAmount(requirementsInfoDO.getSalaryAmount());
                 publisherWalletFlowVO.setCashAmount(requirementsInfoDO.getCashAmount());
+                if (requirementsInfoDO.getOrderLevel().equals("RUSH_ORDER")) {
+                    publisherWalletFlowVO.setUrgentYxjAmount(requirementsInfoDO.getLevelCashAmount().negate());
+                    publisherWalletFlowVO.setUrgentSalaryAmount(requirementsInfoDO.getLevelSalaryAmount().negate());
+                }
+                if (requirementsInfoDO.getOrderLevel().equals("TOP_ORDER")) {
+                    publisherWalletFlowVO.setTopYxjAmount(requirementsInfoDO.getLevelCashAmount().negate());
+                    publisherWalletFlowVO.setTopSalaryAmount(requirementsInfoDO.getLevelSalaryAmount().negate());
+                }
                 walletFlowVO.setPublisherWalletFlowVO(publisherWalletFlowVO);
                 flyerCancel(walletFlowVO, request.getHeader("token"));
             }
@@ -1459,7 +1471,7 @@ public class RequirementsServiceImpl implements RequirementsService {
                 publisherWalletFlowVO.setSalaryAmount(requirementsInfoDO.getSalaryAmount());
                 publisherWalletFlowVO.setCashAmount(requirementsInfoDO.getCashAmount());
                 walletFlowVO.setPublisherWalletFlowVO(publisherWalletFlowVO);
-                flyerCancel(walletFlowVO, "");
+                flyerCancelNO(walletFlowVO, "");
             }
             IsNullConvertZeroUtil.checkIsNull(requirementsInfoDO);
             if (requirementsInfoDO.getWechatPayOrderNumber() != null
@@ -2455,6 +2467,27 @@ public class RequirementsServiceImpl implements RequirementsService {
         return ResultBody.success();
     }
 
+    /**
+     * 公共调用
+     *
+     * @param walletFlowVO
+     * @param token
+     * @return
+     */
+    public ResultBody flyerCancelNO(WalletFlowVO walletFlowVO, String token) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.add("token", token);
+        HttpEntity<String> entity = new HttpEntity<>(JSONObject.toJSONString(walletFlowVO), headers);
+        ResponseEntity<Object> exchange = null;
+        try {
+            exchange = restTemplate.exchange(userApp + "/userapp/pay/feignWalletFlowNO", HttpMethod.POST, entity, Object.class);
+        } catch (RestClientException e) {
+            return ResultBody.error(ResultEnum.THE_THIRD_PARTY_INTERFACE_IS_BEING_UPDATED);
+        }
+        return ResultBody.success();
+    }
+
 
     /**
      * 公共调用

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

@@ -764,7 +764,7 @@
                  LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
                  INNER JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
         WHERE ri.service_flow_id = 1
-          AND publish = 1
+          AND ri.publish = 1
           and ri.task_end_time < #{format}
     </select>
     <update id="updateServiceAmount">