Merge branch 'dev'

zhongzheng-admin-saas/src/main/resources/application-dev.yml

@@ -209,4 +209,4 @@ ZsBank:
     sm4key: VuAzSWQhsoNqzn0K
 
 record:
-    downloadPath: http://39.108.7.155:9099/common/user/data/download
+    downloadPath: http://192.168.1.7:9090/common/user/data/download

zhongzheng-admin/src/main/resources/application-dev.yml

@@ -210,4 +210,4 @@ ZsBank:
     sm4key: VuAzSWQhsoNqzn0K
 
 record:
-    downloadPath: http://39.108.7.155:9099/common/user/data/download
+    downloadPath: http://192.168.1.7:9090/common/user/data/download

zhongzheng-api/src/main/resources/application-dev.yml

@@ -212,4 +212,4 @@ ZsBank:
     sm4key: VuAzSWQhsoNqzn0K
 
 record:
-    downloadPath: http://39.108.7.155:9099/common/user/data/download
+    downloadPath: http://192.168.1.7:9090/common/user/data/download

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -46,9 +46,11 @@ import com.zhongzheng.modules.goods.vo.*;
 import com.zhongzheng.modules.grade.domain.ClassGrade;
 import com.zhongzheng.modules.grade.domain.ClassGradeGoods;
 import com.zhongzheng.modules.grade.domain.ClassGradeInterface;
+import com.zhongzheng.modules.grade.domain.ClassGradeUser;
 import com.zhongzheng.modules.grade.service.IClassGradeGoodsService;
 import com.zhongzheng.modules.grade.service.IClassGradeInterfaceService;
 import com.zhongzheng.modules.grade.service.IClassGradeService;
+import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.vo.ClassGradeVo;
 import com.zhongzheng.modules.grade.vo.SyncGoodsExport;
 import com.zhongzheng.modules.inform.domain.InformRemind;
@@ -57,6 +59,7 @@ import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.order.domain.OrderInputTemplate;
 import com.zhongzheng.modules.order.service.IOrderGoodsService;
 import com.zhongzheng.modules.order.service.IOrderInputTemplateService;
+import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.pay.domain.PayServe;
 import com.zhongzheng.modules.pay.domain.PaySupply;
 import com.zhongzheng.modules.pay.service.IPayServeService;
@@ -130,7 +133,8 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 
     @Autowired
     private IOrderGoodsService iOrderGoodsService;
-
+    @Autowired
+    private IOrderService iOrderService;
     @Autowired
     private IOrderInputTemplateService iOrderInputTemplateService;
     @Autowired
@@ -140,6 +144,8 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     @Autowired
     private IClassGradeService iClassGradeService;
     @Autowired
+    private IClassGradeUserService iClassGradeUserService;
+    @Autowired
     private ICourseMenuService iCourseMenuService;
     @Autowired
     private ICourseMenuExamService iCourseMenuExamService;
@@ -433,7 +439,46 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 
     @Override
     public List<GoodsVo> selectListToInput(GoodsQueryBo bo) {
-        return baseMapper.selectListToInput(bo);
+        List<GoodsVo> goodsVoList = baseMapper.selectListToInput(bo);
+        if (CollectionUtils.isEmpty(goodsVoList)){
+            return new ArrayList<>();
+        }
+        if (bo.getGoodsType() == 1){
+            goodsVoList.forEach(item -> {
+                List<ClassGradeGoods> gradeGoods = iClassGradeGoodsService
+                        .list(new LambdaQueryWrapper<ClassGradeGoods>()
+                        .eq(ClassGradeGoods::getGoodsId, item.getGoodsId()));
+                if (CollectionUtils.isNotEmpty(gradeGoods)){
+                    item.setGradeNum(Long.valueOf(gradeGoods.size()));
+                    gradeGoods.forEach(gradeGoodsItem -> {
+                        ClassGrade grade = iClassGradeService.getById(gradeGoodsItem.getGradeId());
+                        if (ObjectUtils.isNull(grade) || grade.getStatus() != 1){
+                            return;
+                        }
+                        if (ObjectUtils.isNotNull(grade.getClassStartTime()) && grade.getClassEndTime() < DateUtils.getNowTime()){
+                            return;
+                        }
+                        if (ObjectUtils.isNotNull(grade.getSevenCode())){
+                            //七大员继教班级,计算班级人数
+                            Integer classGradeNum = iOrderService.getClassGradeNum(grade.getSevenCode());
+                            if (classGradeNum < grade.getStudentUpper()){
+                                item.setGradeId(grade.getGradeId());
+                                item.setGradeName(grade.getClassName());
+                            }
+                        }else {
+                            Integer count = iClassGradeUserService.count(new LambdaQueryWrapper<ClassGradeUser>()
+                                    .eq(ClassGradeUser::getGradeId, grade.getGradeId())
+                                    .eq(ClassGradeUser::getStatus, 1));
+                            if (count < grade.getStudentUpper()){
+                                item.setGradeId(grade.getGradeId());
+                                item.setGradeName(grade.getClassName());
+                            }
+                        }
+                    });
+                }
+            });
+        }
+        return goodsVoList;
     }
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/domain/ClassGrade.java

@@ -95,4 +95,7 @@ private static final long serialVersionUID=1L;
     private Long tenantId;
 
     private Long firstChoiceGrade;
+
+    @TableField(exist = false)
+    private Boolean isNewClass;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeMapper.java

@@ -88,7 +88,7 @@ public interface ClassGradeMapper extends BaseMapper<ClassGrade> {
     @InterceptorIgnore(tenantLine = "true")
     void UpGradeInterfaceByTenant(ClassGradeOpenUpBo upBo);
 
-    ClassGrade getSevenGrade(List<Long> gradeIds);
+    ClassGrade getSevenGrade(@Param("gradeIds") List<Long> gradeIds);
 
     @InterceptorIgnore(tenantLine = "true")
     Long getStudeCountByCode(String sevenCode);
@@ -111,4 +111,7 @@ public interface ClassGradeMapper extends BaseMapper<ClassGrade> {
 
     @InterceptorIgnore(tenantLine = "true")
     Long getGradeCount(String sevenCode);
+
+    @InterceptorIgnore(tenantLine = "true")
+    Integer getStudeCountByCodeNoTenant(String sevenCode);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -311,10 +311,9 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
             Long goodsId = bo.getClassGradeGoodsAddBos()[0];
             Goods goods = iGoodsService.getById(goodsId);
             String businessName = iGoodsService.getGoodsBusinessName(goodsId);
-            //2021 和 2022 年的课程不在祥粤学习
             if (businessName.contains("继续教育") && businessName.contains("施工现场专业人员")) {
                 String sevenYear = goods.getSevenYear();
-                if (!Arrays.asList("2021","2022").contains(sevenYear)){
+                if (!Arrays.asList("2024").contains(sevenYear)){
                     List<ClassGradeInterface> interfaceList = iClassGradeInterfaceService
                             .list(new LambdaQueryWrapper<ClassGradeInterface>()
                                     .in(ClassGradeInterface::getType, Arrays.asList(1, 3))
@@ -330,9 +329,9 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                             }
                         });
                     }
+                    String sevenCode = getSevenCode(goodsId,add.getStudentUpper());
+                    add.setSevenCode(sevenCode);
                 }
-                String sevenCode = getSevenCode(goodsId);
-                add.setSevenCode(sevenCode);
             }
             else if (("继续教育二级建造师".equals(businessName)) || ("继续教育二级造价师".equals(businessName))){
                 erJfalg = true;
@@ -558,7 +557,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         });
     }
 
-    private String getSevenCode(Long goodsId) {
+    private String getSevenCode(Long goodsId,Integer studentUpper) {
         Goods g = iGoodsService.getById(goodsId);
         List<Goods> list = iGoodsService.list(new LambdaQueryWrapper<Goods>()
                 .eq(Goods::getEducationTypeId, g.getEducationTypeId())
@@ -576,7 +575,11 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
             if (CollectionUtils.isNotEmpty(classGradeList)){
                 ClassGrade classGrade = baseMapper.getSevenGrade(classGradeList.stream().map(ClassGradeGoods::getGradeId).collect(Collectors.toList()));
                 if (ObjectUtils.isNotNull(classGrade)){
-                    return classGrade.getSevenCode();
+                    //判断班级人数
+                    Integer locakStudentNum = baseMapper.getStudeCountByCodeNoTenant(classGrade.getSevenCode());
+                    if ((studentUpper - locakStudentNum) > 0) {
+                        return classGrade.getSevenCode();
+                    }
                 }
             }
         }
@@ -703,28 +706,14 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                 classGradeVo.setClassEndTime(update.getClassEndTime());
                 sendClassSMS(classGradeVo);
             }
-            if (fullName.contains("继续教育") && fullName.contains("施工现场专业人员") &&
-                    StringUtils.isNotBlank(goods.getSevenYear()) && Arrays.asList("2021","2022").contains(goods.getSevenYear())){
-                //七大员继教2021  2022年班级不开班
-                update.setClassStatus(0);
-                update.setInterfacePushId(null);
-                update.setInterfacePeriodId(null);
-            }
             this.updateById(update);
             if (fullName.contains("继续教育") && fullName.contains("施工现场专业人员") && StringUtils.isNotBlank(classGradeVo.getSevenCode())){
                 List<ClassGrade> list = baseMapper.getListNoTenant(classGradeVo.getSevenCode(),update.getGradeId());
                 if (CollectionUtils.isNotEmpty(list)){
-                    List<ClassGrade> collect = list.stream().filter(item -> {
-                        ClassGradeGoods classGradeGoods = iClassGradeGoodsService.getOneNoTenant(item.getGradeId());
-                        Goods goodsOne = iGoodsService.getGoodsByIdNotTenant(classGradeGoods.getGoodsId());
-                        return StringUtils.isNotBlank(goodsOne.getSevenYear()) && !Arrays.asList("2021", "2022").contains(goodsOne.getSevenYear());
-                    }).collect(Collectors.toList());
-                    if (CollectionUtils.isNotEmpty(collect)){
-                        list.forEach(item ->{
-                            update.setGradeId(item.getGradeId());
-                            updateByIdNoTenant(update);
-                        });
-                    }
+                    list.forEach(item ->{
+                        update.setGradeId(item.getGradeId());
+                        updateByIdNoTenant(update);
+                    });
                 }
             }
 

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

@@ -70,6 +70,8 @@ public interface IOrderService extends IService<Order> {
 	 */
 	Map<String, String> placeSmallOrder(OrderAddBo bo);
 
+	Integer getClassGradeNum(String sevenCode);
+
 	Map<String, String> placeGzhOrder(OrderAddBo bo);
 
 	Map<String, String> placePcOrder(OrderAddBo bo);

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

@@ -2414,6 +2414,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         Goods goods = iGoodsService.getById(goodsId);
         String tenantId = ServletUtils.getRequest().getHeader("TenantId");
         SysTenant sysTenant = iSysTenantService.getById(Long.valueOf(tenantId));
+        String sevenYear = goods.getSevenYear();
         //指定班级
         if (gradeId != null && gradeId > 0) {
             ClassGradeVo classGradeVo = iClassGradeService.queryById(gradeId);
@@ -2431,7 +2432,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
             int locakStudentNum = 0;
             Boolean sevenFlag = false;
-            if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员")){
+            if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员") && !Arrays.asList("2024").contains(sevenYear)){
                 if (ObjectUtils.isNotNull(sysTenant.getSevenClass()) && sysTenant.getSevenClass() == 1){
                     //七大员继教班级共享
                     locakStudentNum = baseMapper.getStudeCountByCodeNoTenant(classGradeVo.getSevenCode());
@@ -2479,7 +2480,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             int locakStudentNum = 0;
             Boolean sevenFlag = false;
             if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员")
-                    && StringUtils.isNotBlank(goods.getSevenYear()) && !Arrays.asList("2021","2022").contains(goods.getSevenYear())){
+                    && StringUtils.isNotBlank(goods.getSevenYear()) && !Arrays.asList("2024").contains(goods.getSevenYear())){
                 if (ObjectUtils.isNotNull(sysTenant.getSevenClass()) && sysTenant.getSevenClass() == 1){
                     //七大员继教班级共享
                     locakStudentNum = baseMapper.getStudeCountByCodeNoTenant(classGradeVo.getSevenCode());
@@ -2530,8 +2531,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             if (businessFullName.contains("继续教育") && businessFullName.contains("施工现场专业人员")){
                 //七大员继教
                 classGrade.setStudentUpper(ClassGrade.INIT_UPPER3); //上限1000
-                String sevenYear = goods.getSevenYear();
-                if (!Arrays.asList("2021","2022").contains(sevenYear)){
+                if (!Arrays.asList("2024").contains(sevenYear)){
                     //班级绑定学员资料推送和学时推送
                     List<ClassGradeInterface> list = iClassGradeInterfaceService.list(new LambdaQueryWrapper<ClassGradeInterface>()
                             .eq(ClassGradeInterface::getStatus, 1)
@@ -2547,7 +2547,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                     }
                     if (ObjectUtils.isNotNull(sysTenant.getSevenClass()) && sysTenant.getSevenClass() == 1){
                         //七大员继教班级共享
-                        classGrade.setSevenCode(getSevenCodeNoTenant(goodsId));
+                        classGrade.setSevenCode(getSevenCodeNoTenant(goodsId,classGrade));
                     }else {
                         classGrade.setSevenCode(getSevenCode(goodsId));
                     }
@@ -2582,7 +2582,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         //七大员继教同一个专业下同一个班级名称
         Boolean classFlag = true;
         if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员")
-                && StringUtils.isNotBlank(goods.getSevenYear()) && !Arrays.asList("2021","2022").contains(goods.getSevenYear())){
+                && StringUtils.isNotBlank(goods.getSevenYear()) && !Arrays.asList("2024").contains(goods.getSevenYear())){
             List<ClassGrade> gradeName = new ArrayList<>();
             if (ObjectUtils.isNotNull(sysTenant.getSevenClass()) && sysTenant.getSevenClass() == 1){
                 //七大员继教班级共享
@@ -2592,7 +2592,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             }
             if (CollectionUtils.isNotEmpty(gradeName)){
                 ClassGrade grade = gradeName.stream().filter(x -> ObjectUtils.isNotNull(x.getClassStatus()) && x.getClassStatus() == 1).findFirst().orElse(null);
-                if (ObjectUtils.isNotEmpty(grade)){
+                if (ObjectUtils.isNotEmpty(grade) && ObjectUtils.isNotNull(classGrade.getIsNewClass()) && !classGrade.getIsNewClass()){
                     //存在已开班的班级
                     classGrade.setClassStatus(grade.getClassStatus());
                     classGrade.setOfficialName(grade.getOfficialName());
@@ -2606,7 +2606,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                     classGrade.setInterfacePeriodId(grade.getInterfacePeriodId());
                     classGrade.setInterfacePushId(grade.getInterfacePushId());
                 }else {
-                    String name = gradeName.stream().findFirst().get().getClassName();
+//                    String name = gradeName.stream().findFirst().get().getClassName();
+                    String name = goods.getGoodsName()+"预开班";
                     classGrade.setClassName(name);
                 }
                 classFlag = false;
@@ -2692,6 +2693,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
        return true;
     }
 
+    @Override
+    public Integer getClassGradeNum(String sevenCode){
+        return baseMapper.getStudeCountByCodeNoTenant(sevenCode);
+    }
+
     private void synchronousCreation(ClassGrade classGrade, SysTenant sysTenant,Long goodsId) {
         List<SysTenant> tenantList = iSysTenantService.getListNoTenant(0L);
         if (CollectionUtils.isEmpty(tenantList)){
@@ -2761,7 +2767,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         return ServletUtils.getEncoded("SEV");
     }
 
-    private String getSevenCodeNoTenant(Long goodsId) {
+    private String getSevenCodeNoTenant(Long goodsId,ClassGrade classGradeVo) {
         Goods g = iGoodsService.getById(goodsId);
         String businessName = iGoodsService.getGoodsBusinessName(g.getGoodsId());
         Major major = iMajorService.getById(g.getMajorId());
@@ -2772,7 +2778,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             if (CollectionUtils.isNotEmpty(classGradeList)){
                 ClassGrade classGrade = baseMapper.getSevenGradeNoTenant(classGradeList.stream().map(ClassGradeGoods::getGradeId).collect(Collectors.toList()));
                 if (ObjectUtils.isNotNull(classGrade)){
-                    return classGrade.getSevenCode();
+                    //判断班级人数
+                    Integer locakStudentNum = baseMapper.getStudeCountByCodeNoTenant(classGrade.getSevenCode());
+                    if ((classGradeVo.getStudentUpper() - locakStudentNum) > 0) {
+                        classGradeVo.setIsNewClass(false);
+                        return classGrade.getSevenCode();
+                    }
                 }
             }
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -5451,28 +5451,28 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             return;
         }
         //佣金支付方式
-        String paySn = DateUtils.getTagOrderSn("CP");
-        TopOrderBankPay bankPay = new TopOrderBankPay();
-        bankPay.setOrderSn(order.getOrderSn());
-        bankPay.setPaySn(paySn);
-        bankPay.setTenantId(order.getTenantId().toString());
-        bankPay.setType(4);
-        if (ObjectUtils.isNotNull(order.getBrokerageBankAccount())){
-            bankPay.setToBankAcount(order.getBrokerageBankAccount());
-        }
-        if (ObjectUtils.isNotNull(order.getBrokerageBankName())){
-            bankPay.setToBankName(order.getBrokerageBankName());
-        }
-        if (ObjectUtils.isNotNull(order.getBrokerageBank())){
-            bankPay.setToBankTypeName(order.getBrokerageBank());
-        }
-        bankPay.setMoney(order.getBrokerage());
-        bankPay.setTrainOrgId(order.getTenantId().toString());
-        bankPay.setCreateTime(DateUtils.getNowTime());
-        bankPay.setUpdateTime(DateUtils.getNowTime());
-        bankPay.setStatus(1);
-        bankPay.setPayType(order.getBrokerageType());
-        topOrderBankPayService.save(bankPay);
+//        String paySn = DateUtils.getTagOrderSn("CP");
+//        TopOrderBankPay bankPay = new TopOrderBankPay();
+//        bankPay.setOrderSn(order.getOrderSn());
+//        bankPay.setPaySn(paySn);
+//        bankPay.setTenantId(order.getTenantId().toString());
+//        bankPay.setType(4);
+//        if (ObjectUtils.isNotNull(order.getBrokerageBankAccount())){
+//            bankPay.setToBankAcount(order.getBrokerageBankAccount());
+//        }
+//        if (ObjectUtils.isNotNull(order.getBrokerageBankName())){
+//            bankPay.setToBankName(order.getBrokerageBankName());
+//        }
+//        if (ObjectUtils.isNotNull(order.getBrokerageBank())){
+//            bankPay.setToBankTypeName(order.getBrokerageBank());
+//        }
+//        bankPay.setMoney(order.getBrokerage());
+//        bankPay.setTrainOrgId(order.getTenantId().toString());
+//        bankPay.setCreateTime(DateUtils.getNowTime());
+//        bankPay.setUpdateTime(DateUtils.getNowTime());
+//        bankPay.setStatus(1);
+//        bankPay.setPayType(order.getBrokerageType());
+//        topOrderBankPayService.save(bankPay);
         List<TopOldOrderCheckLog> list = topOldOrderCheckLogService.list(new LambdaQueryWrapper<TopOldOrderCheckLog>()
                 .eq(TopOldOrderCheckLog::getOrderSn, order.getOrderSn())
                 .eq(TopOldOrderCheckLog::getCheckFrom, 4)

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -404,16 +404,16 @@
         </if>
         <if test="goodsType ==1">
             , (SELECT count(*) FROM goods_course where goods_id =g.goods_id ) as course_num
-            , (SELECT count(*) FROM class_grade cg LEFT JOIN class_grade_goods cgg on cg.grade_id = cgg.grade_id where
-            cgg.goods_id = g.goods_id and cg.`status` = 1 ) as grade_num
-            , (SELECT cg.grade_id FROM class_grade cg LEFT JOIN class_grade_goods cgg on cg.grade_id = cgg.grade_id
-            where cgg.goods_id = g.goods_id and cg.`status` = 1 AND (unix_timestamp(now()) &lt; cg.class_end_time or
-            cg.class_start_time is null) AND cg.`status` = 1 AND (SELECT COUNT(a.id) FROM class_grade_user a where
-            a.grade_id = cg.grade_id and a.status =1) &lt; cg.student_upper limit 1) as grade_id
-            , (SELECT cg.class_name FROM class_grade cg LEFT JOIN class_grade_goods cgg on cg.grade_id = cgg.grade_id
-            where cgg.goods_id = g.goods_id and cg.`status` = 1 AND (unix_timestamp(now()) &lt; cg.class_end_time or
-            cg.class_start_time is null) AND cg.`status` = 1 AND (SELECT COUNT(a.id) FROM class_grade_user a where
-            a.grade_id = cg.grade_id and a.status =1) &lt; cg.student_upper limit 1) as grade_name
+--             , (SELECT count(*) FROM class_grade cg LEFT JOIN class_grade_goods cgg on cg.grade_id = cgg.grade_id where
+--             cgg.goods_id = g.goods_id and cg.`status` = 1 ) as grade_num
+--             , (SELECT cg.grade_id FROM class_grade cg LEFT JOIN class_grade_goods cgg on cg.grade_id = cgg.grade_id
+--             where cgg.goods_id = g.goods_id and cg.`status` = 1 AND (unix_timestamp(now()) &lt; cg.class_end_time or
+--             cg.class_start_time is null) AND cg.`status` = 1 AND (SELECT COUNT(a.id) FROM class_grade_user a where
+--             a.grade_id = cg.grade_id and a.status =1) &lt; cg.student_upper limit 1) as grade_id
+--             , (SELECT cg.class_name FROM class_grade cg LEFT JOIN class_grade_goods cgg on cg.grade_id = cgg.grade_id
+--             where cgg.goods_id = g.goods_id and cg.`status` = 1 AND (unix_timestamp(now()) &lt; cg.class_end_time or
+--             cg.class_start_time is null) AND cg.`status` = 1 AND (SELECT COUNT(a.id) FROM class_grade_user a where
+--             a.grade_id = cg.grade_id and a.status =1) &lt; cg.student_upper limit 1) as grade_name
         </if>
         FROM
         goods g

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -1357,4 +1357,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND cgu.grade_id IN ( SELECT grade_id FROM class_grade WHERE seven_code = #{sevenCode} )
     </select>
 
+    <select id="getStudeCountByCodeNoTenant" resultType="java.lang.Integer" parameterType="java.lang.String">
+        SELECT SUM(
+                           (SELECT COUNT(DISTINCT cgu.user_id) FROM class_grade_user cgu WHERE cgu.grade_id = cg.grade_id AND cgu.`status` = 1 AND cgu.change_grade = 0) +
+                           (SELECT COUNT(DISTINCT cgut.user_id) FROM class_grade_user_temp cgut WHERE cgut.grade_id = cg.grade_id AND cgut.`status` = 1 )
+                   ) as num FROM class_grade cg
+        WHERE cg.`status` = 1 AND  cg.seven_code = #{sevenCode}
+    </select>
+
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/top/TopDivideOrderMapper.xml

@@ -23,11 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             dl.divide_type,
             oo.accomplish_time as order_time,
             oo.remark,
-            oo.divide_company_money,
-            oo.divide_seller_money,
-            oo.brokerage,
-            oo.pretax_brokerage,
-            oo.order_price,
+            IFNULL(oo.divide_company_money,0) divide_company_money,
+            IFNULL(oo.divide_seller_money,0) divide_seller_money,
+            IFNULL(oo.brokerage,0) brokerage,
+            IFNULL(oo.pretax_brokerage,0) pretax_brokerage,
+            IFNULL(oo.order_price,0) order_price,
             oo.order_from,
             oo.create_time as order_create_time,
             r.role_name,
@@ -116,10 +116,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             dl.pay_status,
             dl.divide_type,
             oo.remark,
-            oo.order_price,
-            oo.brokerage,
-            oo.pretax_brokerage,
-            tor.divide_money,
+            IFNULL(oo.order_price,0) order_price,
+            IFNULL(oo.brokerage,0) brokerage,
+            IFNULL(oo.pretax_brokerage,0) pretax_brokerage,
+            IFNULL(tor.divide_money,0) divide_money,
             tor.refund_time as order_time,
             oo.create_time as order_create_time,
             oo.create_sys_user_id,
@@ -220,12 +220,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getMonthFinishList" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo"  resultType="com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo">
         SELECT
         v.order_sn,
-        v.divide_company_money,
-        v.divide_seller_money,
+        IFNULL(v.divide_company_money,0) divide_company_money,
+        IFNULL(v.divide_seller_money,0) divide_seller_money,
         v.tenant_id,
         v.create_no,
         v.create_username,
-        v.brokerage
+        IFNULL(v.brokerage,0) brokerage
         FROM
         v_top_order v
         WHERE

zhongzheng-system/src/main/resources/mapper/modules/user/UserSubscribeMapper.xml

@@ -825,7 +825,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
         LEFT JOIN course_business cb ON g.business_id = cb.id
         LEFT JOIN major m ON g.major_id = m.id
-        WHERE 1=1 AND us.exam_status != 0
+        WHERE 1=1 AND us.exam_status != 0 AND us.subscribe_status = 1
         <if test="userId != null and userId !='' ">
             AND us.user_id = #{userId}
         </if>