fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeUserMapper.java

@@ -95,6 +95,8 @@ public interface ClassGradeUserMapper extends BaseMapper<ClassGradeUser> {
 
     Long checkFinishRequiredCourse(ClassGradeUserQueryBo bo);
 
+    Long getSevenPeriodStartTime(ClassGradeUserQueryBo bo);
+
     Long getPeriodStartTime(ClassGradeUserQueryBo bo);
 
     Long getPeriodEndTime(ClassGradeUserQueryBo bo);

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

@@ -960,6 +960,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         for (ClassGrade classGrade : classGradeList) {
             classGradeUser = iClassGradeUserService.getOne(new LambdaQueryWrapper<ClassGradeUser>()
                     .eq(ClassGradeUser::getGradeId, classGrade.getGradeId())
+                    .eq(ClassGradeUser::getStatus, 1)
                     .eq(ClassGradeUser::getUserId, user.getUserId()).last("limit 1"));
             if (Validator.isNotEmpty(classGradeUser)) {
                 grade = classGrade;
@@ -1347,6 +1348,10 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         userQueryBo.setOrderGoodsId(bo.getOrderGoodsId());
         Long startTime = baseMapper.getPeriodStartTime(userQueryBo);
         Long endTime = baseMapper.getPeriodEndTime(userQueryBo);
+        log.info("七大员学时信息推送商品"+ JSONObject.toJSONString(orderGoods));
+        if(orderGoods.getSevenClassCopy()>1){
+            startTime = baseMapper.getSevenPeriodStartTime(userQueryBo);
+        }
 
         Map<String, String> params = new HashMap<>();
         params.put("zh", SEVEN_OFFICIALPUSH_INFOACCOUNT);

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -1685,6 +1685,27 @@
             )>0
     </select>
 
+    <select id="getSevenPeriodStartTime" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo" resultType="java.lang.Long">
+        SELECT
+        p.create_time
+        FROM
+        user_study_record usr
+        LEFT JOIN user_study_record_photo p ON usr.record_id = p.record_id
+        LEFT JOIN course_module cm ON usr.module_id = cm.module_id
+        WHERE
+        usr.current_status = 1
+        AND usr.user_id = #{userId}
+        AND usr.grade_id = #{gradeId}
+        AND cm.common_sign = 0
+        <if test="orderGoodsId != null and orderGoodsId !='' ">
+            AND usr.order_goods_id = #{orderGoodsId}
+        </if>
+        AND P.create_time IS NOT NULL
+        ORDER BY
+        P.create_time
+        LIMIT 1
+    </select>
+
     <select id="getPeriodStartTime" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo" resultType="java.lang.Long">
         SELECT
             p.create_time