Requirements(update)

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

@@ -783,7 +783,11 @@ public class RequirementsServiceImpl implements RequirementsService {
         String wechatPayOrderNumber = infoDO.getWechatPayOrderNumber();
         if (wechatPayOrderNumber != null) {
             ApplyRefundVO applyRefundVO = new ApplyRefundVO();
-            applyRefundVO.setRefund(infoDO.getWeChat().multiply(new BigDecimal(100)).longValue());
+            BigDecimal weChat = infoDO.getWeChat();
+            BigDecimal levelWeChatAmount = infoDO.getLevelWeChatAmount();
+            BigDecimal add = weChat.add(levelWeChatAmount);
+            long longValue = add.multiply(new BigDecimal(100)).longValue();
+            applyRefundVO.setRefund(longValue);
             applyRefundVO.setReason("退回微信支付金额");
             applyRefundVO.setOutTradeNo(infoDO.getWechatPayOrderNumber());
             applyRefund(applyRefundVO, request.getHeader("token"));
@@ -794,6 +798,7 @@ public class RequirementsServiceImpl implements RequirementsService {
         requirementsServiceDO.setPercentagePenaltyOfOrder(percentagePenaltyOfOrder);
         //飞手单方面取消将20之二十退回到发布者佣金里面
         flyerCancel(walletFlowVO, request.getHeader("token"));
+        requirementsServiceDO.setOrderEarnings(new BigDecimal(0));
         BigDecimal orderEarnings = requirementsServiceDO.getOrderEarnings();
         BigDecimal add = orderEarnings.add(earnings);
         requirementsServiceDO.setOrderEarnings(add);
@@ -1456,6 +1461,7 @@ public class RequirementsServiceImpl implements RequirementsService {
                 walletFlowVO.setPublisherWalletFlowVO(publisherWalletFlowVO);
                 flyerCancel(walletFlowVO, "");
             }
+            IsNullConvertZeroUtil.checkIsNull(requirementsInfoDO);
             if (requirementsInfoDO.getWechatPayOrderNumber() != null
                     && requirementsInfoDO.getWeChat().compareTo(BigDecimal.ZERO) != 0) {
                 BigDecimal weChat = requirementsInfoDO.getWeChat();

release-service/src/main/java/com/mmc/csf/release/timerTask/ServiceTakeDownTask.java

@@ -23,12 +23,13 @@ public class ServiceTakeDownTask {
 
     //0 30 0 * * ?
     //* * * * * ?
+    //@Scheduled(cron = "0 30 0 * * ?")
+    //@Scheduled(cron = "* * * * * ?")
     @Scheduled(cron = "0 30 0 * * ?")
     public void orderCheck() {
-
         String format = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         ResultBody resultBody = requirementsService.orderRequirements(format);
         System.out.println(resultBody);
-        System.out.println("查询订单失效");
+        System.out.println("查询订单成功");
     }
 }