Merge branch 'master' into Bulbasaur
This commit is contained in:
lifenlong
commit
6fb7322e3e
30
README.md
30
README.md
@ -5,6 +5,8 @@
|
||||
|
||||
[](https://gitee.com/beijing_hongye_huicheng/lilishop/stargazers)
|
||||
|
||||
|
||||
|
||||
|
||||
### 介绍
|
||||
**官网**：https://pickmall.cn
|
||||
@ -62,8 +64,32 @@ Lilishop 是一款Java开发，基于SpringBoot研发的B2B2C多用户商城，
|
||||
|
||||
温馨提示：由于服务较多，如果笔记本环境启动内存没有32g可能无法启动成功（macbookpro 2020 16g内存启动无法成功），台式机在16g内存、AMD 3700x 的ubuntu系统成功运行。
|
||||
|
||||
##### 下载docker脚本
|
||||
|
||||
|
||||
##### docker环境安装（已安装的用户可跳过）
|
||||
```shell
|
||||
#安装依赖
|
||||
sudo yum install -y yum-utils device-mapper-persistent-data lvm2
|
||||
#设置源
|
||||
sudo yum-config-manager --add-repo http://mirrors.aliyun.com/docker-ce/linux/centos/docker-ce.repo
|
||||
sudo yum makecache fast
|
||||
#安装docker
|
||||
sudo yum install docker-ce
|
||||
#启动服务
|
||||
sudo systemctl start docker
|
||||
#安装docker-compose
|
||||
sudo curl -L https://github.com/docker/compose/releases/download/1.21.2/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
|
||||
#授权
|
||||
sudo chmod +x /usr/local/bin/docker-compose
|
||||
#检测版本号
|
||||
docker-compose -v
|
||||
```
|
||||
|
||||
|
||||
|
||||
##### 下载docker-compose脚本
|
||||
`git clone https://gitee.com/beijing_hongye_huicheng/docker.git `
|
||||
|
||||
##### 部署基础环境
|
||||
`docker-compose up -d`
|
||||
|
||||
@ -118,8 +144,6 @@ PS:单独部署的话，数据库文件访问这里：https://gitee.com/beijing_
|
||||
|
||||
#### 移动端
|
||||
|
||||
<img src="https://pickmall.cn/assets/imgs/other/app.gif" alt="管理端功能展示" style="zoom:50%;" />
|
||||
|
||||
<img src="https://pickmall.cn/assets/imgs/other/app.gif" alt="移动端功能展示" style="zoom:50%;" />
|
||||
|
||||
|
||||
|
||||
@ -63,11 +63,11 @@ public class MemberBuyerController {
|
||||
public ResultMessage<Object> smsLogin(@NotNull(message = "手机号为空") @RequestParam String mobile,
|
||||
@NotNull(message = "验证码为空") @RequestParam String code,
|
||||
@RequestHeader String uuid) {
|
||||
// if(smsUtil.verifyCode(mobile,VerificationEnums.LOGIN,uuid,code)){
|
||||
if(smsUtil.verifyCode(mobile,VerificationEnums.LOGIN,uuid,code)){
|
||||
return ResultUtil.data(memberService.mobilePhoneLogin(mobile));
|
||||
// }else {
|
||||
// throw new ServiceException("验证码错误");
|
||||
// }
|
||||
}else {
|
||||
throw new ServiceException("验证码错误");
|
||||
}
|
||||
}
|
||||
|
||||
@ApiOperation(value = "注册用户")
|
||||
|
||||
@ -12,6 +12,7 @@ import cn.lili.common.utils.CommonUtil;
|
||||
import cn.lili.common.enums.ResultUtil;
|
||||
import cn.lili.common.utils.StringUtils;
|
||||
import cn.lili.common.vo.ResultMessage;
|
||||
import cn.lili.config.properties.SystemSetting;
|
||||
import cn.lili.modules.file.entity.File;
|
||||
import cn.lili.modules.file.plugin.FileManagerPlugin;
|
||||
import cn.lili.modules.file.service.FileService;
|
||||
@ -51,6 +52,9 @@ public class UploadController {
|
||||
@Autowired
|
||||
private Cache cache;
|
||||
|
||||
@Autowired
|
||||
private SystemSetting systemSetting;
|
||||
|
||||
@ApiOperation(value = "文件上传")
|
||||
@PostMapping(value = "/file")
|
||||
public ResultMessage<Object> upload(MultipartFile file,
|
||||
@ -102,4 +106,9 @@ public class UploadController {
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation(value = "返回licences")
|
||||
@PostMapping(value = "/licences")
|
||||
public ResultMessage<Object> licences() {
|
||||
return ResultUtil.data(systemSetting.getLicences());
|
||||
}
|
||||
}
|
||||
|
||||
@ -211,6 +211,7 @@ jasypt:
|
||||
lili:
|
||||
system:
|
||||
isDemoSite: true
|
||||
licences: 'temporary'
|
||||
statistics:
|
||||
# 在线人数统计 X 小时。这里设置48，即统计过去48小时每小时在线人数
|
||||
onlineMember: 48
|
||||
|
||||
@ -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 = "";
|
||||
}
|
||||
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
@ -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]);
|
||||
// 格式化时间
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -39,7 +39,7 @@ public class PointsGoodsManagerController {
|
||||
AuthUser currentUser = UserContext.getCurrentUser();
|
||||
List<PointsGoodsVO> collect = new ArrayList<>();
|
||||
for (PointsGoodsVO i : pointsGoodsList) {
|
||||
i.setStoreName("platform");
|
||||
i.setStoreName(i.getGoodsSku().getStoreName());
|
||||
i.setStoreId(currentUser.getId());
|
||||
collect.add(i);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user