Browse Source

feat: 首页数据调整;

Joburgess 4 năm trước cách đây
mục cha
commit
40c3a9a858

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/GroupClassServiceImpl.java

@@ -153,7 +153,7 @@ public class GroupClassServiceImpl implements GroupClassService {
                 if(refundAmount.compareTo(orders.get(0).getExpectAmount())>0){
                     throw new BizException("退款不可大于购买金额");
                 }
-                sysUserCashAccountService.updateBalance(practiceGroup.getStudentId(), refundAmount, PlatformCashAccountDetailTypeEnum.REFUNDS, "后关闭网管课");
+                sysUserCashAccountService.updateBalance(practiceGroup.getStudentId(), refundAmount, PlatformCashAccountDetailTypeEnum.REFUNDS, "后关闭网管课");
             }
             cleanGroupInfo(groupId.toString(), GroupType.PRACTICE);
             practiceGroup.setMemo("后台关闭网管课");

+ 5 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/IndexBaseMonthDataServiceImpl.java

@@ -105,6 +105,11 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 
 			IndexBaseMonthData indexBaseMonthData = new IndexBaseMonthData();
 			indexBaseMonthData.setMonth(Date.from(endDate.atStartOfDay(DateUtil.zoneId).toInstant()));
+			if(IndexDataType.HOMEWORK_CREATE_RATE.equals(dataType)
+					||IndexDataType.HOMEWORK_SUBMIT_RATE.equals(dataType)
+					||IndexDataType.HOMEWORK_COMMENT_RATE.equals(dataType)){
+				indexBaseMonthData.setMonth(Date.from(endDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue()).atStartOfDay(DateUtil.zoneId).toInstant()));
+			}
 			indexBaseMonthData.setTotalNum(BigDecimal.ZERO);
 			indexBaseMonthData.setActivateNum(BigDecimal.ZERO);
 			indexBaseMonthData.setPercent(BigDecimal.ZERO);