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 2021-12-15 17:32:02 +08:00
commit 2536e3b9f6
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewServiceImpl.java
View File

@ -70,7 +70,7 @@ public class PlatformViewServiceImpl extends ServiceImpl<PlatformViewMapper, Pla
Object object = cache.get(CachePrefix.ONLINE_NUM.getPrefix()); Object object = cache.get(CachePrefix.ONLINE_NUM.getPrefix());
if (null != object) { if (null != object) {
return (Long) cache.get(CachePrefix.ONLINE_NUM.getPrefix()); return (Long) object;
} }
//这里统计的是有效的accessToken ，如果需要数据精确，需要调整accessToken的有效时间，开发人员建议2小时误差较为合适 //这里统计的是有效的accessToken ，如果需要数据精确，需要调整accessToken的有效时间，开发人员建议2小时误差较为合适
Long num = Long.valueOf(cache.keys(CachePrefix.ACCESS_TOKEN.getPrefix(UserEnums.MEMBER) + "*").size()); Long num = Long.valueOf(cache.keys(CachePrefix.ACCESS_TOKEN.getPrefix(UserEnums.MEMBER) + "*").size());
@ -83,7 +83,7 @@ public class PlatformViewServiceImpl extends ServiceImpl<PlatformViewMapper, Pla
Object object = cache.get(CachePrefix.MEMBER_DISTRIBUTION.getPrefix()); Object object = cache.get(CachePrefix.MEMBER_DISTRIBUTION.getPrefix());
if (null != object) { if (null != object) {
return (List<MemberDistributionVO>) cache.get(CachePrefix.MEMBER_DISTRIBUTION.getPrefix()); return (List<MemberDistributionVO>) object;
} }
List<MemberDistributionVO> memberDistributionVOS = memberStatisticsService.distribution(); List<MemberDistributionVO> memberDistributionVOS = memberStatisticsService.distribution();

1
framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java
View File

@ -192,6 +192,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements Bi
} }
LambdaUpdateWrapper<Bill> lambdaUpdateWrapper = Wrappers.lambdaUpdate(); LambdaUpdateWrapper<Bill> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
lambdaUpdateWrapper.eq(Bill::getId, id); lambdaUpdateWrapper.eq(Bill::getId, id);
lambdaUpdateWrapper.set(Bill::getPayTime, new Date());
lambdaUpdateWrapper.set(Bill::getBillStatus, BillStatusEnum.COMPLETE.name()); lambdaUpdateWrapper.set(Bill::getBillStatus, BillStatusEnum.COMPLETE.name());
return this.update(lambdaUpdateWrapper); return this.update(lambdaUpdateWrapper);
} }

2
framework/src/main/java/cn/lili/modules/system/entity/dto/ImSetting.java
View File

@ -20,7 +20,7 @@ public class ImSetting implements Serializable {
@ApiModelProperty(value = "平台ID") @ApiModelProperty(value = "平台ID")
private Integer tenantId; private String tenantId;
} }