yangdamao 1 gadu atpakaļ
vecāks
revīzija
c0cb651aa6

+ 5 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -749,6 +749,11 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
                         goodsUserVo.setUserProfile(1);
                     }
                 }
+
+                //继续课程显示班级名称
+                if (fullName.contains("继续教育")){
+                    goodsUserVo.setGoodsName(classGradeVo.getClassName());
+                }
             }
 
             goodsUserVo.setGradeId(classGradeVo.getGradeId());

+ 3 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsServiceImpl.java

@@ -594,9 +594,6 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
     public List<OrderGoodsVo> listUserVideoLive(GoodsQueryBo bo) {
         List<OrderGoodsVo> list = this.baseMapper.listUserVideoLive(bo);
         for(OrderGoodsVo goodsVo : list){
-            if(goodsVo.getOrderGoodsId().longValue()==6311L){
-                System.out.println(goodsVo.getOrderGoodsId());
-            }
             String fullName = goodsVo.getEducationName()+goodsVo.getBusinessName()+goodsVo.getProjectName();
             goodsVo.setErJianErZao(false);
             if(Validator.isNotEmpty(fullName)){
@@ -649,6 +646,9 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
                 if(Validator.isEmpty(classGradeVo)){
                     continue;
                 }
+                if (fullName.contains("继续教育")){
+                    goodsVo.setGoodsName(classGradeVo.getClassName());
+                }
                 goodsVo.setPeriodStatus(classGradeVo.getPeriodStatus());
                 goodsVo.setPeriodPlush(classGradeVo.getPeriodPlush());
                 goodsVo.setGradeStatus(classGradeVo.getStatus());

+ 1 - 0
zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -896,6 +896,7 @@
             cg.class_start_time,
             cg.class_end_time,
             cg.class_status,
+            cg.class_name,
             cg.status,
             cg.learning_status,
             cgu.period_status,