Browse Source

结算申请接口bug修复

jxl 3 days ago
parent
commit
421f13bee7

+ 2 - 2
leromro-core/src/main/java/com/leromro/core/service/impl/OrderSettlementApplicationServiceImpl.java

@@ -198,13 +198,13 @@ public class OrderSettlementApplicationServiceImpl extends ServiceImpl<OrderSett
             // 如果订单结算状态不是待结算状态,或审核未通过,则不能申请结算
             if("3".equals(areaType)){
                 if(!AreaSettlementStatusEnum.PENDING_SETTLEMENT.getCode().equals(settlementOrder.getAreaSettlementStatus())
-                        || !AreaSettlementStatusEnum.REJECTED.getCode().equals(settlementOrder.getAreaSettlementStatus())){
+                        && !AreaSettlementStatusEnum.REJECTED.getCode().equals(settlementOrder.getAreaSettlementStatus())){
                     throw new ServiceException("订单不能重复申请结算");
                 }
             }
             if("4".equals(areaType)){
                 if(!ServiceCentreSettlementStatusEnum.PENDING_SETTLEMENT.getCode().equals(settlementOrder.getServiceCentreSettlementStatus())
-                        || !ServiceCentreSettlementStatusEnum.REJECTED.getCode().equals(settlementOrder.getServiceCentreSettlementStatus())){
+                        && !ServiceCentreSettlementStatusEnum.REJECTED.getCode().equals(settlementOrder.getServiceCentreSettlementStatus())){
                     throw new ServiceException("订单不能重复申请结算");
                 }
             }