bug修复

src/main/java/com/mmc/oms/service/lease/impl/LeaseOrderServiceImpl.java

@@ -617,9 +617,7 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
     public ResultBody pfConfirmOrderWare(BaseAccountDTO currentAccount, LeaseOrderRefundVO param) {
         LeaseOrderDO leaseOrderDO = leaseOrderDao.detail(param.getOrderId());
         log.info("leaseOrderDO:{}", JSONObject.toJSONString(leaseOrderDO));
-        if (!leaseOrderDO.getStatusCode().equals(LeaseOrderStatus.WAITING_MERCHANT_CONFIRM.getCode()) || !leaseOrderDO.getStatusCode().equals(LeaseOrderStatus.APPLY_REFUND.getCode())) {
-            return ResultBody.error("状态流程有误，请重试！");
-        }
+        if (leaseOrderDO.getStatusCode().equals(LeaseOrderStatus.WAITING_MERCHANT_CONFIRM.getCode()) || leaseOrderDO.getStatusCode().equals(LeaseOrderStatus.APPLY_REFUND.getCode())) {
             if (param.getDamage().equals(0)) {
                 // 解冻用户钱包金额
                 if (leaseOrderDO.getShareAmount().compareTo(BigDecimal.ZERO) > 0 || leaseOrderDO.getSalaryAmount().compareTo(BigDecimal.ZERO) > 0) {
@@ -659,6 +657,9 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
             } else {
                 // todo 进行相应赔偿
             }
+        } else {
+            return ResultBody.error("状态流程有误，请重试！");
+        }
         return ResultBody.success();
     }
 }