merge

zhongzheng-api/src/main/java/com/zhongzheng/controller/cmmon/CommonController.java

@@ -100,7 +100,7 @@ public class CommonController extends BaseController {
         Map<String,Object> map = new HashMap<>();
         map.put("hide",false);
         if(Validator.isNotEmpty(bo.getVersion())){
-            if(bo.getVersion().equals("5.2.1")){
+            if(bo.getVersion().equals("5.2.2")){
                 map.put("hide",false);
             }
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionServiceImpl.java

@@ -406,7 +406,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                 if(Validator.isEmpty(tempTxt)||tempTxt.startsWith("B.")){
                                     break;
                                 }
-                                q_content+=tempTxt;
+                                q_content+=tempTxt+"<br />";
                                 j++;
                             }
                             bo1.setOptionsId(1L);
@@ -425,7 +425,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                 if(Validator.isEmpty(tempTxt)||tempTxt.startsWith("C.")){
                                     break;
                                 }
-                                q_content+=tempTxt;
+                                q_content+=tempTxt+"<br />";
                                 j++;
                             }
                             bo1.setOptionsId(2L);
@@ -444,7 +444,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                 if(Validator.isEmpty(tempTxt)||tempTxt.startsWith("D.")){
                                     break;
                                 }
-                                q_content+=tempTxt;
+                                q_content+=tempTxt+"<br />";
                                 j++;
                             }
                             bo1.setOptionsId(3L);
@@ -463,7 +463,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                 if(Validator.isEmpty(tempTxt)||tempTxt.startsWith("E.")||tempTxt.startsWith("正确答案")){
                                     break;
                                 }
-                                q_content+=tempTxt;
+                                q_content+=tempTxt+"<br />";
                                 j++;
                             }
                             bo1.setOptionsId(4L);
@@ -482,7 +482,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                 if(Validator.isEmpty(tempTxt)||tempTxt.startsWith("F.")||tempTxt.startsWith("正确答案")){
                                     break;
                                 }
-                                q_content+=tempTxt;
+                                q_content+=tempTxt+"<br />";
                                 j++;
                             }
                             bo1.setOptionsId(5L);
@@ -501,7 +501,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                 if(Validator.isEmpty(tempTxt)||tempTxt.startsWith("G.")||tempTxt.startsWith("正确答案")){
                                     break;
                                 }
-                                q_content+=tempTxt;
+                                q_content+=tempTxt+"<br />";
                                 j++;
                             }
                             bo1.setOptionsId(6L);
@@ -543,7 +543,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                         if(checkKey(tempTxt)){
                                             break;
                                         }
-                                        q_content+=tempTxt;
+                                        q_content+=tempTxt+"<br />";
                                         j++;
                                     }
                                     q_content = q_content.replace("正确答案：", "");
@@ -569,7 +569,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                 if(checkKey(tempTxt)){
                                     break;
                                 }
-                                q_content+=tempTxt;
+                                q_content+=tempTxt+"<br />";
                                 j++;
                             }
                             analysisContent+=q_content;
@@ -585,7 +585,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                 if(checkKey(tempTxt)){
                                     break;
                                 }
-                                q_content+=tempTxt;
+                                q_content+=tempTxt+"<br />";
                                 j++;
                             }
                             analysisContent = analysisContent + "\r\n" +q_content;
@@ -601,7 +601,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                 if(checkKey(tempTxt)){
                                     break;
                                 }
-                                q_content+=tempTxt;
+                                q_content+=tempTxt+"<br />";
                                 j++;
                             }
                             analysisContent = analysisContent + "\r\n" +q_content;
@@ -618,7 +618,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                 if(checkKey(tempTxt)){
                                     break;
                                 }
-                                q_content+=tempTxt;
+                                q_content+=tempTxt+"<br />";
                                 j++;
                             }
                             q_content = q_content.replace("【问题】", "");
@@ -634,7 +634,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                         }
                         //题目正文
                         else{
-                            qContent += content;
+                            qContent += content+"<br />";
                         }
                     }else{
                        qContent = removeNo(qContent);

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/UserPeriodEditBo.java

@@ -76,4 +76,7 @@ public class UserPeriodEditBo {
     /** 审核原因 */
     private String auditReason;
 
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
+
 }

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

@@ -200,6 +200,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             bo.setStatus(gradePeriodStatus);
             bo.setGoodsId(userPeriodVo.getGoodsId());
             bo.setUserId(userPeriodVo.getUserId());
+            bo.setGradeId(userPeriodVo.getGradeId());
             sendPeriodSMS(bo);
             sendPeriodSevenSMS(bo);
         }
@@ -398,8 +399,8 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
     }
 
     private void sendPeriodSMS(UserPeriodEditBo bo) {
-        if(Validator.isEmpty(bo.getGoodsId())||Validator.isEmpty(bo.getUserId())){
-            throw new CustomException("信息参数确实");
+        if(Validator.isEmpty(bo.getGoodsId())||Validator.isEmpty(bo.getUserId())||Validator.isEmpty(bo.getGradeId())){
+            throw new CustomException("信息参数缺失");
         }
         String key = "Period-" + bo.getGoodsId() + "-" + bo.getUserId();
         Long value = redisCache.getCacheObject(key);
@@ -407,6 +408,10 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             return;
         }
         redisCache.setCacheObject(key, 1L, 1, TimeUnit.MINUTES);//1分钟
+        ClassGradeUser gradeUser = iClassGradeUserService.getOne(new LambdaQueryWrapper<ClassGradeUser>().eq(ClassGradeUser::getUserId,bo.getUserId()).eq(ClassGradeUser::getGradeId,bo.getGradeId()).last("limit 1"));
+        if(Validator.isNotEmpty(gradeUser)){
+            bo.setOrderGoodsId(gradeUser.getOrderGoodsId());
+        }
         GoodsVo goodsVo1 = iGoodsService.queryById(bo.getGoodsId());
         if (bo.getStatus().equals(1)) {
             InformRemindVo informRemindVo = informRemindService.queryById(9L);
@@ -420,6 +425,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                     informUserAddBo.setUpdateTime(DateUtils.getNowTime());
                     informUserAddBo.setRemindId(9L);
                     informUserAddBo.setSystemStatus(1);
+                    informUserAddBo.setOrderGoodsId(bo.getOrderGoodsId());
                     informUserAddBo.setRemind("学时机构审核通过提醒");
                     informUserAddBo.setGoodsId(bo.getGoodsId());
                     informUserAddBo.setText("尊敬的用户：你已完成本课程的所有学时学习，经机构审核通过，需注册中心复审后即可获得继续教育学时，审核时间约15个工作日。");
@@ -434,6 +440,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                     informUserAddBo.setUpdateTime(DateUtils.getNowTime());
                     informUserAddBo.setRemindId(9L);
                     informUserAddBo.setSystemStatus(3);
+                    informUserAddBo.setOrderGoodsId(bo.getOrderGoodsId());
                     informUserAddBo.setRemind("学时机构审核通过提醒");
                     informUserAddBo.setGoodsId(bo.getGoodsId());
                     informUserAddBo.setText("尊敬的用户：你已完成本课程的所有学时学习，经机构审核通过，需注册中心复审后即可获得继续教育学时，审核时间约15个工作日。");
@@ -457,6 +464,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                     informUserAddBo.setRemindId(10L);
                     informUserAddBo.setSystemStatus(1);
                     informUserAddBo.setRemind("学时机构审核不通过提醒");
+                    informUserAddBo.setOrderGoodsId(bo.getOrderGoodsId());
                     informUserAddBo.setGoodsId(bo.getGoodsId());
                     informUserAddBo.setText("尊敬的用户：您购买的" + goodsVo1.getGoodsName() + "课程学时机构审核不通过，为了不影响您的学习进度，请点击立即重学进行重学。");
                     iInformUserService.insertByAddBo(informUserAddBo);
@@ -471,6 +479,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                     informUserAddBo.setRemindId(10L);
                     informUserAddBo.setSystemStatus(3);
                     informUserAddBo.setRemind("学时机构审核不通过提醒");
+                    informUserAddBo.setOrderGoodsId(bo.getOrderGoodsId());
                     informUserAddBo.setGoodsId(bo.getGoodsId());
                     informUserAddBo.setText("尊敬的用户：您购买的" + goodsVo1.getGoodsName() + "课程学时机构审核不通过，为了不影响您的学习进度，请点击立即重学进行重学。");
                     iInformUserService.insertByAddBo(informUserAddBo);
@@ -484,7 +493,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
     }
 
     private void sendPeriodSevenSMS(UserPeriodEditBo bo) {
-        if(Validator.isEmpty(bo.getGoodsId())||Validator.isEmpty(bo.getUserId())){
+        if(Validator.isEmpty(bo.getGoodsId())||Validator.isEmpty(bo.getUserId())||Validator.isEmpty(bo.getGradeId())){
             throw new CustomException("信息参数缺失");
         }
         String key = "PeriodSeven-" + bo.getGoodsId() + "-" + bo.getUserId();
@@ -493,6 +502,10 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             return;
         }
         redisCache.setCacheObject(key, 1L, 1, TimeUnit.MINUTES);//1分钟
+        ClassGradeUser gradeUser = iClassGradeUserService.getOne(new LambdaQueryWrapper<ClassGradeUser>().eq(ClassGradeUser::getUserId,bo.getUserId()).eq(ClassGradeUser::getGradeId,bo.getGradeId()).last("limit 1"));
+        if(Validator.isNotEmpty(gradeUser)){
+            bo.setOrderGoodsId(gradeUser.getOrderGoodsId());
+        }
         GoodsVo goodsVo1 = iGoodsService.queryById(bo.getGoodsId());
         if (bo.getStatus().equals(1)) {
             InformRemindVo informRemindVo = informRemindService.queryById(11L);
@@ -506,6 +519,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                     informUserAddBo.setUpdateTime(DateUtils.getNowTime());
                     informUserAddBo.setRemindId(11L);
                     informUserAddBo.setSystemStatus(1);
+                    informUserAddBo.setOrderGoodsId(gradeUser.getOrderGoodsId());
                     informUserAddBo.setRemind("学时机构审核通过提醒");
                     informUserAddBo.setGoodsId(bo.getGoodsId());
                     informUserAddBo.setText("尊敬的用户：你已完成本课程的所有学时机构审核通过。");
@@ -522,6 +536,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                     informUserAddBo.setSystemStatus(3);
                     informUserAddBo.setRemind("学时机构审核通过提醒");
                     informUserAddBo.setGoodsId(bo.getGoodsId());
+                    informUserAddBo.setOrderGoodsId(gradeUser.getOrderGoodsId());
                     informUserAddBo.setText("尊敬的用户：你已完成本课程的所有学时机构审核通过。");
                     iInformUserService.insertByAddBo(informUserAddBo);
                     UserVo userVo = iUserService.queryById(bo.getUserId());
@@ -544,6 +559,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                     informUserAddBo.setSystemStatus(1);
                     informUserAddBo.setRemind("学时机构审核不通过提醒");
                     informUserAddBo.setGoodsId(bo.getGoodsId());
+                    informUserAddBo.setOrderGoodsId(gradeUser.getOrderGoodsId());
                     informUserAddBo.setText("尊敬的用户：您购买的" + goodsVo1.getGoodsName() + "课程学时审核不通过，为了不影响您的学习进度，请点击立即重学进行重学。");
                     iInformUserService.insertByAddBo(informUserAddBo);
                 }
@@ -558,6 +574,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                     informUserAddBo.setSystemStatus(3);
                     informUserAddBo.setRemind("学时机构审核不通过提醒");
                     informUserAddBo.setGoodsId(bo.getGoodsId());
+                    informUserAddBo.setOrderGoodsId(gradeUser.getOrderGoodsId());
                     informUserAddBo.setText("尊敬的用户：您购买的" + goodsVo1.getGoodsName() + "课程学时审核不通过，为了不影响您的学习进度，请点击立即重学进行重学。");
                     iInformUserService.insertByAddBo(informUserAddBo);
                     UserVo userVo = iUserService.queryById(bo.getUserId());

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysConfig.java

@@ -56,7 +56,6 @@ public class SysConfig implements Serializable {
     @Excel(name = "参数键值")
     @TableField(updateStrategy = FieldStrategy.IGNORED)
  //   @NotBlank(message = "参数键值不能为空")
-    @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符")
     private String configValue;
 
     /**

zhongzheng-system/src/main/resources/mapper/modules/course/MajorMapper.xml

@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="projectId != null and projectId!=0 ">
             AND t.id = #{projectId}
         </if>
-        <if test="categoryName != null and categoryName!=0 ">
+        <if test="categoryName != null and categoryName!='' ">
             AND m.category_name like concat('%', #{categoryName}, '%')
         </if>
         <if test="businessId != null and businessId!=0 ">