MERGE

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/grade/service/impl/ClassGradeServiceImpl.java

@@ -311,25 +311,21 @@ 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)){
-                    List<ClassGradeInterface> interfaceList = iClassGradeInterfaceService
-                            .list(new LambdaQueryWrapper<ClassGradeInterface>()
-                                    .in(ClassGradeInterface::getType, Arrays.asList(1, 3))
-                                    .eq(ClassGradeInterface::getStatus, 1));
-                    if (CollectionUtils.isNotEmpty(interfaceList)){
-                        interfaceList.forEach(item -> {
-                            if (item.getType() == 1){
-                                //官方信息推送
-                                add.setInterfacePushId(item.getId());
-                            }else if (item.getType() == 3){
-                                //学时推送
-                                add.setInterfacePeriodId(item.getId());
-                            }
-                        });
-                    }
+                List<ClassGradeInterface> interfaceList = iClassGradeInterfaceService
+                        .list(new LambdaQueryWrapper<ClassGradeInterface>()
+                                .in(ClassGradeInterface::getType, Arrays.asList(1, 3))
+                                .eq(ClassGradeInterface::getStatus, 1));
+                if (CollectionUtils.isNotEmpty(interfaceList)){
+                    interfaceList.forEach(item -> {
+                        if (item.getType() == 1){
+                            //官方信息推送
+                            add.setInterfacePushId(item.getId());
+                        }else if (item.getType() == 3){
+                            //学时推送
+                            add.setInterfacePeriodId(item.getId());
+                        }
+                    });
                 }
                 String sevenCode = getSevenCode(goodsId);
                 add.setSevenCode(sevenCode);
@@ -703,28 +699,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/impl/OrderServiceImpl.java

@@ -2478,8 +2478,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             ClassGradeVo classGradeVo = classGradeVoList.get(i);
             int locakStudentNum = 0;
             Boolean sevenFlag = false;
-            if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员")
-                    && StringUtils.isNotBlank(goods.getSevenYear()) && !Arrays.asList("2021","2022").contains(goods.getSevenYear())){
+            if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员")){
                 if (ObjectUtils.isNotNull(sysTenant.getSevenClass()) && sysTenant.getSevenClass() == 1){
                     //七大员继教班级共享
                     locakStudentNum = baseMapper.getStudeCountByCodeNoTenant(classGradeVo.getSevenCode());
@@ -2517,6 +2516,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         //创建新班级
         CourseBusinessVo businessVo = iCourseBusinessService.queryById(businessId);
         boolean isConfigTp = false; //商品是否有配置选班模板
+        Boolean isNewClass = true; //商品是否有配置选班模板
         if (Validator.isNotEmpty(businessVo) && Validator.isNotEmpty(businessVo.getTemplateName()) && businessVo.getTemplateName().equals("班级")) {
             isConfigTp = true;
         }
@@ -2529,28 +2529,47 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             String businessFullName = iGoodsService.getGoodsBusinessName(goodsId);
             if (businessFullName.contains("继续教育") && businessFullName.contains("施工现场专业人员")){
                 //七大员继教
-                classGrade.setStudentUpper(ClassGrade.INIT_UPPER3); //上限1000
-                String sevenYear = goods.getSevenYear();
-                if (!Arrays.asList("2021","2022").contains(sevenYear)){
-                    //班级绑定学员资料推送和学时推送
-                    List<ClassGradeInterface> list = iClassGradeInterfaceService.list(new LambdaQueryWrapper<ClassGradeInterface>()
-                            .eq(ClassGradeInterface::getStatus, 1)
-                            .in(ClassGradeInterface::getType, Arrays.asList(1, 3)));
-                    if (CollectionUtils.isNotEmpty(list)){
-                        list.forEach(item -> {
-                            if (item.getType() == 1){
-                                classGrade.setInterfacePushId(item.getId());
-                            }else if(item.getType() == 3){
-                                classGrade.setInterfacePeriodId(item.getId());
+//                classGrade.setStudentUpper(ClassGrade.INIT_UPPER3); //上限1000
+                classGrade.setStudentUpper(1); //上限1000
+                //班级绑定学员资料推送和学时推送
+                List<ClassGradeInterface> list = iClassGradeInterfaceService
+                        .list(new LambdaQueryWrapper<ClassGradeInterface>()
+                        .eq(ClassGradeInterface::getStatus, 1)
+                        .in(ClassGradeInterface::getType, Arrays.asList(1, 3)));
+                if (CollectionUtils.isNotEmpty(list)){
+                    list.forEach(item -> {
+                        if (item.getType() == 1){
+                            classGrade.setInterfacePushId(item.getId());
+                        }else if(item.getType() == 3){
+                            classGrade.setInterfacePeriodId(item.getId());
+                        }
+                    });
+                }
+                if (ObjectUtils.isNotNull(sysTenant.getSevenClass()) && sysTenant.getSevenClass() == 1){
+                    //七大员继教班级共享
+//                    classGrade.setSevenCode(getSevenCodeNoTenant(goodsId,classGrade,isNewClass));
+                    classGrade.setSevenCode(ServletUtils.getEncoded("SEV"));
+                    Goods g = iGoodsService.getById(goodsId);
+                    String businessName = iGoodsService.getGoodsBusinessName(g.getGoodsId());
+                    Major major = iMajorService.getById(g.getMajorId());
+                    List<Goods> list4 = iGoodsService.getRelevanceGoodsNoTenant(businessName,major.getCategoryName(),g.getGoodsId());
+                    if (CollectionUtils.isNotEmpty(list4)){
+                        List<ClassGradeGoods> classGradeList = iClassGradeGoodsService
+                                .getClassNoTenant(list4.stream().map(Goods::getGoodsId).collect(Collectors.toList()));
+                        if (CollectionUtils.isNotEmpty(classGradeList)){
+                            ClassGrade classGrade4 = baseMapper.getSevenGradeNoTenant(classGradeList.stream().map(ClassGradeGoods::getGradeId).collect(Collectors.toList()));
+                            if (ObjectUtils.isNotNull(classGrade4)){
+                                //判断班级人数
+                                Integer locakStudentNum = baseMapper.getStudeCountByCodeNoTenant(classGrade4.getSevenCode());
+                                if ((classGrade.getStudentUpper() - locakStudentNum) > 0) {
+                                    isNewClass = false;
+                                    classGrade.setSevenCode(classGrade4.getSevenCode());
+                                }
                             }
-                        });
-                    }
-                    if (ObjectUtils.isNotNull(sysTenant.getSevenClass()) && sysTenant.getSevenClass() == 1){
-                        //七大员继教班级共享
-                        classGrade.setSevenCode(getSevenCodeNoTenant(goodsId));
-                    }else {
-                        classGrade.setSevenCode(getSevenCode(goodsId));
+                        }
                     }
+                }else {
+                    classGrade.setSevenCode(getSevenCode(goodsId));
                 }
             }else {
                 classGrade.setStudentUpper(ClassGrade.INIT_UPPER); //上限300
@@ -2581,8 +2600,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 //        classGrade.setClassName(goodsName + gradeCode);
         //七大员继教同一个专业下同一个班级名称
         Boolean classFlag = true;
-        if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员")
-                && StringUtils.isNotBlank(goods.getSevenYear()) && !Arrays.asList("2021","2022").contains(goods.getSevenYear())){
+        if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员")){
             List<ClassGrade> gradeName = new ArrayList<>();
             if (ObjectUtils.isNotNull(sysTenant.getSevenClass()) && sysTenant.getSevenClass() == 1){
                 //七大员继教班级共享
@@ -2592,7 +2610,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) && !isNewClass){
                     //存在已开班的班级
                     classGrade.setClassStatus(grade.getClassStatus());
                     classGrade.setOfficialName(grade.getOfficialName());
@@ -2761,7 +2779,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,Boolean isNewClass) {
         Goods g = iGoodsService.getById(goodsId);
         String businessName = iGoodsService.getGoodsBusinessName(g.getGoodsId());
         Major major = iMajorService.getById(g.getMajorId());
@@ -2772,10 +2790,15 @@ 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) {
+                        return classGrade.getSevenCode();
+                    }
                 }
             }
         }
+        isNewClass = true;
         return ServletUtils.getEncoded("SEV");
     }
 

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/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>