| @@ -442,7 +442,8 @@ public class TtPayShareService extends PayShareBaseAdapterService{ | |||||
| List<WxProfitSharingReceiver> list = wxProfitSharingReceiverMapper.findList(psReceiverQ); | List<WxProfitSharingReceiver> list = wxProfitSharingReceiverMapper.findList(psReceiverQ); | ||||
| if(list == null || list.isEmpty()){ | if(list == null || list.isEmpty()){ | ||||
| throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getCode(),"该商户未未进件."+payMsg); | |||||
| return null; | |||||
| // throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getCode(),"该商户未未进件."+payMsg); | |||||
| } | } | ||||
| if(list.size() > 1){ | if(list.size() > 1){ | ||||
| throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_UNKNOWN.getCode(),"该商户分账帐号异常."); | throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_UNKNOWN.getCode(),"该商户分账帐号异常."); | ||||
| @@ -405,7 +405,8 @@ public class WxPayShareService extends PayShareBaseAdapterService{ | |||||
| psReceiverQ.setPlat(EnumAppPlat.WX.getCode()); | psReceiverQ.setPlat(EnumAppPlat.WX.getCode()); | ||||
| List<WxProfitSharingReceiver> psReceiverList = wxProfitSharingReceiverMapper.findList(psReceiverQ); | List<WxProfitSharingReceiver> psReceiverList = wxProfitSharingReceiverMapper.findList(psReceiverQ); | ||||
| if (null == psReceiverList || psReceiverList.size() == 0) { | if (null == psReceiverList || psReceiverList.size() == 0) { | ||||
| throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getCode(),"该商户未设置分账账号."); | |||||
| return null; | |||||
| // throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getCode(),"该商户未设置分账账号."); | |||||
| }else { | }else { | ||||
| for (WxProfitSharingReceiver receiver:psReceiverList) { | for (WxProfitSharingReceiver receiver:psReceiverList) { | ||||
| if (EnumProfitSharingReceiverType.PROFIT_SHARING_RECEIVER_PERSONAL_WECHATID.getCode().intValue() | if (EnumProfitSharingReceiverType.PROFIT_SHARING_RECEIVER_PERSONAL_WECHATID.getCode().intValue() | ||||
| @@ -149,9 +149,9 @@ public class WxPayShareV3Service extends PayShareBaseAdapterService{ | |||||
| }else if (EnumPayMchType.TOTAL.getCode() == mchType) { | }else if (EnumPayMchType.TOTAL.getCode() == mchType) { | ||||
| receiver = wxProfitSharingReceiverService.findReceiver(tenantEntity, merchantId,EnumAppPlat.WX,EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT); | receiver = wxProfitSharingReceiverService.findReceiver(tenantEntity, merchantId,EnumAppPlat.WX,EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT); | ||||
| } | } | ||||
| if (null == receiver) { | |||||
| throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getCode(),"该商户未设置分账账号."); | |||||
| } | |||||
| // if (null == receiver) { | |||||
| // throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getCode(),"该商户未设置分账账号."); | |||||
| // } | |||||
| return receiver; | return receiver; | ||||
| } | } | ||||