Chopper
|
e0e5106eed
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2021-09-17 14:47:27 +08:00 |
|
Chopper
|
9cee1093f4
|
IM完善
|
2021-09-17 14:47:25 +08:00 |
|
Chopper
|
3459169885
|
IM 相关配置提交
|
2021-09-16 15:32:09 +08:00 |
|
paulGao
|
8ae04e7ee6
|
fix manager api calling updateGoodsMarketAble error
fix manager api es generator get progress error info
|
2021-09-16 11:55:58 +08:00 |
|
Chopper
|
7727c1a45b
|
调整验证码模块，对演示站点做权限处理
|
2021-09-14 16:43:48 +08:00 |
|
Chopper
|
a210565387
|
增加脱敏配置。
lili:
system:
sensitiveLevel: 2
|
2021-09-13 10:30:56 +08:00 |
|
paulGao
|
f99b65b2e6
|
fix coupon get error
|
2021-09-10 10:57:34 +08:00 |
|
paulGao
|
0bbefb516d
|
fix seckill get error
|
2021-09-10 10:49:27 +08:00 |
|
paulGao
|
d3e1de5620
|
fix XSS and BAC, improve code style
|
2021-09-09 16:47:14 +08:00 |
|
paulGao
|
4063c8b063
|
improve esGoods parameter selector buckets(not get category and brand from db, add EsGoodsIndex Field BrandName,BrandUrl,CategoryNamePath)
|
2021-09-07 01:55:58 +08:00 |
|
paulGao
|
2e80478203
|
upgrade spring boot 2.3 to 2.4
|
2021-09-01 19:03:36 +08:00 |
|
Chopper
|
e9075a94f3
|
秒杀活动自动创建调整为7天
|
2021-08-31 17:42:27 +08:00 |
|
Chopper
|
e08e187526
|
去除无效类，版本号切换，准备打版
|
2021-08-30 16:58:47 +08:00 |
|
Chopper
|
f8c1e9d8b8
|
去除jpa依赖，部分不相关的代码去除。
|
2021-08-30 14:32:49 +08:00 |
|
lifenlong
|
7276824a18
|
秒杀活动启动修改mongo
修改部分代码规范
|
2021-08-20 09:40:06 +08:00 |
|
Chopper
|
ab118a8efc
|
购物车价格计算全面优化，优惠券分布到每个订单，满减活动没有对参与商品进行判定问题处理。
|
2021-08-19 17:38:37 +08:00 |
|
lifenlong
|
c1d5673837
|
运营后台，平台审核售后
|
2021-08-13 09:20:45 +08:00 |
|
OceansDeep
|
dbc5305ea7
|
!20 add elasticsearch progress
Merge pull request !20 from OceansDeep/feature/pg
|
2021-08-11 18:18:15 +00:00 |
|
paulGao
|
48146edee9
|
add elasticsearch progress
|
2021-08-12 02:16:20 +08:00 |
|
Chopper
|
4d83b63f82
|
增加订单管理端查看物流接口
|
2021-08-12 00:30:55 +08:00 |
|
lifenlong
|
64e45c10b1
|
增加店铺企业信息接口
增加删除商品
修复：修改订单金额售后金额不正确
|
2021-08-11 20:14:56 +08:00 |
|
Chopper
|
f9a18ffbe1
|
super权限无法获取问题处理，拼团表单校验问题，购物车渲染流程优化
|
2021-08-11 12:18:42 +08:00 |
|
Chopper
|
e01586b394
|
权限为空问题处理
|
2021-08-06 11:46:23 +08:00 |
|
lifenlong
|
77a30459cd
|
恢复代码
|
2021-08-04 09:27:23 +08:00 |
|
lifenlong
|
ce22c9b7ff
|
初始化索引，按照规格去生成索引
|
2021-08-03 23:28:16 +08:00 |
|
Chopper
|
26c67c72fa
|
文章分类默认值问题处理
|
2021-07-30 16:17:44 +08:00 |
|
Chopper
|
829472c6a3
|
Merge remote-tracking branch 'origin/qiuqiu'
合并砍价/积分相关
# Conflicts:
# consumer/src/main/java/cn/lili/event/impl/MemberPointExecute.java
# update-sql/version4.2to4.3.sql
|
2021-07-30 15:50:36 +08:00 |
|
Chopper
|
8deaef09d7
|
热词排序count下标从0开始，所以计算时候进行-1处理
|
2021-07-30 14:59:00 +08:00 |
|
Chopper
|
0760c72ef8
|
热词获取改为根据数量，传递count获取系统热搜词语
|
2021-07-30 14:27:41 +08:00 |
|
Chopper
|
f71facf72a
|
补充注释规范。补充异常消息打印
|
2021-07-29 18:06:54 +08:00 |
|
Chopper
|
b804fa68cf
|
鉴权写入前对权限的非空校验
|
2021-07-29 17:52:42 +08:00 |
|
Chopper
|
363e7f40bf
|
去除sout
|
2021-07-29 17:39:33 +08:00 |
|
Chopper
|
f00386c81d
|
继续优化代码，调整依赖关系，缩减无效代码
|
2021-07-28 11:19:33 +08:00 |
|
lifenlong
|
0cad52cfa6
|
同步master
|
2021-07-27 17:26:12 +08:00 |
|
Chopper
|
5999b5f217
|
权限改版完成
|
2021-07-27 17:03:31 +08:00 |
|
lifenlong
|
02f3bde2b4
|
积分订单、用户下单积分数值判断
|
2021-07-27 15:33:11 +08:00 |
|
lifenlong
|
5a7440c5bf
|
同步master，解决冲突
|
2021-07-27 10:00:34 +08:00 |
|
Chopper
|
8b861e8fe7
|
热词自定义分数线功能完善
|
2021-07-26 16:02:03 +08:00 |
|
Chopper
|
fe8523ca3f
|
Merge branch 'backup'
# Conflicts:
# manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java
# manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java
# manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
# manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java
# manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java
# manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java
|
2021-07-25 17:51:05 +08:00 |
|
Chopper
|
0514bec994
|
管理端权限模块校验完善
|
2021-07-25 17:46:24 +08:00 |
|
Chopper
|
e99aeeede5
|
热词功能处理，提供redis自定义增加权重值的方法
|
2021-07-25 17:45:46 +08:00 |
|
lifenlong
|
1ee60c02d3
|
添加引用
|
2021-07-23 19:58:32 +08:00 |
|
lifenlong
|
abdc74c773
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
|
2021-07-23 19:45:21 +08:00 |
|
lifenlong
|
2c8ac59628
|
优化商品显示逻辑
售后价格判断
|
2021-07-23 19:44:46 +08:00 |
|
Chopper
|
280c5dec39
|
注解包调整
|
2021-07-22 17:33:57 +08:00 |
|
Chopper
|
fdb55bc426
|
Merge branch 'backup'
# Conflicts:
# framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java
# framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
# framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java
# framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java
|
2021-07-22 12:07:22 +08:00 |
|
Chopper
|
0ccdc94644
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2021-07-21 17:46:58 +08:00 |
|
Chopper
|
bd3aceaeac
|
完善方法注释
|
2021-07-21 17:46:46 +08:00 |
|
Chopper
|
bc6abdbf1a
|
初步调整结构完成
|
2021-07-21 15:23:47 +08:00 |
|
lifenlong
|
dd491e38e5
|
进行中的满减活动可以关闭
|
2021-07-21 15:13:50 +08:00 |
|