From b31372ef3d174ea30c13b6530ddbe2bca9672dc1 Mon Sep 17 00:00:00 2001 From: terrfly Date: Fri, 27 May 2022 10:21:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E8=B4=A6=E6=89=A7=E8=A1=8CAPI,=20?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8F=90=E7=A4=BA=E8=AE=A2=E5=8D=95=E4=B8=8D?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ctrl/division/PayOrderDivisionExecController.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/division/PayOrderDivisionExecController.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/division/PayOrderDivisionExecController.java index 18f9b47..8e1f78c 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/division/PayOrderDivisionExecController.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/division/PayOrderDivisionExecController.java @@ -30,7 +30,6 @@ import com.jeequan.jeepay.pay.rqrs.division.PayOrderDivisionExecRQ; import com.jeequan.jeepay.pay.rqrs.division.PayOrderDivisionExecRS; import com.jeequan.jeepay.pay.rqrs.msg.ChannelRetMsg; import com.jeequan.jeepay.pay.service.ConfigContextQueryService; -import com.jeequan.jeepay.pay.service.ConfigContextService; import com.jeequan.jeepay.pay.service.PayOrderDivisionProcessService; import com.jeequan.jeepay.service.impl.MchDivisionReceiverGroupService; import com.jeequan.jeepay.service.impl.MchDivisionReceiverService; @@ -102,7 +101,7 @@ public class PayOrderDivisionExecController extends ApiController { } //处理分账请求 - ChannelRetMsg channelRetMsg = payOrderDivisionProcessService.processPayOrderDivision(bizRQ.getPayOrderId(), bizRQ.getUseSysAutoDivisionReceivers(), receiverList, false); + ChannelRetMsg channelRetMsg = payOrderDivisionProcessService.processPayOrderDivision(payOrder.getPayOrderId(), bizRQ.getUseSysAutoDivisionReceivers(), receiverList, false); PayOrderDivisionExecRS bizRS = new PayOrderDivisionExecRS(); bizRS.setState(channelRetMsg.getChannelState() == ChannelRetMsg.ChannelState.CONFIRM_SUCCESS ? PayOrderDivisionRecord.STATE_SUCCESS : PayOrderDivisionRecord.STATE_FAIL); @@ -148,13 +147,13 @@ public class PayOrderDivisionExecController extends ApiController { if(receiver.getDivisionProfit() != null){ if(receiver.getDivisionProfit().compareTo(BigDecimal.ZERO) < 0){ - throw new BizException("分账用户receiverId=["+receiver.getReceiverId() == null ? "": receiver.getReceiverId()+"]," + - "receiverGroupId=["+receiver.getReceiverGroupId() == null ? "": receiver.getReceiverGroupId()+"] 分账比例不得小于0%"); + throw new BizException("分账用户receiverId=["+ ( receiver.getReceiverId() == null ? "": receiver.getReceiverId() ) +"]," + + "receiverGroupId=["+ (receiver.getReceiverGroupId() == null ? "": receiver.getReceiverGroupId() ) +"] 分账比例不得小于0%"); } if(receiver.getDivisionProfit().compareTo(BigDecimal.ONE) > 0){ - throw new BizException("分账用户receiverId=["+receiver.getReceiverId() == null ? "": receiver.getReceiverId()+"]," + - "receiverGroupId=["+receiver.getReceiverGroupId() == null ? "": receiver.getReceiverGroupId()+"] 分账比例不得高于100%"); + throw new BizException("分账用户receiverId=["+ ( receiver.getReceiverId() == null ? "": receiver.getReceiverId() ) +"]," + + "receiverGroupId=["+ (receiver.getReceiverGroupId() == null ? "": receiver.getReceiverGroupId() ) +"] 分账比例不得高于100%"); } } }