Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserOrderController.java

@@ -58,7 +58,7 @@ public class UserOrderController extends BaseController {
     @ApiOperation(value = "查询导出", notes = "传入orderSearch")
     @PreAuthorize("@pcs.hasPermissions('userOrder/export')")
     public void export(@RequestBody OrderSearch query) {
-        List<UserOrderVo> userOrderVos = userOrderService.selectList(query);
+        List<UserOrderVo> userOrderVos = userOrderService.selectAllList(query);
         List<UserOrderExport> list = new ArrayList<>();
         userOrderVos.forEach(o-> {
             UserOrderExport export = new UserOrderExport();

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/UserOrderDao.java

@@ -55,7 +55,7 @@ public interface UserOrderDao extends BaseMapper<UserOrder>{
 	 * @date 2022-03-30 13:53:51
 	 * @return: com.yonge.cooleshow.biz.dal.vo.OrderVo
 	 */
-	List<UserOrderVo> selectList(@Param("param") OrderSearch order);
+	List<UserOrderVo> selectAllList(@Param("param") OrderSearch order);
 	/***
 	 * 查询创建时间超过半小时还在交易中的订单
 	 * @author liweifan

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

@@ -236,8 +236,6 @@ public interface CourseScheduleService extends IService<CourseSchedule> {
 
     void scheduleTask();
 
-//    void teacherSalaryTask();
-
     PianoRoomTimeVo selectRemainTime(Long teacherId);
 
     PageInfo<CourseStudentVo> selectStudent(Map<String, Object> param);

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

@@ -57,7 +57,7 @@ public interface UserOrderService extends IService<UserOrder> {
      * @updateTime 2022/4/15 15:05
      * @return: java.util.List<com.yonge.cooleshow.biz.dal.vo.UserOrderVo>
      */
-    List<UserOrderVo> selectList(OrderSearch query);
+    List<UserOrderVo> selectAllList(OrderSearch query);
 
     /***
      * 下单接口

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

@@ -148,7 +148,7 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
         query.setGoodType(GoodTypeEnum.LIVE.getCode());
         query.setBizId(groupId);
         query.setStatus(OrderStatusEnum.PAID.getCode());
-        List<UserOrderVo> userOrderVos = userOrderService.selectList(query);
+        List<UserOrderVo> userOrderVos = userOrderService.selectAllList(query);
         result.setExistBuy(0);
         if (CollectionUtils.isNotEmpty(userOrderVos)) {
             result.setExistBuy(1);

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

@@ -1270,8 +1270,8 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
                 .eq(TeacherFreeTime::getEnableFlag, 1)
                 .eq(TeacherFreeTime::getDefaultFlag, 1));
 
-        if (teacherFreeTime==null){
-            log.info("未查到陪练课配置,老师id:{}",teacherId);
+        if (teacherFreeTime == null) {
+            log.info("未查到陪练课配置,老师id:{}", teacherId);
             return new ArrayList<>();
         }
 
@@ -1623,15 +1623,16 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
 
                 //获取教师课酬写入到金额变更表
                 for (CourseScheduleStudentVo practice : practiceList) {
-                    UserAccountRecordDto userAccountRecord = new UserAccountRecordDto();
-                    userAccountRecord.setUserId(practice.getTeacherId());//老师id
-                    userAccountRecord.setInOrOut(InOrOutEnum.IN);
-                    userAccountRecord.setBizType(AccountBizTypeEnum.PRACTICE);
-                    userAccountRecord.setBizId(practice.getCourseId());//课程id
-                    userAccountRecord.setBizName(practice.getGroupName());//课程名称
-                    userAccountRecord.setTransAmount(practice.getActualSalary());//扣除手续费后所得金额
-                    userAccountRecord.setOrderNo(practice.getOrderNo());
-                    userAccountService.accountChange(userAccountRecord);
+                    userAccountService.accountChange(
+                            new UserAccountRecordDto(practice.getTeacherId(), practice.getActualSalary()
+                                    , InOrOutEnum.IN, AccountBizTypeEnum.PRACTICE, practice.getCourseId(),
+                                    practice.getGroupName(), practice.getOrderNo())
+                    );
+
+                    //清除学生统计缓存
+                    redissonClient.getBucket(CacheNameEnum.STUDENT_TOTAL.getRedisKey(practice.getStudentId())).delete();
+                    //清除老师统计缓存
+                    redissonClient.getBucket(CacheNameEnum.TEACHER_TOTAL.getRedisKey(practice.getTeacherId())).delete();
                 }
             }
 

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yonge.cooleshow.biz.dal.dao.UserOrderDao;
 import com.yonge.cooleshow.biz.dal.dto.UserAccountRecordDto;
 import com.yonge.cooleshow.biz.dal.dto.req.TotalReq;
 import com.yonge.cooleshow.biz.dal.entity.UserAccountRecord;
@@ -49,7 +50,6 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAcco
     private RedissonClient redissonClient;
     @Autowired
     private UserOrderService orderService;
-
     @Override
     public UserAccountVo detail(Long id) {
         UserAccountVo detail = baseMapper.detail(id);
@@ -88,6 +88,7 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAcco
         } catch (BizException e) {
             return HttpResponseResult.failed(e.getMessage());
         } catch (Exception e) {
+            e.printStackTrace();
             log.error("callIfLockCanGet error lockKey {}", lockName);
             return HttpResponseResult.failed("账户变更失败");
         } finally {
@@ -151,6 +152,7 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAcco
         if (InOrOutEnum.IN.equals(accountRecordDto.getInOrOut())) {
             UserOrder userOrder = orderService.getOne(Wrappers.<UserOrder>lambdaQuery()
                     .eq(UserOrder::getOrderNo, accountRecordDto.getOrderNo()));
+
             BigDecimal totalTransAmount = baseMapper.totalTransAmount(accountRecordDto);
             if (null == totalTransAmount) {
                 totalTransAmount = BigDecimal.ZERO;

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

@@ -203,7 +203,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
     public void setSuccessStatus() {
         OrderSearch query = new OrderSearch();
         query.setStatus("WAIT_PAY,PAYING");
-        List<UserOrderVo> userOrderVos = selectList(query);
+        List<UserOrderVo> userOrderVos = selectAllList(query);
         for (UserOrderVo userOrderVo : userOrderVos) {
             testOrderSuccess(userOrderVo);
         }
@@ -244,8 +244,8 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
     }
 
     @Override
-    public List<UserOrderVo> selectList(OrderSearch query) {
-        return baseMapper.selectList(query);
+    public List<UserOrderVo> selectAllList(OrderSearch query) {
+        return baseMapper.selectAllList(query);
     }
 
     @Override
@@ -346,7 +346,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         search.setStatus(OrderStatusEnum.WAIT_PAY.getCode());
         search.setEndTime(LocalDateTime.now().minusMinutes(30));
         //查询待支付订单
-        List<UserOrderVo> waitPayOrderList = baseMapper.selectList(search);
+        List<UserOrderVo> waitPayOrderList = baseMapper.selectAllList(search);
         for (UserOrderVo orderVo : waitPayOrderList) {
             //取消订单要获取锁，防止在轮询取消时，用户修改订单状态
             boolean b = DistributedLock.of(redissonClient)
@@ -357,7 +357,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         search.setStatus(OrderStatusEnum.PAYING.getCode());
         search.setEndTime(LocalDateTime.now().minusMinutes(120));
         //查询待支付中订单
-        List<UserOrderVo> payingOrderList = baseMapper.selectList(search);
+        List<UserOrderVo> payingOrderList = baseMapper.selectAllList(search);
         for (UserOrderVo orderVo : payingOrderList) {
             //取消订单要获取锁，防止在轮询取消时，用户修改订单状态
             boolean b = DistributedLock.of(redissonClient)

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

@@ -154,7 +154,7 @@ public class VideoLessonGroupDetailServiceImpl extends ServiceImpl<VideoLessonGr
         param.setGoodType(GoodTypeEnum.VIDEO.getCode());
         param.setBizId(groupId);
         param.setStatus(OrderStatusEnum.PAID.getCode());
-        List<UserOrderVo> userOrderVos = orderService.selectList(param);
+        List<UserOrderVo> userOrderVos = orderService.selectAllList(param);
 
         /*VideoLessonPurchaseRecord isAlreadyBuy= videoLessonPurchaseRecordDao.selectOne(Wrappers.<VideoLessonPurchaseRecord>lambdaQuery()
                 .eq(VideoLessonPurchaseRecord::getStudentId, userId)

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

@@ -140,9 +140,8 @@
     </select>
 
     <select id="totalTransAmount" resultType="java.math.BigDecimal">
-        sleect sum(trans_amount_) from user_cash_account_record
+        select sum(trans_amount_) from user_cash_account_record
         <where>
-
             <if test="param.accountId != null">
                 and account_id_ = #{param.accountId}
             </if>

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

@@ -161,7 +161,7 @@
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.UserOrderVo">
         <include refid="selectSql"/>
     </select>
-    <select id="selectList" resultType="com.yonge.cooleshow.biz.dal.vo.UserOrderVo">
+    <select id="selectAllList" resultType="com.yonge.cooleshow.biz.dal.vo.UserOrderVo">
         <include refid="selectSql"/>
     </select>
 

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

@@ -65,7 +65,6 @@ public class TaskController extends BaseController {
     @GetMapping("/courseStatus")
     public HttpResponseResult<Object> courseStatus() {
         scheduleService.scheduleTask();
-        teacherTotalService.queryTeacherTotal();
         return HttpResponseResult.succeed();
     }