Merge branch 'develop' of gitadmin/tuoheng_qmhh into release

tuoheng-api/src/main/java/com/tuoheng/api/service/points/receive/ReceivePonitsService.java

@@ -87,10 +87,19 @@ public class ReceivePonitsService {
         Integer totalPointsByToDay = userPointsDetailMapper.selectTotalPointsByToDay(request.getOpenid(), pointsTime, changeName);
         if (ObjectUtil.isNotEmpty(totalPointsByToDay)) {
             if (totalPointsByToDay >= dailyLimitWestreamSubmit) {
-                log.info("领取积分，已超过每日积分上限，totalPointsByToDay:{}, dailyLimitWestreamSubmit:{}", totalPointsByToDay, dailyLimitWestreamSubmit);
-                return JsonResult.error("已超过每日积分上限");
+                log.info("领取积分，已超过每日领取积分上限，totalPointsByToDay:{}, dailyLimitWestreamSubmit:{}", totalPointsByToDay, dailyLimitWestreamSubmit);
+                return JsonResult.error("已超过每日领取积分上限");
             }
         }
+        Integer points = 0;
+        if (ObjectUtil.isNotEmpty(dictData)) {
+            points = Integer.parseInt(dictData.getValue());
+
+        }
+        if ((points + totalPointsByToDay) >= dailyLimitWestreamSubmit) {
+            log.info("此次领取积分，加上今天已领积分，已超过每日积分上限，points:{}，totalPointsByToDay:{}, dailyLimitWestreamSubmit:{}", points, totalPointsByToDay, dailyLimitWestreamSubmit);
+            return JsonResult.error("此次领取积分，加上今天已领积分，已超过每日积分上限");
+        }
 
         WestreamUser westreamUser = westreamUserMapper.selectOne(new LambdaQueryWrapper<WestreamUser>()
                 .eq(WestreamUser::getTenantId, request.getTenantId())
@@ -125,11 +134,7 @@ public class ReceivePonitsService {
         userPointsDetail.setChangeName("阅读知识");
         userPointsDetail.setType(1);
         userPointsDetail.setCreateTime(DateUtils.now());
-        Integer points = 0;
-        if (ObjectUtil.isNotEmpty(dictData)) {
-            points = Integer.parseInt(dictData.getValue());
-            userPointsDetail.setPointsChange(points);
-        }
+        userPointsDetail.setPointsChange(points);
         userPointsDetail.setPointsTime(DateUtils.now());
 
         Integer row = userPointsDetailMapper.insert(userPointsDetail);