Merge branch 'bug_20230223'

cooleshow-api/src/main/java/com/yonge/cooleshow/api/feign/StudentFeignService.java

@@ -31,6 +31,8 @@ public interface StudentFeignService {
     @GetMapping(value = "/task/halfHourTask")
     Object halfHourTask();
 
+    @GetMapping("/studentFirstBuy")
+    HttpResponseResult<Boolean> studentFirstBuy();
 
     /**
      * @Description: 当日陪练课未对老师评价（每晚9点，已评价不发）

cooleshow-api/src/main/java/com/yonge/cooleshow/api/feign/fallback/StudentFeignServiceFallback.java

@@ -18,6 +18,10 @@ public class StudentFeignServiceFallback implements StudentFeignService {
         return null;
     }
 
+    @Override
+    public HttpResponseResult<Boolean> studentFirstBuy() {
+        return null;
+    }
 
 
     @Override

cooleshow-task/src/main/java/com/yonge/cooleshow/task/jobs/StudentFirstBuyTask.java

@@ -0,0 +1,24 @@
+package com.yonge.cooleshow.task.jobs;
+
+import com.yonge.cooleshow.api.feign.StudentFeignService;
+import com.yonge.cooleshow.task.core.BaseTask;
+import com.yonge.cooleshow.task.core.TaskException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2023-02-23
+ */
+@Service
+public class StudentFirstBuyTask  extends BaseTask {
+    @Autowired
+    private StudentFeignService studentFeignService;
+
+    @Override
+    public void execute() throws TaskException {
+        Object o = studentFeignService.studentFirstBuy();
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentTimeServiceImpl.java

@@ -46,8 +46,9 @@ public class StudentTimeServiceImpl extends ServiceImpl<StudentTimeDao, StudentT
         //查询未记录第一次购买时间的订单
         OrderSearch query = new OrderSearch();
         query.setOrderClient(ClientEnum.STUDENT.getCode());
-        query.setStartTime(LocalDateTime.of(toDay, LocalTime.MIN));
-        query.setEndTime(LocalDateTime.of(toDay, LocalTime.MAX));
+        // 改为一次性统计昨天的数据
+        query.setStartTime(LocalDateTime.of(toDay, LocalTime.MIN).plusDays(-1));
+        query.setEndTime(LocalDateTime.of(toDay, LocalTime.MAX).plusDays(-1));
 
         Map<Long, StudentTime> studentTimeMap = new HashMap<>();
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -112,7 +112,7 @@
                 AND t.notation_ = #{param.notation}
             </if>
             <if test="param.DataCorrect != null">
-                AND t.correct_time_ > '2023-02-07 15:00:00'
+                AND t.correct_time_ &lt;= '2023-02-07 15:00:00'
             </if>
         </where>
         order by

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/task/TaskController.java

@@ -48,13 +48,25 @@ public class TaskController extends BaseController {
      */
     @GetMapping("/halfHourTask")
     public HttpResponseResult<Boolean> halfHourTask() {
-        //统计学员第一次购买时间
-        studentTimeService.totalStudentTime();
         //会员卡到期提醒
         vipCardRecordService.pollExpireMsg();
         return succeed(true);
     }
 
+    /***
+     * 统计学员第一次购买时间
+     *
+     * @author liweifan
+     * @updateTime 2022/4/29 19:12
+     * @return: com.yonge.cooleshow.common.entity.HttpResponseResult<java.lang.Boolean>
+     */
+    @GetMapping("/studentFirstBuy")
+    public HttpResponseResult<Boolean> studentFirstBuy() {
+        //统计学员第一次购买时间
+        studentTimeService.totalStudentTime();
+        return succeed(true);
+    }
+
     /**
      * @Description: 当日陪练课未对老师评价（每晚9点，已评价不发）
      * @Author: cy

service.md

@@ -4,7 +4,7 @@
 - [ ] auth-server
 - [ ] admin-server
 - [ ] teacher-server
-- [ ] student-server
+- [x] student-server
 - [ ] website-server
 - [ ] task-server
 - [ ] websocket-server