| @@ -254,10 +254,20 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ | |||||
| psReceiverQ.setSharingType(EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT.getCode()); | psReceiverQ.setSharingType(EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT.getCode()); | ||||
| psReceiverQ.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); | psReceiverQ.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); | ||||
| List<WxProfitSharingReceiver> psReceiverList = wxProfitSharingReceiverMapper.findList(psReceiverQ); | List<WxProfitSharingReceiver> psReceiverList = wxProfitSharingReceiverMapper.findList(psReceiverQ); | ||||
| if (psReceiverList.size()<=0 || psReceiverList.size() > 50) { | |||||
| if (psReceiverList.size() < 0 || psReceiverList.size() > 50) { | |||||
| throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID); | throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID); | ||||
| } | } | ||||
| if (psReceiverList.size() == 0) { //没有分账账户,直接分入商户号 | |||||
| WxProfitSharingReceiver receiver = new WxProfitSharingReceiver(); | |||||
| receiver.setReceiverAccount(payAccount.getSubMchId()); | |||||
| receiver.setReceiverType(EnumProfitSharingReceiverType.PROFIT_SHARING_RECEIVER_MERCHANT_ID.getCode()); | |||||
| receiver.setSharingAmount(sharingOrderDto.getShareAmount()); | |||||
| receiver.setParameter(null); | |||||
| receiver.setId(0L); | |||||
| psReceiverList.add(receiver); | |||||
| } | |||||
| //计算分账账户合法性 | //计算分账账户合法性 | ||||
| if (psReceiverList.size() > 1 && | if (psReceiverList.size() > 1 && | ||||
| psReceiverList.stream().filter(r->(r.getParameter() == null)).count() > 0) { | psReceiverList.stream().filter(r->(r.getParameter() == null)).count() > 0) { | ||||