Commit 60404419 authored by zhuxiao's avatar zhuxiao
Browse files

修复微信V3模式下,分账子商户号取值错误问题

parent 8384cb7a
...@@ -26,6 +26,7 @@ import com.jeequan.jeepay.core.constants.CS; ...@@ -26,6 +26,7 @@ import com.jeequan.jeepay.core.constants.CS;
import com.jeequan.jeepay.core.entity.MchDivisionReceiver; import com.jeequan.jeepay.core.entity.MchDivisionReceiver;
import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.entity.PayOrder;
import com.jeequan.jeepay.core.entity.PayOrderDivisionRecord; import com.jeequan.jeepay.core.entity.PayOrderDivisionRecord;
import com.jeequan.jeepay.core.model.params.wxpay.WxpayIsvsubMchParams;
import com.jeequan.jeepay.core.utils.SeqKit; import com.jeequan.jeepay.core.utils.SeqKit;
import com.jeequan.jeepay.pay.channel.IDivisionService; import com.jeequan.jeepay.pay.channel.IDivisionService;
import com.jeequan.jeepay.pay.channel.wxpay.kits.WxpayKit; import com.jeequan.jeepay.pay.channel.wxpay.kits.WxpayKit;
...@@ -105,7 +106,10 @@ public class WxpayDivisionService implements IDivisionService { ...@@ -105,7 +106,10 @@ public class WxpayDivisionService implements IDivisionService {
profitSharingReceiver.setAppid(WxpayKit.getWxPayConfig(wxServiceWrapper).getAppId()); profitSharingReceiver.setAppid(WxpayKit.getWxPayConfig(wxServiceWrapper).getAppId());
// 特约商户 // 特约商户
if(mchAppConfigContext.isIsvsubMch()){ if(mchAppConfigContext.isIsvsubMch()){
profitSharingReceiver.setSubMchId(WxpayKit.getWxPayConfig(wxServiceWrapper).getSubMchId()); WxpayIsvsubMchParams isvsubMchParams =
(WxpayIsvsubMchParams) configContextQueryService.queryIsvsubMchParams(mchAppConfigContext.getMchNo(), mchAppConfigContext.getAppId(), CS.IF_CODE.WXPAY);
profitSharingReceiver.setSubMchId(isvsubMchParams.getSubMchId());
} }
ProfitSharingReceiver receiver = wxServiceWrapper.getWxPayService().getProfitSharingV3Service().addProfitSharingReceiver(profitSharingReceiver); ProfitSharingReceiver receiver = wxServiceWrapper.getWxPayService().getProfitSharingV3Service().addProfitSharingReceiver(profitSharingReceiver);
...@@ -188,7 +192,10 @@ public class WxpayDivisionService implements IDivisionService { ...@@ -188,7 +192,10 @@ public class WxpayDivisionService implements IDivisionService {
request.setAppid(WxpayKit.getWxPayConfig(wxServiceWrapper).getAppId()); request.setAppid(WxpayKit.getWxPayConfig(wxServiceWrapper).getAppId());
// 特约商户 // 特约商户
if(mchAppConfigContext.isIsvsubMch()){ if(mchAppConfigContext.isIsvsubMch()){
request.setSubMchId(WxpayKit.getWxPayConfig(wxServiceWrapper).getSubMchId()); WxpayIsvsubMchParams isvsubMchParams =
(WxpayIsvsubMchParams) configContextQueryService.queryIsvsubMchParams(mchAppConfigContext.getMchNo(), mchAppConfigContext.getAppId(), CS.IF_CODE.WXPAY);
request.setSubMchId(isvsubMchParams.getSubMchId());
} }
if(recordList.isEmpty()){ if(recordList.isEmpty()){
...@@ -265,7 +272,10 @@ public class WxpayDivisionService implements IDivisionService { ...@@ -265,7 +272,10 @@ public class WxpayDivisionService implements IDivisionService {
ProfitSharingUnfreezeRequest request = new ProfitSharingUnfreezeRequest(); ProfitSharingUnfreezeRequest request = new ProfitSharingUnfreezeRequest();
// 特约商户 // 特约商户
if(mchAppConfigContext.isIsvsubMch()){ if(mchAppConfigContext.isIsvsubMch()){
request.setSubMchId(WxpayKit.getWxPayConfig(wxServiceWrapper).getSubMchId()); WxpayIsvsubMchParams isvsubMchParams =
(WxpayIsvsubMchParams) configContextQueryService.queryIsvsubMchParams(mchAppConfigContext.getMchNo(), mchAppConfigContext.getAppId(), CS.IF_CODE.WXPAY);
request.setSubMchId(isvsubMchParams.getSubMchId());
} }
request.setTransactionId(payOrder.getChannelOrderNo()); request.setTransactionId(payOrder.getChannelOrderNo());
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment