fix 重修信息

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,7 +399,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
     }
 
     private void sendPeriodSMS(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 = "Period-" + bo.getGoodsId() + "-" + bo.getUserId();
@@ -407,6 +408,8 @@ 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"));
+        bo.setOrderGoodsId(gradeUser.getOrderGoodsId());
         GoodsVo goodsVo1 = iGoodsService.queryById(bo.getGoodsId());
         if (bo.getStatus().equals(1)) {
             InformRemindVo informRemindVo = informRemindService.queryById(9L);
@@ -420,6 +423,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 +438,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 +462,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 +477,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);