yonge пре 5 година
родитељ
комит
84a26d2b96

+ 9 - 3
mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysUserCashAccountServiceImpl.java

@@ -184,9 +184,11 @@ public class SysUserCashAccountServiceImpl extends BaseServiceImpl<Integer, SysU
         if (cashAccount == null) {
             throw new BizException("用户[{}]现金账户不存在", userId);
         }
+        
+        Date date = new Date();
 
         cashAccount.setCourseBalance(decimal);
-        cashAccount.setUpdateTime(new Date());
+        cashAccount.setUpdateTime(date);
 
         sysUserCashAccountDao.update(cashAccount);
 
@@ -195,8 +197,10 @@ public class SysUserCashAccountServiceImpl extends BaseServiceImpl<Integer, SysU
             sysUserCoursesAccountDetail.setUserId(userId);
             sysUserCoursesAccountDetail.setAmount(amount);
             sysUserCoursesAccountDetail.setBalance(decimal);
-            sysUserCoursesAccountDetail.setDescription(description + "-" + sysUser.getId());
+            sysUserCoursesAccountDetail.setComment(description + "-" + sysUser.getId());
             sysUserCoursesAccountDetail.setStatus(DealStatusEnum.SUCCESS);
+            sysUserCoursesAccountDetail.setUpdateTime(date);
+            sysUserCoursesAccountDetail.setCreateTime(date);
             sysUserCoursesAccountDetailDao.insert(sysUserCoursesAccountDetail);
         }
         return true;
@@ -227,8 +231,10 @@ public class SysUserCashAccountServiceImpl extends BaseServiceImpl<Integer, SysU
             sysUserCoursesAccountDetail.setUserId(userId);
             sysUserCoursesAccountDetail.setAmount(decimal);
             sysUserCoursesAccountDetail.setBalance(balance);
-            sysUserCoursesAccountDetail.setDescription(description + "-" + sysUser.getId());
+            sysUserCoursesAccountDetail.setComment(description + "-" + sysUser.getId());
             sysUserCoursesAccountDetail.setStatus(DealStatusEnum.SUCCESS);
+            sysUserCoursesAccountDetail.setUpdateTime(date);
+            sysUserCoursesAccountDetail.setCreateTime(date);
             sysUserCoursesAccountDetailDao.insert(sysUserCoursesAccountDetail);
         }
 

+ 2 - 2
mec-web/src/main/java/com/ym/mec/web/controller/ClassGroupController.java

@@ -54,9 +54,9 @@ public class ClassGroupController extends BaseController {
     @ApiOperation(value = "分页查询班级列表")
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('classGroup/queryPage')")
-    public HttpResponseResult<PageInfo<ClassGroup>> queryPage(ClassGroupQueryInfo queryInfo) {
+    public HttpResponseResult<ClassGroup> queryPage(ClassGroupQueryInfo queryInfo) {
     	queryInfo.setDelFlag(0);
-        return succeed(classGroupService.queryPage(queryInfo));
+        return succeed(classGroupService.queryPage(queryInfo).getRows().get(0));
     }
 
     @ApiOperation(value = "创建班级")