소스 검색

乐队指导训练营订单导出

zouxuan 1 년 전
부모
커밋
57dd264033
1개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 4 4
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

+ 4 - 4
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -3329,10 +3329,10 @@ public class ExportServiceImpl implements ExportService {
             }
         });
         groupTypeConsumerMap1.put(GroupType.SPORADIC, (basicOrder) -> {
-            if (basicOrder.getType() != OrderTypeEnum.DEGREE_REGISTRATION && basicOrder.getChargeType() != null) {
-                if(basicOrder.getType() == DIRECTOR_TRAINING_CAMP){
-                    basicOrder.setSporadicType(SporadicChargeTypeEnum.DIRECTOR_TRAINING_CAMP.getMsg());
-                }else{
+            if(basicOrder.getType() == DIRECTOR_TRAINING_CAMP){
+                basicOrder.setSporadicType(SporadicChargeTypeEnum.DIRECTOR_TRAINING_CAMP.getMsg());
+            }else {
+                if (basicOrder.getType() != OrderTypeEnum.DEGREE_REGISTRATION && basicOrder.getChargeType() != null) {
                     for (SporadicChargeTypeEnum chargeType : SporadicChargeTypeEnum.values()) {
                         if (!chargeType.getCode().equals(basicOrder.getChargeType())) {
                             continue;