优化套餐

hcp-app/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
    profiles:
-     active: prod
+     active: dev
 
 ############################
 #########自定义字段#########

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

@@ -2,6 +2,7 @@ package com.yingyangfly.core.service.impl;
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yingyangfly.common.dto.ResultResponse;
 import com.yingyangfly.common.utils.DateUtils;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -123,8 +124,12 @@ public class LearnPackageServiceImpl implements LearnPackageService {
         }
         List<LearningPackage> learningPackages = learningPackagMapper.selectList(lambdaQueryWrapper);
         if (CollectionUtils.isEmpty(learningPackages)){
-            lambdaQueryWrapper.eq(LearningPackage::getOrgCode,"system");
-            learningPackages = learningPackagMapper.selectList(lambdaQueryWrapper);
+            LambdaQueryWrapper<LearningPackage> packageLambdaQueryWrapper = Wrappers.lambdaQuery();
+            packageLambdaQueryWrapper.eq(LearningPackage::getOrgCode,"system");
+            if (StringUtils.isNotEmpty(status)){
+                packageLambdaQueryWrapper.eq(LearningPackage::getStatus,status);
+            }
+            learningPackages = learningPackagMapper.selectList(packageLambdaQueryWrapper);
         }
         for (LearningPackage learningPackage :learningPackages) {
             learningPackage.setPriceYUAN(AmountUtils.F2Y4STR(learningPackage.getPrice()));