From b39ad9e36ff8cebd8e4402bb1e1411ad415eb0fe Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 1 May 2019 17:24:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E6=A0=B8=E9=94=80=E6=8F=90=E7=A4=BA][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E6=A0=B8=E9=94=80=E5=95=86=E6=88=B7?= =?UTF-8?q?=E6=97=A0=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/java/com/iformall/common/ErrorCode.java | 1 + .../com/iformall/service/impl/WxCouponOrderServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index a4cbb0b98..b332df272 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -240,6 +240,7 @@ public enum ErrorCode{ */ VERIFY_ERROR(12050, "核销异常"), MSG_REPEAT_SEND(12061, "短信重复发送"), + VERIFY_COUPON_ORDER_MERANT_IS_NULL(12062, "卡券核销商户无权限"), /** * 解单 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index ad340faab..dfc141a03 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -301,7 +301,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { List couponMerchantList = wxCouponMerchantMapper.findList(wxCouponMerchant); if (!couponMerchantList.stream().anyMatch(cm->cm.getMerchantId().equals(wxMerchantBUser.getMerchantId()))){ logger.error("券: coupon-" + wxCoupon.getId() + "核销: couponMerchantId-" + wxMerchantBUser.getMerchantId()); - throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL); + throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERANT_IS_NULL); } } From f4bc5beac1e6bd098421a4590c3837c0cab8b126 Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 1 May 2019 18:56:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=88=86=E8=B4=A6][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=88=86=E8=B4=A6=E8=B4=A6=E6=88=B7=E6=9C=AA=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=97=B6,=E5=AF=B9=E5=88=86=E8=B4=A6=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E7=BB=93=E6=9D=9F=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxProfitSharingOrderServiceImpl.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) 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 10e7ec24e..235c3726c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -255,23 +255,22 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ psReceiverQ.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); List psReceiverList = wxProfitSharingReceiverMapper.findList(psReceiverQ); if (psReceiverList.size() < 0 || psReceiverList.size() > 50) { - throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID); + return new ResultData(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() == 0) { //没有分账账户,直接结束分账 + if (sharingOrderDto.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode())) + sharingOrderDto.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE_FINISH.getCode()); + if (sharingOrderDto.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_MULTI.getCode())) + return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID); + + return finishSharingOrder(sharingOrderDto); } //计算分账账户合法性 if (psReceiverList.size() > 1 && psReceiverList.stream().filter(r->(r.getParameter() == null)).count() > 0) { - throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID); + return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID); } //计算分账金额合法性 @@ -284,7 +283,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ } }); if (psReceiverList.stream().mapToInt(r->r.getSharingAmount()).sum() > sharingOrderDto.getShareAmount()){ - throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID); + return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID); } //单次分账检查是否已创建分账订单