Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/ims into develop

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: a57b2a6cf889667510d601e93915661802dfb209
+  newTag: 7162d642151a36be1c2cfb9892bf1c8cd47fb1c5

release-service/src/main/java/com/mmc/csf/release/service/impl/FlyerTrainingServiceImpl.java

 package com.mmc.csf.release.service.impl;
 
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.mmc.csf.common.util.date.TDateUtil;
 import com.mmc.csf.common.util.math.CodeUtil;
+import com.mmc.csf.common.util.page.PageResult;
+import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.common.util.web.ResultEnum;
 import com.mmc.csf.infomation.dto.GetOrderNumberDTO;
 import com.mmc.csf.infomation.dto.PayWalletDTO;
+import com.mmc.csf.release.dao.CurriculumOrderDao;
+import com.mmc.csf.release.dao.FlyerTrainingDao;
 import com.mmc.csf.release.entity.curriculum.*;
 import com.mmc.csf.release.feign.UserAppApi;
+import com.mmc.csf.release.flyer.qo.CurriculumQo;
 import com.mmc.csf.release.flyer.vo.*;
+import com.mmc.csf.release.service.FlyerTrainingService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,33 +24,17 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.http.*;
 import org.springframework.stereotype.Service;
-
-import com.mmc.csf.common.util.page.PageResult;
-import com.mmc.csf.common.util.web.ResultBody;
-import com.mmc.csf.release.dao.CurriculumOrderDao;
-import com.mmc.csf.release.dao.FlyerTrainingDao;
-import com.mmc.csf.release.entity.curriculum.*;
-import com.mmc.csf.release.feign.PmsAppApi;
-import com.mmc.csf.release.flyer.dto.AllCategoryDTO;
-import com.mmc.csf.release.flyer.dto.CategoriesInfoListDTO;
-import com.mmc.csf.release.flyer.qo.CurriculumQo;
-import com.mmc.csf.release.service.FlyerTrainingService;
-import lombok.AllArgsConstructor;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
 
 /**
  * @Author LW
@@ -79,6 +62,7 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
     @Autowired
     private UserAppApi userAppApi;
 
+    @Resource
     private CurriculumOrderDao curriculumOrderDao;
 
     @Override