|
|
@@ -466,12 +466,12 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService |
|
|
long time = System.currentTimeMillis() + 2000; |
|
|
long time = System.currentTimeMillis() + 2000; |
|
|
String timeStr = String.valueOf(time); |
|
|
String timeStr = String.valueOf(time); |
|
|
if (redisLock.lock2(lockKey, timeStr)) { |
|
|
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<WxThirdPartyOrders> refundOrders = this.getRefundOrderByTransactionId(EnumThirdOrderType.CREDIT_PAY,record.getTransactionId(),record.getTenantId()); |
|
|
List<WxThirdPartyOrders> refundOrders = this.getRefundOrderByTransactionId(EnumThirdOrderType.CREDIT_PAY,record.getTransactionId(),record.getTenantId()); |
|
|
|
|
|
|
|
|
if(refundOrders != null && refundOrders.size()>0){ |
|
|
if(refundOrders != null && refundOrders.size()>0){ |
|
|
@@ -535,7 +535,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService |
|
|
// return new ResultData(creditNum); |
|
|
// return new ResultData(creditNum); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// } |
|
|
}else { |
|
|
}else { |
|
|
logger.debug("CacheAspect 读库等待中, key:{}: " + lockKey); |
|
|
logger.debug("CacheAspect 读库等待中, key:{}: " + lockKey); |
|
|
try { |
|
|
try { |
|
|
|