优化

hcp-core/src/main/java/com/yingyangfly/core/domain/LearningPackage.java

@@ -99,7 +99,10 @@ public class LearningPackage implements Serializable {
            return 365;
         }
         if ("E".equals(getTimeType())){
-            return 7;
+            return 730;
+        }
+        if ("F".equals(getTimeType())) {
+            return 1095;
         }
         return 0;
     }
@@ -126,6 +129,15 @@ public class LearningPackage implements Serializable {
                 orderEndDate =  DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,endTime);
             }
 
+            if("E".equals(getTimeType())){
+                Date endTime = DateUtils.addYears(startDate,2);
+                orderEndDate =  DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,endTime);
+            }
+            if("F".equals(getTimeType())){
+                Date endTime = DateUtils.addYears(startDate,3);
+                orderEndDate =  DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,endTime);
+            }
+
             return orderEndDate;
         }catch (Exception e){
             log.error("<<<<<<<<<获取订单结束日期异常:>>>>>>>>>>>>",e);

hcp-core/src/main/java/com/yingyangfly/core/service/impl/LearnPackageServiceImpl.java

@@ -186,7 +186,7 @@ public class LearnPackageServiceImpl implements LearnPackageService {
     public List<LearningPackage> tencentLearnPackage(Long doctorId) {
         LambdaQueryWrapper<LearningPackage> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(LearningPackage::getStatus,"0");
-        lambdaQueryWrapper.in(LearningPackage::getTimeType, Arrays.asList("B","C","D"));
+//        lambdaQueryWrapper.in(LearningPackage::getTimeType, Arrays.asList("B","C","D"));
         if (doctorId != null){
             SysUser doctor = sysUserService.getById(doctorId);
             if (ObjectUtils.isNotNull(doctor)){
@@ -204,7 +204,7 @@ public class LearnPackageServiceImpl implements LearnPackageService {
     public List<LearningPackage> tencentLearnPackage2(String ordCode){
         LambdaQueryWrapper<LearningPackage> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(LearningPackage::getStatus,"0");
-        lambdaQueryWrapper.in(LearningPackage::getTimeType, Arrays.asList("B","C","D"));
+//        lambdaQueryWrapper.in(LearningPackage::getTimeType, Arrays.asList("B","C","D"));
         lambdaQueryWrapper.eq(LearningPackage::getOrgCode,"system");
         lambdaQueryWrapper.orderByAsc(LearningPackage::getTimeType);
         return learningPackagMapper.selectList(lambdaQueryWrapper);

hcp-core/src/main/java/com/yingyangfly/core/vo/LearningPackageVo.java

@@ -86,7 +86,10 @@ public class LearningPackageVo implements Serializable {
             return 365;
         }
         if ("E".equals(getTimeType())){
-            return 7;
+            return 730;
+        }
+        if ("F".equals(getTimeType())) {
+            return 1095;
         }
         return 0;
     }
@@ -112,6 +115,14 @@ public class LearningPackageVo implements Serializable {
                 Date endTime = DateUtils.addYears(startDate,1);
                 orderEndDate =  DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,endTime);
             }
+            if("E".equals(getTimeType())){
+                Date endTime = DateUtils.addYears(startDate,2);
+                orderEndDate =  DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,endTime);
+            }
+            if("F".equals(getTimeType())){
+                Date endTime = DateUtils.addYears(startDate,3);
+                orderEndDate =  DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,endTime);
+            }
 
             return orderEndDate;
         }catch (Exception e){