Chopper
|
e9d5e705ed
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2022-04-26 14:16:44 +08:00 |
|
Chopper
|
16fdb28141
|
多修改的代码还原
|
2022-04-26 14:16:39 +08:00 |
|
paulGao
|
1cd74cc26a
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
|
2022-04-26 11:37:53 +08:00 |
|
paulGao
|
27112e35b3
|
优化搜索关键字不能为空格。优化管理端商品上下架时没有清空goods缓存问题
|
2022-04-26 11:37:48 +08:00 |
|
paulGao
|
b2a8578f43
|
增加异常重试机制。（目前作用于es批量更新删除时，有时会出现的内容版本冲突问题）
|
2022-04-26 11:36:28 +08:00 |
|
Chopper
|
0e0a8b039d
|
管理员用户权限不再放在永久缓存，而是放在临时缓存（5分钟），由于访问频率较低，在加上涉及的业务太复杂，所以去除了之前对权限的永久缓存以及模糊删除用户权限缓存相关代码
|
2022-04-26 09:33:54 +08:00 |
|
Chopper
|
cbd201c43b
|
还原配置
|
2022-04-25 18:58:01 +08:00 |
|
Chopper
|
a6d734bacf
|
Merge branch 'hotwords'
热词功能，管理端权限存在的问题处理
# Conflicts:
# framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java
# framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java
# manager-api/src/main/java/cn/lili/controller/hotwords/HotWordsManagerController.java
|
2022-04-25 18:32:46 +08:00 |
|
Chopper
|
8dc86e0482
|
热词功能完善
|
2022-04-25 18:08:06 +08:00 |
|
paulGao
|
d0226611d7
|
增加初始化生成索引日志
|
2022-04-25 17:34:24 +08:00 |
|
OceansDeep
|
2b21c3cd09
|
!150 优化生成索引mapping日志
Merge pull request !150 from OceansDeep/feature/pg
|
2022-04-25 09:23:34 +00:00 |
|
paulGao
|
b1bdd9b8a5
|
优化生成索引mapping日志
|
2022-04-25 17:22:52 +08:00 |
|
Chopper
|
bb50510ecb
|
解决管理员权限相关问题
|
2022-04-25 10:31:39 +08:00 |
|
paulGao
|
aa185c8bd2
|
优化consumer生成商品索引。改为批量生成
|
2022-04-25 10:26:51 +08:00 |
|
fengtianyangyang
|
99e3b234c9
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
|
2022-04-22 18:47:10 +08:00 |
|
fengtianyangyang
|
230a8810ef
|
积分商品,砍价商品结算单错误问题
|
2022-04-22 18:44:32 +08:00 |
|
paulGao
|
0354d6dc3e
|
修复结算时，无有效商品，造成空订单问题
|
2022-04-22 16:27:13 +08:00 |
|
fengtianyangyang
|
47ad388f7d
|
售后申请数量错误
|
2022-04-22 11:10:42 +08:00 |
|
fengtianyangyang
|
2d57483805
|
结算单优惠券退款异常
|
2022-04-22 11:02:23 +08:00 |
|
paulGao
|
5b5863c899
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
|
2022-04-22 09:12:11 +08:00 |
|
paulGao
|
4c1ae8c3cc
|
修复一个项目启动时可能会造成es client must not be null的问题
|
2022-04-22 09:11:51 +08:00 |
|
OceansDeep
|
29ed211519
|
!147 优化
Merge pull request !147 from OceansDeep/feature/pg
|
2022-04-21 08:28:26 +00:00 |
|
paulGao
|
9f965c4e56
|
修复主订单取消后赠品订单不会取消问题。优化热词
|
2022-04-21 16:25:43 +08:00 |
|
Chopper
|
0148868129
|
分类递归错误的参数传递问题解决
|
2022-04-21 15:49:53 +08:00 |
|
paulGao
|
d46863b5b5
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
|
2022-04-21 15:12:27 +08:00 |
|
fengtianyangyang
|
1917aa13d5
|
店铺结算空指针问题
|
2022-04-21 10:51:12 +08:00 |
|
Chopper
|
2994131048
|
当结算周期只有一天时，无法结算问题处理
|
2022-04-21 10:11:21 +08:00 |
|
paulGao
|
f0d6938127
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
|
2022-04-20 17:54:21 +08:00 |
|
paulGao
|
0203630d6a
|
增加店铺商品索引操作
|
2022-04-20 09:39:03 +08:00 |
|
Chopper
|
89c5c2dd83
|
评价数量展示异常问题处理
|
2022-04-19 10:18:25 +08:00 |
|
Chopper
|
947a82eac5
|
热词统计，热词功能改版
|
2022-04-19 09:28:26 +08:00 |
|
fengtianyangyang
|
9dc01f6057
|
店铺结算单结算问题
|
2022-04-18 19:09:05 +08:00 |
|
paulGao
|
37c5ce541b
|
优化楼层装修
|
2022-04-17 21:46:34 +08:00 |
|
paulGao
|
726eb06714
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
|
2022-04-17 21:45:49 +08:00 |
|
fengtianyangyang
|
df505e0e17
|
店铺结算单金额问题
|
2022-04-15 19:05:27 +08:00 |
|
paulGao
|
06fffac835
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
|
2022-04-14 09:09:25 +08:00 |
|
Chopper
|
6ae9692358
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2022-04-13 16:58:23 +08:00 |
|
Chopper
|
7270564b10
|
由于代码调用顺序错误，导致总是输出一段错误的日志内容。
|
2022-04-13 16:58:19 +08:00 |
|
paulGao
|
a485a29868
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
|
2022-04-13 14:30:40 +08:00 |
|
fengtianyangyang
|
ec04c3221f
|
移除文章类型删除
|
2022-04-13 12:00:40 +08:00 |
|
Chopper
|
761982474c
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2022-04-13 11:49:32 +08:00 |
|
Chopper
|
d13b0404fb
|
增加一下短信验证码在info级别的日志打印
|
2022-04-13 11:49:23 +08:00 |
|
fengtianyangyang
|
6966376f91
|
文章增加文章类型修改及文章类型删除
|
2022-04-13 11:06:51 +08:00 |
|
Chopper
|
2720f5c0bb
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2022-04-11 14:18:42 +08:00 |
|
paulGao
|
881f039e44
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
|
2022-04-11 14:18:39 +08:00 |
|
Chopper
|
81c7a72b9c
|
解决优惠券在购物车中缓存会出现的一些极端bug
|
2022-04-11 14:18:37 +08:00 |
|
fengtianyangyang
|
c0391e3fc1
|
微信同步消息时删除模板问题
|
2022-04-11 11:23:02 +08:00 |
|
paulGao
|
7e542750f6
|
增加每次获取优惠券信息时，检查优惠券是否过期
|
2022-04-08 16:59:12 +08:00 |
|
paulGao
|
63b23fbe76
|
修复秒杀活动相同商品参与时，删除其他活动商品信息问题
|
2022-04-07 16:06:23 +08:00 |
|
paulGao
|
63fff2398e
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
|
2022-04-07 14:32:12 +08:00 |
|