Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop i…

…nto feature/pg
next2your · Jul 4, 2022 · 727ddd3 · 727ddd3
2 parents 7b53543 + da8ed53
commit 727ddd3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java
@@ -48,7 +48,7 @@ public ResultMessage<MemberEvaluationDTO> save(@Valid MemberEvaluationDTO member
     @ApiOperation(value = "查看会员评价详情")
     @ApiImplicitParam(name = "id", value = "评价ID", required = true, paramType = "path")
     @GetMapping(value = "/get/{id}")
-    public ResultMessage<MemberEvaluationVO> save(@NotNull(message = "评价ID不能为空") @PathVariable("id") String id) {
+    public ResultMessage<MemberEvaluationVO> get(@NotNull(message = "评价ID不能为空") @PathVariable("id") String id) {
         return ResultUtil.data(memberEvaluationService.queryById(id));
 
     }

diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
@@ -203,7 +203,7 @@ public Token autoRegister(ConnectAuthUser authUser) {
             loginBindUser(member, authUser.getUuid(), authUser.getSource());
             return memberTokenGenerate.createToken(member, false);
         } catch (ServiceException e) {
-            log.error("自动注册服务泡出异常：", e);
+            log.error("自动注册服务抛出异常：", e);
             throw e;
         } catch (Exception e) {
             log.error("自动注册异常：", e);

diff --git a/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsDateUtil.java b/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsDateUtil.java
@@ -92,7 +92,14 @@ public static Date[] getDateArray(Integer year, Integer month) {
         Date[] dateArray = new Date[2];
 
         Calendar calendar = Calendar.getInstance();
-        calendar.set(year, month, 0);
+
+        //时间归到今天凌晨0点
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+
+        calendar.set(year, month, 1);
         dateArray[1] = calendar.getTime();
         calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1);
         dateArray[0] = calendar.getTime();