code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into Bulbasaur

Browse Source
This commit is contained in:
lifenlong
2021-06-01 15:51:50 +08:00
parent b70da68761 d01bd1581e
commit 6fb7322e3e
9 changed files with 56 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/src/main/java/cn/lili/config/properties/SystemSetting.java
View File

@@ -6,6 +6,7 @@ import org.springframework.context.annotation.Configuration;
/**
* 系统设置
*
* @author Chopper
*/
@Data
@@ -18,4 +19,9 @@ public class SystemSetting {
* 是否是演示站点
*/
private Boolean isDemoSite = false;
/**
* 授权信息
*/
private String licences = "";
}

7
framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java
View File

@@ -46,9 +46,14 @@ public class MemberPointsHistoryServiceImpl extends ServiceImpl<MemberPointsHist
@Override
public IPage<MemberPointsHistory> MemberPointsHistoryList(PageVO page, String memberId, String memberName) {
LambdaQueryWrapper<MemberPointsHistory> lambdaQueryWrapper=new LambdaQueryWrapper<MemberPointsHistory>()
LambdaQueryWrapper<MemberPointsHistory> lambdaQueryWrapper = new LambdaQueryWrapper<MemberPointsHistory>()
.eq(memberId != null, MemberPointsHistory::getMemberId, memberId)
.like(memberName != null, MemberPointsHistory::getMemberName, memberName);
//如果排序为空，则默认创建时间倒序
if (StringUtils.isEmpty(page.getSort())) {
page.setSort("createTime");
page.setOrder("desc");
}
return this.page(PageUtil.initPage(page), lambdaQueryWrapper);
}
}

2
framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java
View File

@@ -206,7 +206,7 @@ public class OrderStatisticsDataServiceImpl extends ServiceImpl<OrderStatisticsD
//已支付
queryWrapper.eq("pay_status", PayStatusEnum.PAID.name());
//选择商家判定
queryWrapper.eq(StringUtils.isNotEmpty(statisticsQueryParam.getStoreId()), "seller_id", statisticsQueryParam.getStoreId());
queryWrapper.eq(StringUtils.isNotEmpty(statisticsQueryParam.getStoreId()), "store_id", statisticsQueryParam.getStoreId());
// 查询时间区间
queryWrapper.between("create_time", dates[0], dates[1]);
// 格式化时间

2
framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java
View File

@@ -233,7 +233,7 @@ public class PlatformViewDataServiceImpl extends ServiceImpl<PlatformViewDataMap
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.between("date", dates[0], dates[1]);
//根据店铺查询判定，如果有，则店铺查询，如果没有，则根据商家查询
if (queryParam.getStoreId() != null) {
if (StringUtils.isNotEmpty(queryParam.getStoreId())) {
queryWrapper.eq("store_id", queryParam.getStoreId());
} else {
queryWrapper.eq("store_id", -1);