diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/payorder/CloseOrderController.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/payorder/CloseOrderController.java index 1d516b2..42c6eea 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/payorder/CloseOrderController.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/payorder/CloseOrderController.java @@ -58,8 +58,8 @@ public class CloseOrderController extends ApiController { //获取参数 & 验签 ClosePayOrderRQ rq = getRQByWithMchSign(ClosePayOrderRQ.class); - if(StringUtils.isEmpty(rq.getPayOrderId())){ - throw new BizException("payOrderId不能为空"); + if(StringUtils.isAllEmpty(rq.getMchOrderNo(), rq.getPayOrderId())){ + throw new BizException("mchOrderNo 和 payOrderId 不能同时为空"); } PayOrder payOrder = payOrderService.queryMchOrder(rq.getMchNo(), rq.getPayOrderId(), rq.getMchOrderNo());