Pārlūkot izejas kodu

乐队指导训练营订单导出

zouxuan 10 mēneši atpakaļ
vecāks
revīzija
57dd264033

+ 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) -> {
         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()) {
                     for (SporadicChargeTypeEnum chargeType : SporadicChargeTypeEnum.values()) {
                         if (!chargeType.getCode().equals(basicOrder.getChargeType())) {
                         if (!chargeType.getCode().equals(basicOrder.getChargeType())) {
                             continue;
                             continue;