From 5b959d3582b886d8fb2beba632e40f57faf98642 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 31 Jul 2020 10:14:24 +0800 Subject: [PATCH] update --- .../main/java/com/iformall/service/WxPayOrderService.java | 2 +- .../com/iformall/service/impl/WxPayOrderServiceImpl.java | 8 ++++---- .../java/com/iformall/service/pay/PayServiceFactory.java | 4 ++-- ...AdapterService.java => WxMiniMaPayAdapterService.java} | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) rename mallinkService/src/main/java/com/iformall/service/pay/service/miniApp/wx/maPay/{WxMaPayAdapterService.java => WxMiniMaPayAdapterService.java} (99%) diff --git a/mallinkService/src/main/java/com/iformall/service/WxPayOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxPayOrderService.java index 0a5b07257..cfcc4d3e1 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPayOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPayOrderService.java @@ -85,7 +85,7 @@ public interface WxPayOrderService { * @param record * @param transactionId */ - void handleMicroOrderPaySuccess(Object result,String transcationId,WxPayOrder record ,WxMerchantBUser user,WxAppinfo appInfo,PayExtraParam params); + void handleMicroOrderPaySuccess(Object result,String transcationId,EnumPayWay payWay,WxPayOrder record ,WxMerchantBUser user,WxAppinfo appInfo,PayExtraParam params); /** * 券支付成功处理 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 1e3ff314a..4cb649067 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -485,7 +485,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { //支付失败,更新record,支付成功,则调用 if (payResult.isSuccess()) { - handleMicroOrderPaySuccess(payResult.getData(), payResult.getTransactionId(),record,user, appInfo, params); + handleMicroOrderPaySuccess(payResult.getData(), payResult.getTransactionId(),payWay,record,user, appInfo, params); return new ResultData(Result.SUCCESS, "创建支付订单成功", payResult.getData()); }else { try { @@ -552,7 +552,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { handleOrderPaySuccess(record, apiResult.getTransactionId()); //C端被动支付 }else if (payService instanceof CPassivePayService) { - handleMicroOrderPaySuccess(apiResult.getData(),apiResult.getTransactionId(), record,user,appInfo,null); + handleMicroOrderPaySuccess(apiResult.getData(),apiResult.getTransactionId(),payWay, record,user,appInfo,null); } return new ResultData(Result.SUCCESS, "success",apiResult.getData()); }else if (status == EnumPayStatus.PAY_STATUS_ORDER_NOT_EXISTS.getCode().intValue()) { @@ -1094,11 +1094,11 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) - public void handleMicroOrderPaySuccess(Object result,String transcationId, WxPayOrder record ,WxMerchantBUser user,WxAppinfo appInfo,PayExtraParam params) { + public void handleMicroOrderPaySuccess(Object result,String transcationId,EnumPayWay payWay, WxPayOrder record ,WxMerchantBUser user,WxAppinfo appInfo,PayExtraParam params) { //B端操作,需要生成cUser Long cUserId; try { - cUserId = payServiceFactory.getCPassivePayService(1).createCUserAfterPay(result, appInfo); + cUserId = payServiceFactory.getCPassivePayService(payWay.getCode()).createCUserAfterPay(result, appInfo); } catch (Exception e1) { logger.error("创建C端用户失败: " ,e1); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "创建C端用户失败: " + e1.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java b/mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java index 066681fa7..d07078b8e 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java @@ -15,7 +15,7 @@ import com.iformall.service.pay.service.CDrivingPayService; import com.iformall.service.pay.service.CPassivePayService; import com.iformall.service.pay.service.PayAdapterService; import com.iformall.service.pay.service.miniApp.wx.appPay.WxMiniAppPayAdapterService; -import com.iformall.service.pay.service.miniApp.wx.maPay.WxMaPayAdapterService; +import com.iformall.service.pay.service.miniApp.wx.maPay.WxMiniMaPayAdapterService; /** * 支付方式工厂 @@ -29,7 +29,7 @@ public class PayServiceFactory { @Autowired WxMiniAppPayAdapterService wxMiniAppPayService; @Autowired - WxMaPayAdapterService wxMiniAppMaPayService; + WxMiniMaPayAdapterService wxMiniAppMaPayService; @Autowired WxPayOrderService wxPayOrderService; diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/miniApp/wx/maPay/WxMaPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/miniApp/wx/maPay/WxMiniMaPayAdapterService.java similarity index 99% rename from mallinkService/src/main/java/com/iformall/service/pay/service/miniApp/wx/maPay/WxMaPayAdapterService.java rename to mallinkService/src/main/java/com/iformall/service/pay/service/miniApp/wx/maPay/WxMiniMaPayAdapterService.java index b6a5103ad..73de61fde 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/miniApp/wx/maPay/WxMaPayAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/miniApp/wx/maPay/WxMiniMaPayAdapterService.java @@ -34,7 +34,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Service -public class WxMaPayAdapterService extends BaseWxPayAdapterService implements CPassivePayService{ +public class WxMiniMaPayAdapterService extends BaseWxPayAdapterService implements CPassivePayService{ private WxMicroPayOrderP generateWxMicroPayOrderP(WxPayAccount payAccount, WxOrder order, WxPayOrder record, EnumPayShare isShare, WxAppinfo appInfo, Date currentDate,String bAppId,String bUserPhone) throws Exception {