From 6b44772d4cf1295a7bd1cdd62fbc1c1022ca1040 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 15 Mar 2023 10:31:24 +0800 Subject: [PATCH 1/2] //card ref --- .../java/com/iformall/controller/WxCardPayController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java index d8a30374d..121ab2980 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -355,7 +355,11 @@ public class WxCardPayController extends BaseController { } if(!getLoginBUser().getMerchantId().equals(cardSend.getMerchantId())){ - return new ResultData(ErrorCode.ORDER_IS_NOT_FIND.getCode(), "该门店与订单不匹配"); + return new ResultData(ErrorCode.ORDER_PAY_REFUND_FAIL.getCode(), "该门店与订单不匹配"); + } + + if(!DateUtils.isSameMonth(new Date(),cardSend.getCreateDate())){ + return new ResultData(ErrorCode.ORDER_PAY_REFUND_FAIL.getCode(), "只能退本月订单"); } if(refund > cardSend.getDeductionAmount()){ From ee13d4782cab8dbab12b8544a69bde76669af93e Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 15 Mar 2023 11:03:48 +0800 Subject: [PATCH 2/2] //card ref --- .../main/java/com/iformall/controller/WxCardPayController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java index 121ab2980..404601f91 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -350,7 +350,7 @@ public class WxCardPayController extends BaseController { } WxCardSpend cardSend = wxCardSpendService.getById(cardSpendId); - if(cardSend == null || EnumPayType.PAY_PAYMENT.getCode().equals(cardSend.getPayType())){ + if(cardSend == null || !EnumPayType.PAY_PAYMENT.getCode().equals(cardSend.getPayType())){ return new ResultData(ErrorCode.ORDER_IS_NOT_FIND.getCode(), "未找到订单"); }