clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

修改未支付的判断

This commit is contained in:
HH 2023-04-16 11:26:25 +08:00
parent f77a3c2535
commit b3734d014c
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
View File

@ -298,7 +298,8 @@ public class OrderDetailServiceImpl implements OrderDetailService {
FinancialDetail financialDetail = financialDetailService.selectByOrderDetailId(orderDetailId); FinancialDetail financialDetail = financialDetailService.selectByOrderDetailId(orderDetailId);
Assert.notNull(financialMaster, "找不到支付记录"); Assert.notNull(financialMaster, "找不到支付记录");
Assert.hasText(financialMaster.getPaymentId(), "找不到订单的支付记录，请联系管理员"); Assert.hasText(financialMaster.getPaymentId(), "找不到订单的支付记录，请联系管理员");
Assert.isTrue(PayStatus.PAID.getCode().equals(financialMaster.getPayStatus()), "订单未支付"); Assert.isTrue(PayStatus.PAID.getCode().equals(financialMaster.getPayStatus()) ||
PayStatus.PAYED_ADD.getCode().equals(financialMaster.getPayStatus()), "订单未支付");
// 主财务单金额 // 主财务单金额
BigDecimal masterMoney = financialMaster.getPayMoney(); BigDecimal masterMoney = financialMaster.getPayMoney();

3
ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
View File

@ -359,9 +359,6 @@ public class OrderMasterServiceImpl implements OrderMasterService {
Long orderMasterId = orderMaster.getId(); Long orderMasterId = orderMaster.getId();
FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(orderMasterId); FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(orderMasterId);
Assert.notNull(financialMaster, "找不到订单"); Assert.notNull(financialMaster, "找不到订单");
Assert.isTrue(!PayStatus.WAIT_PAY.getCode().equals(financialMaster.getPayStatus()), "订单未支付");
Assert.isTrue(!PayStatus.CANCEL.getCode().equals(financialMaster.getPayStatus()), "订单已取消");
Assert.isTrue(!PayStatus.REFUND.getCode().equals(financialMaster.getPayStatus()), "订单已退款");
boolean paid = PayStatus.PAID.getCode().equals(financialMaster.getPayStatus()) || boolean paid = PayStatus.PAID.getCode().equals(financialMaster.getPayStatus()) ||
PayStatus.PAYED_ADD.getCode().equals(financialMaster.getPayStatus()); PayStatus.PAYED_ADD.getCode().equals(financialMaster.getPayStatus());
Assert.isTrue(paid, "订单未支付"); Assert.isTrue(paid, "订单未支付");