From 1045d736900c70b6ae08799c6a22bc3a99bedfc7 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 25 Mar 2024 15:46:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E8=AE=A2=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=EF=BC=8C=E7=BC=93=E5=AD=9830=E5=88=86=E9=92=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsowell/adapay/service/AdapayService.java | 8 ++++---- .../service/programlogic/DelayMerchantProgramLogic.java | 4 ---- .../programlogic/NotDelayMerchantProgramLogic.java | 4 ---- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java index a9021bf49..b7731189d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java @@ -115,11 +115,8 @@ public class AdapayService { String delayMode = pileMerchantInfoService.getDelayModeByWechatAppId(dto.getWechatAppId()); String payMode = MerchantDelayModeEnum.getAdapayPayMode(delayMode); CreateAdaPaymentParam createAdaPaymentParam = new CreateAdaPaymentParam(); - // 请求订单号 + // 请求订单号, 防止请求订单号重复，结尾拼接时间 String orderNo = dto.getOrderCode() + "_" + DateUtils.dateTimeNow(); - // if (ScenarioEnum.OCCUPY.getValue().equals(type)) { - // orderNo = orderNo + "_" + DateUtils.dateTimeNow(); - // } createAdaPaymentParam.setOrder_no(orderNo); createAdaPaymentParam.setPay_amt(amount); createAdaPaymentParam.setApp_id(config.getAdapayAppId()); @@ -156,6 +153,9 @@ public class AdapayService { if (resultMap != null) { // 请求参数放入缓存，15分钟以内返回同一个支付参数 redisCache.setCacheObject(redisKey, resultMap, 15, TimeUnit.MINUTES); + + // 请求订单号放redis + redisCache.setCacheObject(CacheConstants.ORDER_WECHAT_PAY_PARAMETERS + dto.getOrderCode(), orderNo, 30, TimeUnit.MINUTES); } return resultMap; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java index 4fe0fd6f1..f07b76425 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java @@ -106,10 +106,6 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { // 返回微信支付参数 resultMap.put("weixinMap", weixinMap); - - // 微信支付参数放redis WeChat Pay parameters - String redisKey = CacheConstants.ORDER_WECHAT_PAY_PARAMETERS + dto.getOrderCode(); - redisCache.setCacheObject(redisKey, weixinMap, CacheConstants.cache_expire_time_30m); } else if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue())) { // 白名单支付 // 白名单支付可以直接调支付回调方法 dto.setPayAmount(Constants.whitelistDefaultAmount); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java index 4dfa0fc10..5e053b799 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java @@ -215,10 +215,6 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic { // 返回微信支付参数 resultMap.put("weixinMap", weixinMap); - - // 微信支付参数放redis WeChat Pay parameters - String redisKey = CacheConstants.ORDER_WECHAT_PAY_PARAMETERS + dto.getOrderCode(); - redisCache.setCacheObject(redisKey, weixinMap, CacheConstants.cache_expire_time_30m); } else if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue())) { // 白名单支付 // 白名单支付可以直接调支付回调方法 dto.setPayAmount(Constants.whitelistDefaultAmount);