From db8a57a647dad3fd8106ea4280c19b7332593ddf Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 26 Dec 2018 13:51:07 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=86=E8=B4=A6][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=BD=93=E6=B2=A1=E6=9C=89=E9=85=8D=E5=95=86=E6=88=B7=E5=88=86?= =?UTF-8?q?=E8=B4=A6=E8=B4=A6=E6=88=B7,=E7=9B=B4=E6=8E=A5=E5=88=86?= =?UTF-8?q?=E8=B4=A6=E5=88=B0=E5=95=86=E5=9C=BA=E5=95=86=E6=88=B7=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxProfitSharingOrderServiceImpl.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java index e6724dee5..51d0ed53c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -254,10 +254,20 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ psReceiverQ.setSharingType(EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT.getCode()); psReceiverQ.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); List 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); } + 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 && psReceiverList.stream().filter(r->(r.getParameter() == null)).count() > 0) {