用户账户流水表修改订单id为订单号

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -207,6 +207,7 @@
 
     <update id="updateUserCard">
         UPDATE sys_user
+
         <set>
             <if test="param.realName != null and param.realName != ''">
                 real_name_ = #{param.realName},
@@ -240,17 +241,16 @@
 
     <update id="updatetSetDetail">
         UPDATE sys_user
-        <set>
+        set update_time_ = now()
             <if test="param.avatar != null and param.avatar != ''">
-                avatar_ = #{param.avatar},
+                ,avatar_ = #{param.avatar}
             </if>
             <if test="param.username != null and param.username != ''">
-                username_ = #{param.username},
+                ,username_ = #{param.username}
             </if>
             <if test="param.gender != null">
-                gender_ = #{param.gender},
+                ,gender_ = #{param.gender}
             </if>
-        </set>
         WHERE id_ = #{id}
     </update>
 

cooleshow-task/src/main/java/com/yonge/cooleshow/task/feign/TeacherFeignService.java

@@ -16,4 +16,10 @@ public interface TeacherFeignService {
      */
     @GetMapping(value = "/task/queryTeacherTotal")
     Object queryTeacherTotal();
+
+    /***
+     * 定时任务-定时修改为报名中状态-每隔10分钟执行一次
+     */
+    @GetMapping(value = "/task/openCourseGroup")
+    Object openCourseGroup();
 }

cooleshow-task/src/main/java/com/yonge/cooleshow/task/feign/fallback/TeacherFeignServiceFallback.java

@@ -10,4 +10,9 @@ public class TeacherFeignServiceFallback implements TeacherFeignService {
     public Object queryTeacherTotal() {
         return null;
     }
+
+    @Override
+    public Object openCourseGroup() {
+        return null;
+    }
 }

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

@@ -0,0 +1,22 @@
+package com.yonge.cooleshow.task.jobs;
+
+import com.yonge.cooleshow.task.core.BaseTask;
+import com.yonge.cooleshow.task.core.TaskException;
+import com.yonge.cooleshow.task.feign.TeacherFeignService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022/4/25 10:30
+ */
+@Service
+public class OpenCourseGroupTask extends BaseTask {
+    @Autowired
+    private TeacherFeignService teacherFeignService;
+
+    @Override
+    public void execute() throws TaskException {
+        Object o = teacherFeignService.openCourseGroup();
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/UserAccountRecordDto.java

@@ -7,7 +7,6 @@ import com.yonge.cooleshow.biz.dal.enums.InOrOutEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
@@ -35,14 +34,14 @@ public class UserAccountRecordDto extends UserAccountRecord {
     }
 
     public UserAccountRecordDto(Long userId, BigDecimal transAmount, InOrOutEnum inOrOut, AccountBizTypeEnum bizType,
-                                Long bizId, String bizName, Long orderId) {
+                                Long bizId, String bizName, String orderNo) {
         this.userId = userId;
         this.setTransAmount(transAmount);
         this.setInOrOut(inOrOut);
         this.setBizType(bizType);
         this.setBizId(bizId);
         this.setBizName(bizName);
-        this.setOrderId(orderId);
+        this.setOrderNo(orderNo);
     }
 
     public Long getUserId() {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/UserAccountRecord.java

@@ -46,9 +46,9 @@ public class UserAccountRecord implements Serializable {
     @ApiModelProperty("业务名称 ")
     @TableField(value = "biz_name_")
     private String bizName;
-    @ApiModelProperty("订单id ")
-    @TableField(value = "order_id_")
-    private Long orderId;
+    @ApiModelProperty("订单号 ")
+    @TableField(value = "order_no_")
+    private String orderNo;
     @ApiModelProperty("创建时间 ")
     @TableField(value = "create_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -119,12 +119,12 @@ public class UserAccountRecord implements Serializable {
         this.bizName = bizName;
     }
 
-    public Long getOrderId() {
-        return orderId;
+    public String getOrderNo() {
+        return orderNo;
     }
 
-    public void setOrderId(Long orderId) {
-        this.orderId = orderId;
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
     }
 
     public Date getCreateTime() {

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

@@ -50,6 +50,8 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -674,9 +676,13 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
      */
     public void openCourseGroup() {
         LocalDate toDay = LocalDate.now();
+        LocalDateTime startDay = LocalDateTime.of(toDay, LocalTime.MIN);
+        LocalDateTime endDay = LocalDateTime.of(toDay, LocalTime.MAX);
+
         //查询今天未开售的课程组
         List<CourseGroup> courseGroupList = this.list(Wrappers.<CourseGroup>lambdaQuery()
-                .eq(CourseGroup::getSalesStartDate, toDay.toString())
+                .ge(CourseGroup::getSalesStartDate, startDay)
+                .lt(CourseGroup::getSalesStartDate, endDay)
                 .eq(CourseGroup::getStatus, CourseGroupEnum.NOT_SALE.getCode()));
         if (CollectionUtils.isEmpty(courseGroupList)) {
             return;

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

@@ -91,7 +91,7 @@
                 AND t.teacher_auth_status_ = #{param.authStatus}
             </if>
         </where>
-        order by t.create_time_ desc
+        order by field(t.teacher_auth_status_,'DOING') desc, t.create_time_ desc
     </select>
 
     <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo">

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

@@ -67,7 +67,7 @@
                 AND t.teacher_auth_status_ = #{param.authStatus}
             </if>
         </where>
-        order by t.create_time_ desc
+        order by field(t.teacher_auth_status_,'DOING') desc, t.create_time_ desc
     </select>
     <select id="getLastRecordByUserId"
             resultType="com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord">

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

@@ -10,7 +10,7 @@
         <result column="biz_type_" property="bizType" />
         <result column="biz_id_" property="bizId" />
         <result column="biz_name_" property="bizName" />
-        <result column="order_id_" property="orderId" />
+        <result column="order_no_" property="orderNo" />
         <result column="create_time_" property="createTime" />
     </resultMap>
 
@@ -24,7 +24,7 @@
         , t.biz_type_ as bizType
         , t.biz_id_ as bizId
         , t.biz_name_ as bizName
-        , t.order_id_ as orderId
+        , t.order_no_ as orderNo
         , t.create_time_ as createTime
         </sql>
 

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

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.teacher.task;
 
 import com.yonge.cooleshow.biz.dal.entity.TeacherTotal;
+import com.yonge.cooleshow.biz.dal.service.CourseGroupService;
 import com.yonge.cooleshow.biz.dal.service.TeacherService;
 import com.yonge.cooleshow.biz.dal.service.TeacherTotalService;
 import com.yonge.cooleshow.biz.dal.vo.TeacherTotalVo;
@@ -22,6 +23,8 @@ import java.util.List;
 public class TaskController extends BaseController {
     @Autowired
     private TeacherTotalService teacherTotalService;
+    @Autowired
+    private CourseGroupService courseGroupService;
 
     /***
      * 查询所有老师统计数据
@@ -34,6 +37,15 @@ public class TaskController extends BaseController {
         return succeed(teacherTotalService.queryTeacherTotal());
     }
 
+    /***
+     * 定时任务-定时修改为报名中状态-每隔10分钟执行一次
+     */
+    @GetMapping("/openCourseGroup")
+    public HttpResponseResult openCourseGroup(){
+        courseGroupService.openCourseGroup();
+        return HttpResponseResult.succeed();
+    }
+
     @GetMapping("/getRedisValueByKey")
     public HttpResponseResult<Object> getRedisValueByKey(String key) {
         return succeed(teacherTotalService.getRedisValueByKey(key));

toolset/utils/src/main/java/com/yonge/toolset/utils/date/DateUtil.java

@@ -718,11 +718,10 @@ public class DateUtil {
 	public static Date dayEnd(Date date) {
 		Calendar c1 = Calendar.getInstance();
 		c1.setTime(date);
-		Calendar c2 = (Calendar) c1.clone();
 		c1.clear();
-		c1.set(Calendar.YEAR, c2.get(Calendar.YEAR));
-		c1.set(Calendar.MONTH, c2.get(Calendar.MONTH));
-		c1.set(Calendar.DAY_OF_MONTH, c2.get(Calendar.DAY_OF_MONTH));
+		c1.set(Calendar.YEAR, c1.get(Calendar.YEAR));
+		c1.set(Calendar.MONTH, c1.get(Calendar.MONTH));
+		c1.set(Calendar.DAY_OF_MONTH, c1.get(Calendar.DAY_OF_MONTH));
 		// 23:59:59
 		c1.set(Calendar.HOUR_OF_DAY, 23);
 		c1.set(Calendar.MINUTE, 59);