xhxu 3 лет назад
Родитель
Сommit
f819707ba4
2 измененных файлов: 11 добавлений и 11 удалений
  1. +4
    -4
      mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java
  2. +7
    -7
      mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java

+ 4
- 4
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格式不正确"); 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(); WxThirdPartyOrders thirdPartyOrders = new WxThirdPartyOrders();
thirdPartyOrders.updateTenantInfo(getTenantInfo()); thirdPartyOrders.updateTenantInfo(getTenantInfo());
@@ -506,7 +506,7 @@ public class UserThirdCircleOrderController extends BaseController {
try { try {
Integer.parseInt(amount); Integer.parseInt(amount);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"amount为整数");
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"amount为整数");
} }


WxThirdPartyOrders thirdPartyOrders = new WxThirdPartyOrders(); WxThirdPartyOrders thirdPartyOrders = new WxThirdPartyOrders();


+ 7
- 7
mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java Просмотреть файл

@@ -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 {


Загрузка…
Отмена
Сохранить