autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-13 03:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

请求订单号，缓存30分钟

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-03-25 15:46:08 +08:00
parent 7dfc793472
commit 1045d73690
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java
View File

@@ -115,11 +115,8 @@ public class AdapayService {
String delayMode = pileMerchantInfoService.getDelayModeByWechatAppId(dto.getWechatAppId()); String delayMode = pileMerchantInfoService.getDelayModeByWechatAppId(dto.getWechatAppId());
String payMode = MerchantDelayModeEnum.getAdapayPayMode(delayMode); String payMode = MerchantDelayModeEnum.getAdapayPayMode(delayMode);
CreateAdaPaymentParam createAdaPaymentParam = new CreateAdaPaymentParam(); CreateAdaPaymentParam createAdaPaymentParam = new CreateAdaPaymentParam();
// 请求订单号 // 请求订单号, 防止请求订单号重复，结尾拼接时间
String orderNo = dto.getOrderCode() + "_" + DateUtils.dateTimeNow(); String orderNo = dto.getOrderCode() + "_" + DateUtils.dateTimeNow();
// if (ScenarioEnum.OCCUPY.getValue().equals(type)) {
// orderNo = orderNo + "_" + DateUtils.dateTimeNow();
// }
createAdaPaymentParam.setOrder_no(orderNo); createAdaPaymentParam.setOrder_no(orderNo);
createAdaPaymentParam.setPay_amt(amount); createAdaPaymentParam.setPay_amt(amount);
createAdaPaymentParam.setApp_id(config.getAdapayAppId()); createAdaPaymentParam.setApp_id(config.getAdapayAppId());
@@ -156,6 +153,9 @@ public class AdapayService {
if (resultMap != null) { if (resultMap != null) {
// 请求参数放入缓存，15分钟以内返回同一个支付参数 // 请求参数放入缓存，15分钟以内返回同一个支付参数
redisCache.setCacheObject(redisKey, resultMap, 15, TimeUnit.MINUTES); redisCache.setCacheObject(redisKey, resultMap, 15, TimeUnit.MINUTES);
// 请求订单号放redis
redisCache.setCacheObject(CacheConstants.ORDER_WECHAT_PAY_PARAMETERS + dto.getOrderCode(), orderNo, 30, TimeUnit.MINUTES);
} }
return resultMap; return resultMap;
} }

4
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
View File

@@ -106,10 +106,6 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
// 返回微信支付参数 // 返回微信支付参数
resultMap.put("weixinMap", weixinMap); 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())) { // 白名单支付 } else if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue())) { // 白名单支付
// 白名单支付可以直接调支付回调方法 // 白名单支付可以直接调支付回调方法
dto.setPayAmount(Constants.whitelistDefaultAmount); dto.setPayAmount(Constants.whitelistDefaultAmount);

4
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java
View File

@@ -215,10 +215,6 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic {
// 返回微信支付参数 // 返回微信支付参数
resultMap.put("weixinMap", weixinMap); 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())) { // 白名单支付 } else if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue())) { // 白名单支付
// 白名单支付可以直接调支付回调方法 // 白名单支付可以直接调支付回调方法
dto.setPayAmount(Constants.whitelistDefaultAmount); dto.setPayAmount(Constants.whitelistDefaultAmount);