Merge remote-tracking branch 'origin/dev' into dev

zhongzheng-common/src/main/java/com/zhongzheng/common/type/EncryptHandler.java

@@ -63,6 +63,16 @@ public class EncryptHandler  implements TypeHandler<String> {
         return SecureUtil.aes(KEYS).decryptStr(value);
     }
 
+    public static String decryptTwo(String value) {
+        if (null == value) {
+            return null;
+        }
+        if (value.length()<=20 ) {
+            return value;
+        }
+        return SecureUtil.aes(KEYS).decryptStr(value);
+    }
+
     public static String encrypt(String value){
         if (null == value) {
             return null;

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

@@ -731,7 +731,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
         studyRec.setMajorName(goodsVo.getSubjectNames());
         studyRec.setName(userVo.getRealname());
         studyRec.setIdNum(userVo.getIdCard());
-        studyRec.setMobile(userVo.getTelphone());
+        studyRec.setMobile(EncryptHandler.decryptTwo(userVo.getTelphone()));
         studyRec.setGender(userVo.getSex()==1?"男":"女");
         studyRec.setRecentPhotoSrc(Validator.isNotEmpty(userVo.getOneInchPhotos())?ossHost+"/"+userVo.getOneInchPhotos():"");
         studyRec.setIdcardPhotoSrc(Validator.isNotEmpty(userVo.getIdCardImg1())?ossHost+"/"+userVo.getIdCardImg1():"");

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

@@ -2643,10 +2643,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Override
     public boolean arrangeGrade(String goodsName, Long goodsId, Long orderGoodsId, Long gradeId, Long userId, String orderSn, Long businessId) {
         //查询该学员有没有有效期内同商品班级 有就不允许添加
-       /* Integer classNum = baseMapper.selectUserClass(goodsId,userId);
-        if (classNum > 0){、。
-            throw new CustomException("该学员已在此商品有效期内的班级，无法加入新的有效期班级，请查看该学员此商品下的班级");
-        }*/
+//       Integer classNum = baseMapper.selectUserClass(goodsId,userId);
+//        if (classNum > 0){
+//            throw new CustomException("该学员已在此商品有效期内的班级，无法加入新的有效期班级，请查看该学员此商品下的班级");
+//        }
         OrderGoods orderGoods = iOrderGoodsService.getById(orderGoodsId);
         String businessFull = iGoodsService.getGoodsBusinessName(goodsId);
         Goods goods = iGoodsService.getById(goodsId);
@@ -2697,6 +2697,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                         .eq(sevenFlag,ClassGradeUser::getOrderGoodsId,orderGoodsId)
                         .eq(ClassGradeUser::getUserId, userId)
                         .last("limit 1"));
+                if (ObjectUtils.isNotNull(gradeUser) && gradeUser.getStatus() == 1){
+                    throw new CustomException("学员已在此班级报名，请选择其他班级！");
+                }
                 //不在此班级内
                 if (Validator.isEmpty(gradeUser)) {
                     //班级还有剩位,直接锁定班级

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

@@ -614,7 +614,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             t.tenant_name,
             us.create_time,
             us.subscribe_status,
-            ( SELECT SUM( ueg.exam_number ) FROM user_exam_goods ueg WHERE us.order_goods_id = ueg.order_goods_id GROUP BY ueg.order_goods_id ) AS applyNum,
+            ( SELECT SUM( ueg.exam_number - eg.expend_number ) FROM user_exam_goods ueg WHERE us.order_goods_id = ueg.order_goods_id GROUP BY ueg.order_goods_id ) AS applyNum,
             us.exam_status,
             us.result,
             us.performance,