From f819707ba4e0ef36b6bbf873b3b29ea84a6dcd33 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 20 Sep 2022 14:15:09 +0800 Subject: [PATCH] //third --- .../controller/UserThirdCircleOrderController.java | 8 ++++---- .../impl/WxThirdPartyOrdersServiceImpl.java | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java index f46f55790..ad2aba4c8 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java +++ b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java @@ -433,9 +433,9 @@ public class UserThirdCircleOrderController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"refundTime格式不正确"); } - if(StringUtils.isBlank(refundId)){ - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"refundId为空"); - } +// if(StringUtils.isBlank(refundId)){ +// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"refundId为空"); +// } WxThirdPartyOrders thirdPartyOrders = new WxThirdPartyOrders(); thirdPartyOrders.updateTenantInfo(getTenantInfo()); @@ -506,7 +506,7 @@ public class UserThirdCircleOrderController extends BaseController { try { Integer.parseInt(amount); } catch (NumberFormatException e) { - return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"amount为正整数"); + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"amount为整数"); } WxThirdPartyOrders thirdPartyOrders = new WxThirdPartyOrders(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java index 6fbd74982..5becfc5f1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java @@ -466,12 +466,12 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService long time = System.currentTimeMillis() + 2000; String timeStr = String.valueOf(time); if (redisLock.lock2(lockKey, timeStr)) { - WxThirdPartyOrders refundOrder = this.getRefundOrderByRefundId(EnumThirdOrderType.CREDIT_PAY,record.getRefundId(),record.getTenantId()); - if(refundOrder != null){ - logger.error("--第三方积分退款--退款消息已存在---RefundId="+record.getRefundId()); - redisLock.unlock(lockKey, timeStr); - throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "退款数据已存在"); - }else{ +// WxThirdPartyOrders refundOrder = this.getRefundOrderByRefundId(EnumThirdOrderType.CREDIT_PAY,record.getRefundId(),record.getTenantId()); +// if(refundOrder != null){ +// logger.error("--第三方积分退款--退款消息已存在---RefundId="+record.getRefundId()); +// redisLock.unlock(lockKey, timeStr); +// throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "退款数据已存在"); +// }else{ List refundOrders = this.getRefundOrderByTransactionId(EnumThirdOrderType.CREDIT_PAY,record.getTransactionId(),record.getTenantId()); if(refundOrders != null && refundOrders.size()>0){ @@ -535,7 +535,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService // return new ResultData(creditNum); } - } +// } }else { logger.debug("CacheAspect 读库等待中, key:{}: " + lockKey); try {