From 26058daecaa1ab08f779712e2017fa146ff71c8c Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 12 Oct 2020 18:06:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E8=B4=A6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxPayOrderController.java | 3 --- .../impl/WxProfitSharingOrderServiceImpl.java | 24 +++++++++---------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java index a9e7d4daf..20d9e64a6 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java @@ -193,9 +193,6 @@ public class WxPayOrderController extends BaseController { //拼团的订单,如果查询到是拼团待付款的,则重新查询是否已经真的支付,其他的直接返回订单信息 if (wxPayOrderService.isOrderGroupCoupon(payOrder, wxCoupon)) { - if(order.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE_REFUND.getCode())) { - return new ResultData(Result.SUCCESS, "拼团失败:人员已满,将稍后退款。"); - } if (!order.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode())) { return new ResultData(Result.SUCCESS, "支付状态更新成功", order); } 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 0e2f3fb6e..f22f86f80 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -233,21 +233,21 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ psReceiverQ.setSharingType(payServiceFactory.getPayShareAdapterService(payWay).getProfitSharingType()); 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) { return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID); } - 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_UNKNOWN); - if(sharingOrderDto.getRateAmount() != null) { - // 分账完结 - sharingOrderDto.setShareAmount(sharingOrderDto.getPayAmount()+sharingOrderDto.getRateAmount()); - } - return finishSharingOrder(sharingOrderDto,payWay); - } +// 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_UNKNOWN); +// if(sharingOrderDto.getRateAmount() != null) { +// // 分账完结 +// sharingOrderDto.setShareAmount(sharingOrderDto.getPayAmount()+sharingOrderDto.getRateAmount()); +// } +// return finishSharingOrder(sharingOrderDto,payWay); +// } //计算分账账户合法性 if (psReceiverList.size() > 1 && psReceiverList.stream().filter(r->(r.getParameter() == null)).count() > 0) {