he2802 1 jaar geleden
bovenliggende
commit
3535d8021e

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

@@ -76,7 +76,7 @@ public interface ClassGradeUserMapper extends BaseMapper<ClassGradeUser> {
 
     List<ClassGradeUserGoodsVo> sendTenClassGradeUser();
 
-    List<ClassGradeUserGoodsVo> checkTenClassGradeUser(@Param("userId") Long userId);
+    List<ClassGradeUserGoodsVo> checkTenClassGradeUser(@Param("userId") Long userId,@Param("startTime") Long startTime,@Param("endTime") Long endTime);
 
     List<ClassGradeUserGoodsVo> sendFiveClassGradeUser();
 

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

@@ -3643,7 +3643,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
 
     @Override
     public List<ClassGradeUserGoodsVo> checkTenClassGradeUser(ClassGradeUserQueryBo bo) {
-        List<ClassGradeUserGoodsVo> list = baseMapper.checkTenClassGradeUser(bo.getUserId());
+        Long startTime = DateUtils.getNowTime()-11*24*3600;
+        Long endTime = DateUtils.getNowTime()-1*24*3600;
+        List<ClassGradeUserGoodsVo> list = baseMapper.checkTenClassGradeUser(bo.getUserId(),startTime,endTime);
         List<ClassGradeUserGoodsVo> list1 = new ArrayList<>();
         for(ClassGradeUserGoodsVo vo : list){
             String businessName = iGoodsService.getGoodsBusinessName(vo.getGoodsId());

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

@@ -1690,9 +1690,10 @@
                 LEFT JOIN class_grade cg on  cgu.grade_id = cg.grade_id
                 LEFT JOIN order_goods og ON cgu.order_goods_id = og.order_goods_id
         where 1=1
+          and cg.status = 1
           and cgu.status = 1
           and cgu.user_id = #{userId}
-          AND unix_timestamp(now()) BETWEEN cg.class_end_time-864000 and cg.class_end_time-777600
+          AND unix_timestamp(now()) BETWEEN cg.class_end_time-950400 and cg.class_end_time-864000
     </select>