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

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

@@ -182,7 +182,7 @@
         <result property="portrait" column="avatar_"/>
     </resultMap>
     <select id="getBasic" resultMap="ImUserModel">
-        select CASE WHEN real_name_ IS NULL THEN username_ ELSE real_name_ END username_,id_,avatar_
+        select CASE WHEN real_name_ IS NULL OR real_name_ = '' THEN username_ ELSE real_name_ END username_,id_,avatar_
         from sys_user where id_ = #{userId} LIMIT 1
     </select>
     

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleTeacherSalaryServiceImpl.java

@@ -295,21 +295,21 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             updateTeacherSalarys.add(courseScheduleTeacherSalary);
 
             //生成教师账户资金变动记录
-            sysUserCashAccountService.updateBalance(courseScheduleTeacherSalary.getUserId(), actualSalary);
-            SysUserCashAccount teacherCashAccount = sysUserCashAccountService.get(courseScheduleTeacherSalary.getUserId().intValue());
-            SysUserCashAccountDetail teacherCashAccountDetail = new SysUserCashAccountDetail();
-            teacherCashAccountDetail.setUserId(courseScheduleTeacherSalary.getUserId());
-            teacherCashAccountDetail.setType(PlatformCashAccountDetailTypeEnum.WAGE);
-            teacherCashAccountDetail.setStatus(DealStatusEnum.SUCCESS);
-            teacherCashAccountDetail.setAmount(actualSalary);
-            if(Objects.isNull(teacherCashAccount)){
-                teacherCashAccountDetail.setBalance(new BigDecimal(0));
-            }else{
-                teacherCashAccountDetail.setBalance(teacherCashAccount.getBalance());
-            }
-            teacherCashAccountDetail.setAttribute(courseScheduleTeacherSalary.getCourseScheduleId().toString());
-
-            userCashAccountDetails.add(teacherCashAccountDetail);
+//            sysUserCashAccountService.updateBalance(courseScheduleTeacherSalary.getUserId(), actualSalary);
+//            SysUserCashAccount teacherCashAccount = sysUserCashAccountService.get(courseScheduleTeacherSalary.getUserId().intValue());
+//            SysUserCashAccountDetail teacherCashAccountDetail = new SysUserCashAccountDetail();
+//            teacherCashAccountDetail.setUserId(courseScheduleTeacherSalary.getUserId());
+//            teacherCashAccountDetail.setType(PlatformCashAccountDetailTypeEnum.WAGE);
+//            teacherCashAccountDetail.setStatus(DealStatusEnum.SUCCESS);
+//            teacherCashAccountDetail.setAmount(actualSalary);
+//            if(Objects.isNull(teacherCashAccount)){
+//                teacherCashAccountDetail.setBalance(new BigDecimal(0));
+//            }else{
+//                teacherCashAccountDetail.setBalance(teacherCashAccount.getBalance());
+//            }
+//            teacherCashAccountDetail.setAttribute(courseScheduleTeacherSalary.getCourseScheduleId().toString());
+//
+//            userCashAccountDetails.add(teacherCashAccountDetail);
 
             //根据学生进行投诉分组
             Map<Integer, List<CourseScheduleComplaints>> complainsGroupByStudent = null;
@@ -354,26 +354,26 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 updateStudentPayments.add(studentPayment);
 
 
-                if(returnPrice.compareTo(zero)!=0){
-                    //生成学生账户资金变动记录
-                    sysUserCashAccountService.updateBalance(studentPayment.getUserId(), returnPrice);
-                    SysUserCashAccount studentCashAccount = sysUserCashAccountService.get(studentPayment.getUserId().intValue());
-                    SysUserCashAccountDetail studentAccountDetail = new SysUserCashAccountDetail();
-                    studentAccountDetail.setUserId(studentPayment.getUserId());
-                    studentAccountDetail.setType(PlatformCashAccountDetailTypeEnum.REFUNDS);
-                    studentAccountDetail.setStatus(DealStatusEnum.SUCCESS);
-                    studentAccountDetail.setAmount(returnPrice);
-                    studentAccountDetail.setBalance(studentCashAccount.getBalance());
-                    studentAccountDetail.setAttribute(courseScheduleTeacherSalary.getCourseScheduleId().toString());
-
-                    userCashAccountDetails.add(studentAccountDetail);
-                }
+//                if(returnPrice.compareTo(zero)!=0){
+//                    //生成学生账户资金变动记录
+//                    sysUserCashAccountService.updateBalance(studentPayment.getUserId(), returnPrice);
+//                    SysUserCashAccount studentCashAccount = sysUserCashAccountService.get(studentPayment.getUserId().intValue());
+//                    SysUserCashAccountDetail studentAccountDetail = new SysUserCashAccountDetail();
+//                    studentAccountDetail.setUserId(studentPayment.getUserId());
+//                    studentAccountDetail.setType(PlatformCashAccountDetailTypeEnum.REFUNDS);
+//                    studentAccountDetail.setStatus(DealStatusEnum.SUCCESS);
+//                    studentAccountDetail.setAmount(returnPrice);
+//                    studentAccountDetail.setBalance(studentCashAccount.getBalance());
+//                    studentAccountDetail.setAttribute(courseScheduleTeacherSalary.getCourseScheduleId().toString());
+//
+//                    userCashAccountDetails.add(studentAccountDetail);
+//                }
             }
 
         });
-        if(!CollectionUtils.isEmpty(userCashAccountDetails)){
-            sysUserCashAccountDetailDao.batchInsert(userCashAccountDetails);
-        }
+//        if(!CollectionUtils.isEmpty(userCashAccountDetails)){
+//            sysUserCashAccountDetailDao.batchInsert(userCashAccountDetails);
+//        }
     }
 
     @Override
@@ -571,19 +571,19 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             courseScheduleTeacherSalaryDao.update(courseScheduleTeacherSalary);
 
             //生成教师账户资金变动记录
-            sysUserCashAccountService.updateBalance(courseScheduleTeacherSalary.getUserId(), teacherSalary);
-            SysUserCashAccount teacherCashAccount = sysUserCashAccountService.get(courseScheduleTeacherSalary.getUserId().intValue());
-            SysUserCashAccountDetail teacherCashAccountDetail = new SysUserCashAccountDetail();
-            teacherCashAccountDetail.setUserId(courseScheduleTeacherSalary.getUserId());
-            teacherCashAccountDetail.setType(PlatformCashAccountDetailTypeEnum.WAGE);
-            teacherCashAccountDetail.setStatus(DealStatusEnum.SUCCESS);
-            teacherCashAccountDetail.setAmount(teacherSalary);
-            teacherCashAccountDetail.setBalance(teacherCashAccount.getBalance());
-            teacherCashAccountDetail.setAttribute(courseScheduleTeacherSalary.getCourseScheduleId().toString());
-            userCashAccountDetails.add(teacherCashAccountDetail);
+//            sysUserCashAccountService.updateBalance(courseScheduleTeacherSalary.getUserId(), teacherSalary);
+//            SysUserCashAccount teacherCashAccount = sysUserCashAccountService.get(courseScheduleTeacherSalary.getUserId().intValue());
+//            SysUserCashAccountDetail teacherCashAccountDetail = new SysUserCashAccountDetail();
+//            teacherCashAccountDetail.setUserId(courseScheduleTeacherSalary.getUserId());
+//            teacherCashAccountDetail.setType(PlatformCashAccountDetailTypeEnum.WAGE);
+//            teacherCashAccountDetail.setStatus(DealStatusEnum.SUCCESS);
+//            teacherCashAccountDetail.setAmount(teacherSalary);
+//            teacherCashAccountDetail.setBalance(teacherCashAccount.getBalance());
+//            teacherCashAccountDetail.setAttribute(courseScheduleTeacherSalary.getCourseScheduleId().toString());
+//            userCashAccountDetails.add(teacherCashAccountDetail);
 
         });
-        sysUserCashAccountDetailDao.batchInsert(userCashAccountDetails);
+//        sysUserCashAccountDetailDao.batchInsert(userCashAccountDetails);
     }
 
     @Override