fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -784,6 +784,8 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
             goodsUserVo.setOfficialName(classGradeVo.getOfficialName());
             goodsUserVo.setPeriodWaitTime(classGradeVo.getPeriodWaitTime());
             goodsUserVo.setOpenQuestion(0);
+            goodsUserVo.setSevenPushReason(classGradeVo.getSevenPushReason());
+            goodsUserVo.setSevenPushDate(classGradeVo.getSevenPushDate());
             Long secLong = 0L;
             Long studyLong = 0L;
             SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsUserVo.java

@@ -454,4 +454,8 @@ public class GoodsUserVo {
 
 	@ApiModelProperty("标签Id")
 	private Long signId;
+
+	private String sevenPushReason;
+
+	private String sevenPushDate;
 }

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

@@ -34,4 +34,6 @@ public class SevenPushAuthAddBo {
 
     @ApiModelProperty("失败原因")
     private String sevenPushReason;
+
+    private String sevenPushDate;
 }

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

@@ -88,5 +88,7 @@ private static final long serialVersionUID=1L;
     private Integer sevenPushCheck;
 
     private String sevenPushReason;
+
+    private String sevenPushDate;
 }
 

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

@@ -3928,6 +3928,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         gradeUser.setId(bo.getGradeUserId());
         gradeUser.setSevenPushCheck(bo.getPushStatus()+1);
         gradeUser.setSevenPushReason(bo.getSevenPushReason());
+        gradeUser.setSevenPushDate(bo.getSevenPushDate());
         gradeUser.setUpdateTime(DateUtils.getNowTime());
         return this.baseMapper.updateGradeUser(gradeUser);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeUserVo.java

@@ -178,4 +178,6 @@ public class ClassGradeUserVo {
 	private Integer sevenPushCheck;
 
 	private String sevenPushReason;
+
+	private String sevenPushDate;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeVo.java

@@ -223,4 +223,6 @@ public class ClassGradeVo {
 
 	@ApiModelProperty("审核通过时间")
 	private Long periodTime;
+
+	private String sevenPushDate;
 }

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

@@ -663,6 +663,8 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
                 goodsVo.setLearnStatus(classGradeVo.getLearnStatus());
                 goodsVo.setPeriodWaitTime(classGradeVo.getPeriodWaitTime());
                 goodsVo.setSubscribeSign(0);
+                goodsVo.setSevenPushReason(classGradeVo.getSevenPushReason());
+                goodsVo.setSevenPushDate(classGradeVo.getSevenPushDate());
                 LambdaQueryWrapper<UserSubscribe> lq = Wrappers.lambdaQuery();
                 lq.eq(UserSubscribe::getOrderGoodsId, goodsVo.getOrderGoodsId());
                 lq.eq(UserSubscribe::getSubscribeStatus, 1);

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderGoodsVo.java

@@ -386,4 +386,8 @@ public class OrderGoodsVo {
 
 	@ApiModelProperty("失败原因")
 	private String pushFailReason;
+
+	private String sevenPushReason;
+
+	private String sevenPushDate;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -653,7 +653,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 GoodsVo goods = iGoodsService.queryById(goodsVo.getGoodsId());
                 if (!CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness()) && !CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness().stream().filter(informRemindBusinessVo -> informRemindBusinessVo.getBusinessId().equals(goods.getBusinessId())).collect(Collectors.toList()))) {
                     UserVo userVo = iUserService.queryById(goodsVo.getUserId());
-                    int day = DateUtils.dayBetween(DateUtils.getNowTime(),goodsVo.getClassEndTime())-1;
+                    int day = DateUtils.dayBetween(goodsVo.getClassEndTime(),DateUtils.getNowTime())-1;
                     if (informRemindVo.getWayStatus().equals(1)) {
                         InformUserAddBo informUserAddBo = new InformUserAddBo();
                         informUserAddBo.setUserId(goodsVo.getUserId());

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

@@ -268,6 +268,7 @@
         <result property="officialStatusMsg" column="official_status_msg"/>
         <result property="sevenPushReason" column="seven_push_reason"/>
         <result property="periodTime" column="period_time"/>
+        <result property="sevenPushDate" column="seven_push_date"/>
     </resultMap>
 
 
@@ -922,7 +923,8 @@
             cgu.period_wait_time,
             cgu.seven_push_reason,
             cgu.official_status_msg,
-            cgu.period_time
+            cgu.period_time,
+            cgu.seven_push_date
         FROM
             class_grade_user cgu
                 LEFT JOIN class_grade cg on cgu.grade_id = cg.grade_id