caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg

Browse Source
This commit is contained in:
paulGao 2022-07-04 18:31:49 +08:00
commit 727ddd3198
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java
View File

@ -48,7 +48,7 @@ public class MemberEvaluationBuyerController {
@ApiOperation(value = "查看会员评价详情") @ApiOperation(value = "查看会员评价详情")
@ApiImplicitParam(name = "id", value = "评价ID", required = true, paramType = "path") @ApiImplicitParam(name = "id", value = "评价ID", required = true, paramType = "path")
@GetMapping(value = "/get/{id}") @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)); return ResultUtil.data(memberEvaluationService.queryById(id));
} }

2
framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
View File

@ -203,7 +203,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
loginBindUser(member, authUser.getUuid(), authUser.getSource()); loginBindUser(member, authUser.getUuid(), authUser.getSource());
return memberTokenGenerate.createToken(member, false); return memberTokenGenerate.createToken(member, false);
} catch (ServiceException e) { } catch (ServiceException e) {
log.error("自动注册服务泡出异常：", e); log.error("自动注册服务抛出异常：", e);
throw e; throw e;
} catch (Exception e) { } catch (Exception e) {
log.error("自动注册异常：", e); log.error("自动注册异常：", e);

9
framework/src/main/java/cn/lili/modules/statistics/util/StatisticsDateUtil.java
View File

@ -92,7 +92,14 @@ public class StatisticsDateUtil {
Date[] dateArray = new Date[2]; Date[] dateArray = new Date[2];
Calendar calendar = Calendar.getInstance(); 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(); dateArray[1] = calendar.getTime();
calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1); calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1);
dateArray[0] = calendar.getTime(); dateArray[0] = calendar.getTime();