From 1fab1f2a658ee66de21323ac6dcb594bef1a09a3 Mon Sep 17 00:00:00 2001 From: zhengfangyuan Date: Mon, 15 Aug 2022 09:53:56 +0800 Subject: [PATCH] fix pay v3 --- .../java/com/iformall/service/impl/WxOrderServiceImpl.java | 4 ---- .../sft/miniApp/appPay/WxMiniAppPaySFTAdapterService.java | 6 ++++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 5a810625e..1bdfe5e40 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -208,10 +208,6 @@ public class WxOrderServiceImpl implements WxOrderService { @Qualifier("couponDetailRedisTemplate") RedisTemplate cdRedisTemplate; - @Autowired - @Qualifier("commonObjectRedisTemplate") - RedisTemplate redisTemplate; - @Autowired OrderFactory orderFactory; diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/miniApp/appPay/WxMiniAppPaySFTAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/miniApp/appPay/WxMiniAppPaySFTAdapterService.java index dcd730f13..3e09c5fa1 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/miniApp/appPay/WxMiniAppPaySFTAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/miniApp/appPay/WxMiniAppPaySFTAdapterService.java @@ -118,7 +118,7 @@ public class WxMiniAppPaySFTAdapterService extends BaseWxPaySFTAdapterService i return req; } - private PayAdapterResult getOrderPResult(String response) { + private PayAdapterResult getOrderPResult(String response,WxPayOrder record) { PayAdapterResult par = new PayAdapterResult(); if (StringUtils.isBlank(response)) { par.setSuccess(false); @@ -132,6 +132,8 @@ public class WxMiniAppPaySFTAdapterService extends BaseWxPaySFTAdapterService i }else { par.setSuccess(true); par.setMsg("success."); + record.setPrepayId(prepayId); + record.setUpdateTime(new Date()); } } return par; @@ -174,7 +176,7 @@ public class WxMiniAppPaySFTAdapterService extends BaseWxPaySFTAdapterService i SFTPayCommonMiniAppReq payReq = generatePayCommonRequest(payAccount,composeOrder,productName,record,openId,appInfo,currentDate); String response = WxPayV3SFT.payCommonWithMiniApp(payService, payReq); log.info("pay order v3, " + payReq.toString() + ", response: " + response.toString()); - return getOrderPResult(response); + return getOrderPResult(response,record); } else { throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"因电商收付通合单查询无法处理,暂时不支持合单支付"); //合单支付/小程序支付