入账问题修改

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/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,15 @@ 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;
@@ -48,7 +49,7 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAcco
     @Autowired
     private RedissonClient redissonClient;
     @Autowired
-    private UserOrderService orderService;
+    private UserOrderDao orderDao;
 
     @Override
     public UserAccountVo detail(Long id) {
@@ -88,6 +89,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 {
@@ -149,8 +151,9 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAcco
         UserAccountVo detail = detail(accountRecordDto.getUserId());
         //收入要校验金额
         if (InOrOutEnum.IN.equals(accountRecordDto.getInOrOut())) {
-            UserOrder userOrder = orderService.getOne(Wrappers.<UserOrder>lambdaQuery()
+            UserOrder userOrder = orderDao.selectOne(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/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-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();
     }