Commit b31372ef authored by terrfly's avatar terrfly
Browse files

分账执行API, 解决提示订单不存在的问题

parent 43c9a6bb
...@@ -30,7 +30,6 @@ import com.jeequan.jeepay.pay.rqrs.division.PayOrderDivisionExecRQ; ...@@ -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.division.PayOrderDivisionExecRS;
import com.jeequan.jeepay.pay.rqrs.msg.ChannelRetMsg; import com.jeequan.jeepay.pay.rqrs.msg.ChannelRetMsg;
import com.jeequan.jeepay.pay.service.ConfigContextQueryService; 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.pay.service.PayOrderDivisionProcessService;
import com.jeequan.jeepay.service.impl.MchDivisionReceiverGroupService; import com.jeequan.jeepay.service.impl.MchDivisionReceiverGroupService;
import com.jeequan.jeepay.service.impl.MchDivisionReceiverService; import com.jeequan.jeepay.service.impl.MchDivisionReceiverService;
...@@ -102,7 +101,7 @@ public class PayOrderDivisionExecController extends ApiController { ...@@ -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(); PayOrderDivisionExecRS bizRS = new PayOrderDivisionExecRS();
bizRS.setState(channelRetMsg.getChannelState() == ChannelRetMsg.ChannelState.CONFIRM_SUCCESS ? PayOrderDivisionRecord.STATE_SUCCESS : PayOrderDivisionRecord.STATE_FAIL); bizRS.setState(channelRetMsg.getChannelState() == ChannelRetMsg.ChannelState.CONFIRM_SUCCESS ? PayOrderDivisionRecord.STATE_SUCCESS : PayOrderDivisionRecord.STATE_FAIL);
...@@ -148,13 +147,13 @@ public class PayOrderDivisionExecController extends ApiController { ...@@ -148,13 +147,13 @@ public class PayOrderDivisionExecController extends ApiController {
if(receiver.getDivisionProfit() != null){ if(receiver.getDivisionProfit() != null){
if(receiver.getDivisionProfit().compareTo(BigDecimal.ZERO) < 0){ if(receiver.getDivisionProfit().compareTo(BigDecimal.ZERO) < 0){
throw new BizException("分账用户receiverId=["+receiver.getReceiverId() == null ? "": receiver.getReceiverId()+"]," + throw new BizException("分账用户receiverId=["+ ( receiver.getReceiverId() == null ? "": receiver.getReceiverId() ) +"]," +
"receiverGroupId=["+receiver.getReceiverGroupId() == null ? "": receiver.getReceiverGroupId()+"] 分账比例不得小于0%"); "receiverGroupId=["+ (receiver.getReceiverGroupId() == null ? "": receiver.getReceiverGroupId() ) +"] 分账比例不得小于0%");
} }
if(receiver.getDivisionProfit().compareTo(BigDecimal.ONE) > 0){ if(receiver.getDivisionProfit().compareTo(BigDecimal.ONE) > 0){
throw new BizException("分账用户receiverId=["+receiver.getReceiverId() == null ? "": receiver.getReceiverId()+"]," + throw new BizException("分账用户receiverId=["+ ( receiver.getReceiverId() == null ? "": receiver.getReceiverId() ) +"]," +
"receiverGroupId=["+receiver.getReceiverGroupId() == null ? "": receiver.getReceiverGroupId()+"] 分账比例不得高于100%"); "receiverGroupId=["+ (receiver.getReceiverGroupId() == null ? "": receiver.getReceiverGroupId() ) +"] 分账比例不得高于100%");
} }
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment