Requirement(update)

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

@@ -1317,6 +1317,39 @@ public class RequirementsServiceImpl implements RequirementsService {
     public ResultBody updateServicePublish(ServiceRequirementsEditVO requirementsEditVO, HttpServletRequest request) {
         RequirementsInfoDO requirementsInfoDO = requirementsDao.publisherCancel(requirementsEditVO.getRequirementsInfoId(), requirementsEditVO.getUserAccountId());
         RequirementsAmountDO amountDO = new RequirementsAmountDO(requirementsEditVO);
+        if (requirementsEditVO.getWechatPayOrderNumber() != null) {
+            UserPayInfoVO userPayInfoVO = queryUserPayInfo(requirementsEditVO.getWechatPayOrderNumber(), request);
+            if (userPayInfoVO.getTradeState() != "SUCCESS") {
+                return ResultBody.error("支付失败，请重新支付");
+            }
+        }
+        WalletFlowVO walletFlowVO = new WalletFlowVO();
+        PublisherWalletFlowVO publisherWalletFlowVO = new PublisherWalletFlowVO();
+        IsNullConvertZeroUtil.checkIsNull(publisherWalletFlowVO);
+        ApplyRefundVO applyRefundVO = new ApplyRefundVO();
+        //先退款
+        if (requirementsInfoDO.getCashAmount().compareTo(BigDecimal.ZERO) != 0 ||
+                requirementsInfoDO.getSalaryAmount().compareTo(BigDecimal.ZERO) != 0) {
+            publisherWalletFlowVO.setModeOfPayment(200);
+            publisherWalletFlowVO.setUserAccountId(requirementsInfoDO.getUserAccountId());
+            publisherWalletFlowVO.setOperateUserAccountId(requirementsInfoDO.getUserAccountId());
+            publisherWalletFlowVO.setSalaryAmount(requirementsInfoDO.getSalaryAmount());
+            publisherWalletFlowVO.setCashAmount(requirementsInfoDO.getCashAmount());
+            walletFlowVO.setPublisherWalletFlowVO(publisherWalletFlowVO);
+            flyerCancel(walletFlowVO, request.getHeader("token"));
+        }
+        //退回微信的钱
+        if (requirementsInfoDO.getWechatPayOrderNumber() != null
+                && requirementsInfoDO.getWeChat().compareTo(BigDecimal.ZERO) != 0) {
+            BigDecimal weChat = requirementsInfoDO.getWeChat();
+            BigDecimal multiply = weChat.multiply(new BigDecimal(100));
+            Long longWeChat = multiply.longValue();
+            applyRefundVO.setRefund(longWeChat);
+            applyRefundVO.setOutTradeNo(requirementsInfoDO.getWechatPayOrderNumber());
+            applyRefundVO.setReason("退发布者微信支付的任务佣金");
+            applyRefund(applyRefundVO, request.getHeader("token"));
+        }
+
         RequirementsInfoDO infoDO = new RequirementsInfoDO(requirementsEditVO);
         if (requirementsInfoDO == null) {
             return ResultBody.error("只能修改自己发布的服务需求");
@@ -1325,10 +1358,6 @@ public class RequirementsServiceImpl implements RequirementsService {
         if (serviceFlowId != 1) {
             return ResultBody.error("只有未抢单的信息才能被修改");
         }
-        WalletFlowVO walletFlowVO = new WalletFlowVO();
-        PublisherWalletFlowVO publisherWalletFlowVO = new PublisherWalletFlowVO();
-        IsNullConvertZeroUtil.checkIsNull(publisherWalletFlowVO);
-        ApplyRefundVO applyRefundVO = new ApplyRefundVO();
 
 
         //用户钱包信息接口
@@ -1396,35 +1425,7 @@ public class RequirementsServiceImpl implements RequirementsService {
             }
         }
         if (tempTotalAmount.compareTo(BigDecimal.ZERO) == 0) {
-            if (requirementsEditVO.getWechatPayOrderNumber() != null) {
-                UserPayInfoVO userPayInfoVO = queryUserPayInfo(requirementsEditVO.getWechatPayOrderNumber(), request);
-                if (userPayInfoVO.getTradeState() != "SUCCESS") {
-                    return ResultBody.error("支付失败，请重新支付");
-                }
-            }
 
-            //先退款
-            if (requirementsInfoDO.getCashAmount().compareTo(BigDecimal.ZERO) != 0 ||
-                    requirementsInfoDO.getSalaryAmount().compareTo(BigDecimal.ZERO) != 0) {
-                publisherWalletFlowVO.setModeOfPayment(200);
-                publisherWalletFlowVO.setUserAccountId(requirementsInfoDO.getUserAccountId());
-                publisherWalletFlowVO.setOperateUserAccountId(requirementsInfoDO.getUserAccountId());
-                publisherWalletFlowVO.setSalaryAmount(requirementsInfoDO.getSalaryAmount());
-                publisherWalletFlowVO.setCashAmount(requirementsInfoDO.getCashAmount());
-                walletFlowVO.setPublisherWalletFlowVO(publisherWalletFlowVO);
-                flyerCancel(walletFlowVO, request.getHeader("token"));
-            }
-            //退回微信的钱
-            if (requirementsInfoDO.getWechatPayOrderNumber() != null
-                    && requirementsInfoDO.getWeChat().compareTo(BigDecimal.ZERO) != 0) {
-                BigDecimal weChat = requirementsInfoDO.getWeChat();
-                BigDecimal multiply = weChat.multiply(new BigDecimal(100));
-                Long longWeChat = multiply.longValue();
-                applyRefundVO.setRefund(longWeChat);
-                applyRefundVO.setOutTradeNo(requirementsInfoDO.getWechatPayOrderNumber());
-                applyRefundVO.setReason("退发布者微信支付的任务佣金");
-                applyRefund(applyRefundVO, request.getHeader("token"));
-            }
             requirementsDao.InsertRequirementsAmountLog(requirementsInfoDO);
             IndustryTypeDTO industryTypeDTO = getIndustryTypeById(requirementsEditVO.getServiceId());
             infoDO.setServiceName(industryTypeDTO.getTypeName());
@@ -1932,6 +1933,7 @@ public class RequirementsServiceImpl implements RequirementsService {
     @Override
     public ResultBody grabTheOrder(GrabTheOrderVO grabTheOrderVO, HttpServletRequest request) {
 
+
         UserAccountSimpleDTO userAccountSimpleDTO = feignGetUserSimpleInfo(grabTheOrderVO.getUserAccountId(), request);
         String openid = userAccountSimpleDTO.getOpenid();
 
@@ -2380,6 +2382,25 @@ public class RequirementsServiceImpl implements RequirementsService {
         return body;
     }
 
+    /**
+     * 删除抢单未支付的金额
+     *
+     * @param requirementsInfoId
+     * @param request
+     * @return
+     */
+    public ResultBody getDelete(Integer requirementsInfoId, HttpServletRequest request) {
+        String token = request.getHeader("token");
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.add("token", token);
+        HttpEntity<String> entity = new HttpEntity<>(JSONObject.toJSONString(requirementsInfoId), headers);
+        ResponseEntity<ResultBody> exchange = restTemplate.exchange(omsApp + "releaseOrder/getDelete?requirementsInfoId=" + requirementsInfoId, HttpMethod.GET, entity, ResultBody.class);
+        //UserPayInfoVO body = exchange.getBody();
+        ResultBody body = exchange.getBody();
+        return body;
+    }
+
 
     public IndustryTypeDTO getIndustryTypeById(Integer serviceId) {
         HttpHeaders headers = new HttpHeaders();