diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java index 1c158eaad..d2281bcec 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java @@ -131,8 +131,8 @@ public class EmisCommonController extends EmisBaseController */ @PostMapping("/payNotifyCallback") public String payNotifyCallback(String method,String data,String sign_type,String sign){ - log.info("payNotifyCallback start"); + log.info("payNotifyCallback start"); if(StringUtils.isAnyEmpty(method,data,sign)){ return "fail"; } @@ -162,20 +162,26 @@ public class EmisCommonController extends EmisBaseController err_msg String 错误消息 */ + + + JSONObject jobjRst = JSONObject.parseObject(data); String payId = jobjRst.getString("order_no"); if(StringUtils.isEmpty(payId)){ return "fail"; } + String lockKey="payNotifyCallback_"+payId; + redissonService.lock(lockKey,300); try { log.info("payNotifyCallback start"); emisSettleBillPayLogService.checkPayStatus(payId); } catch (EmisBizError emisBizError) { + redissonService.unlock(lockKey); emisBizError.printStackTrace(); return emisBizError.getMessage(); } - + redissonService.unlock(lockKey); log.info("payNotifyCallback end"); return "success"; }