submit

run-prod.sh

@@ -1,4 +1,41 @@
+#!/usr/bin/env bash
+# 定义应用组名
+group_name='zhongzheng'
+# 定义应用名称
+app_name='zhongzheng-saas-api'
+# 定义应用版本
+app_version='1.0-SNAPSHOT'
+# 定义应用环境
+profile_active='prod'
+echo '----copy jar----'
+docker stop ${app_name}
+echo '----stop container----'
+docker rm ${app_name}
+echo '----rm container----'
+docker rmi ${group_name}/${app_name}:${app_version}
+echo '----rm image----'
+# 打包编译docker镜像
+docker build -f /mydata/maven/build/Dockerfile -t ${group_name}/${app_name}:${app_version} .
+echo '----build image----'
+docker run -p 5055:5055 --name ${app_name} \
+--restart=always \
+-e 'spring.profiles.active'=${profile_active} \
+-e TZ="Asia/Shanghai" \
+-m 10240m \
+--cpus=3 \
+--log-opt max-size=50m \
+--log-opt max-file=3 \
+-v /etc/localtime:/etc/localtime \
+-v /usr/share/fonts:/usr/share/fonts \
+-v /data/logs/prod_api:/logs \
+-v /mydata/app/${app_name}/logs:/var/logs \
+-d ${group_name}/${app_name}:${app_version}
+echo '----start container----'
 
+echo "开始等待20秒..."
+# 1-10秒内随机
+sleep 5
+echo "等待后继续"
 
 #!/usr/bin/env bash
 # 定义应用组名

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityRecommendServiceImpl.java

@@ -131,7 +131,7 @@ public class ActivityRecommendServiceImpl extends ServiceImpl<ActivityRecommendM
         for (ActivityRecommendVo recommendVo : activityRecommendVos) {
             if (CollectionUtils.isNotEmpty(recommendVo.getGoodsList())){
                 recommendVo.getGoodsList().forEach(item -> {
-                    if (ObjectUtils.isNull(item.getSpecTemplateId())){
+                    if (ObjectUtils.isNotNull(item.getSpecTemplateId())){
                         List<GoodsSpecAttributeRelation> list = goodsSpecAttributeRelationService.list(new LambdaQueryWrapper<GoodsSpecAttributeRelation>()
                                 .eq(GoodsSpecAttributeRelation::getGoodsId, item.getGoodsId())
                                 .orderByAsc(GoodsSpecAttributeRelation::getCreateTime)

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -2548,7 +2548,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                         //七大员继教班级共享
                         classGrade.setSevenCode(getSevenCodeNoTenant(goodsId,classGrade));
                     }else {
-                        classGrade.setSevenCode(getSevenCode(goodsId));
+                        classGrade.setSevenCode(getSevenCode(goodsId,classGrade));
                     }
             }else {
                 classGrade.setStudentUpper(ClassGrade.INIT_UPPER); //上限300
@@ -2740,7 +2740,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         });
     }
 
-    private String getSevenCode(Long goodsId) {
+    private String getSevenCode(Long goodsId,ClassGrade classGradeVo) {
         Goods g = iGoodsService.getById(goodsId);
         List<Goods> list = iGoodsService.list(new LambdaQueryWrapper<Goods>()
                 .eq(Goods::getEducationTypeId, g.getEducationTypeId())
@@ -2758,6 +2758,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             if (CollectionUtils.isNotEmpty(classGradeList)){
                 ClassGrade classGrade = baseMapper.getSevenGrade(classGradeList.stream().map(ClassGradeGoods::getGradeId).collect(Collectors.toList()));
                 if (ObjectUtils.isNotNull(classGrade)){
+                    classGradeVo.setIsNewClass(false);
                     return classGrade.getSevenCode();
                 }
             }