fix

service/src/main/java/com/jiejing/fitness/finance/service/axf/convert/AxfConvert.java

@@ -62,6 +62,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
+import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
@@ -417,7 +418,7 @@ public class AxfConvert {
   public static StudioAxfOrderDeductionVO toDeductionVO(StudioAxfOrderDeduction deduction) {
   public static StudioAxfOrderDeductionVO toDeductionVO(StudioAxfOrderDeduction deduction) {
     StudioAxfOrderDeductionVO vo = BeanUtil.map(deduction, StudioAxfOrderDeductionVO.class);
     StudioAxfOrderDeductionVO vo = BeanUtil.map(deduction, StudioAxfOrderDeductionVO.class);
     vo.setActualAmount(
     vo.setActualAmount(
-        CommodityOrderDeductionStateEnums.SUCCESS == vo.getState() ? vo.getActualAmount() : null);
+        Objects.equals(CommodityOrderDeductionStateEnums.SUCCESS.getCode(), vo.getState()) ? vo.getActualAmount() : null);
     return vo;
     return vo;
   }
   }
 
 

service/src/main/java/com/jiejing/fitness/finance/service/axf/impl/AxfServiceImpl.java

@@ -121,6 +121,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.HashSet;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Optional;
 import java.util.Set;
 import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executor;
@@ -387,7 +388,8 @@ public class AxfServiceImpl implements AxfService {
       }
       }
     }
     }
     List<StudioAxfOrderDeductionVO> deductions = this.listDeduction(id);
     List<StudioAxfOrderDeductionVO> deductions = this.listDeduction(id);
-    if (deductions.stream().anyMatch(e -> CommodityOrderDeductionStateEnums.FAIL == e.getState())) {
+    if (deductions.stream().anyMatch(e -> Objects.equals(
+        CommodityOrderDeductionStateEnums.FAIL.getCode(), e.getState()))) {
       throw new BizException("", "订购单存在扣款失败，请确保扣款成功后再发起解约");
       throw new BizException("", "订购单存在扣款失败，请确保扣款成功后再发起解约");
     }
     }