Chopper
|
6331b0d587
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2022-05-13 11:19:11 +08:00 |
|
Chopper
|
57cf3b94e0
|
足迹分页相关问题处理
|
2022-05-13 11:19:02 +08:00 |
|
OceansDeep
|
b683eac996
|
!157 优化修改sku时，如存在sku则不新增
Merge pull request !157 from OceansDeep/feature/pg
|
2022-05-13 03:09:18 +00:00 |
|
paulGao
|
ccdcb1d0f6
|
优化修改sku时，如存在sku则不新增
|
2022-05-13 11:03:26 +08:00 |
|
Chopper
|
4f5f02f030
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2022-05-13 09:19:24 +08:00 |
|
Chopper
|
0629ce51af
|
默认值给予0
|
2022-05-13 09:19:21 +08:00 |
|
paulGao
|
46f1fcc269
|
优化修改sku时，如存在sku则不新增
|
2022-05-13 09:01:06 +08:00 |
|
fengtianyangyang
|
b49b0290f8
|
还原多合并代码
|
2022-05-12 15:30:53 +08:00 |
|
fengtianyangyang
|
7ca351f7cd
|
结算单-平台优惠券补贴金额错误修改
|
2022-05-11 19:20:35 +08:00 |
|
Chopper
|
850b124da3
|
流量统计增加对上一周期的数据填充
|
2022-05-11 17:49:44 +08:00 |
|
OceansDeep
|
49a2d3cab3
|
!156 更新阿里云maven地址。更新部分依赖到最新
Merge pull request !156 from OceansDeep/feature/pg
|
2022-05-10 06:47:19 +00:00 |
|
paulGao
|
038eda1562
|
更新阿里云maven地址。更新部分依赖到最新
|
2022-05-10 14:38:57 +08:00 |
|
caihongcheng
|
0a631a7c93
|
requestData多了个引号
|
2022-05-07 21:24:51 +08:00 |
|
caihongcheng
|
4705c2595a
|
追踪物流信息增加手机号后四位参数
|
2022-05-06 16:16:34 +08:00 |
|
Chopper
|
0ff6809d63
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2022-05-06 15:51:19 +08:00 |
|
Chopper
|
a375feabfc
|
售后流水问题，售后代码被多个地方调用的方式优化，以后只有一个入口
|
2022-05-06 15:51:13 +08:00 |
|
OceansDeep
|
5b9fd139a3
|
!155 修复结算时，清空购物车问题
Merge pull request !155 from OceansDeep/feature/pg
|
2022-05-06 07:51:04 +00:00 |
|
paulGao
|
fd92d93289
|
修复结算时，清空购物车问题
|
2022-05-06 15:50:20 +08:00 |
|
paulGao
|
840637c0d0
|
优化编辑商品状态时，商品缓存的删除
|
2022-05-05 17:58:13 +08:00 |
|
OceansDeep
|
f41f5386cc
|
!154 修复防重复提交bug
Merge pull request !154 from OceansDeep/feature/pg
|
2022-05-05 04:01:58 +00:00 |
|
paulGao
|
f4a7d8ea92
|
修复防重复提交bug
|
2022-05-05 11:57:05 +08:00 |
|
OceansDeep
|
26c9160c75
|
!152 优化默认生成的es商品索引结构。解决初次启动时，搜索商品报错
Merge pull request !152 from OceansDeep/feature/pg
|
2022-04-27 10:17:58 +00:00 |
|
paulGao
|
4c1955da75
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
|
2022-04-27 18:15:30 +08:00 |
|
paulGao
|
66e6272571
|
优化默认生成的es商品索引结构。解决初次启动时，搜索商品报错
|
2022-04-27 18:15:11 +08:00 |
|
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 |
|
OceansDeep
|
e289cf29fe
|
!151 优化合并
Merge pull request !151 from OceansDeep/feature/pg
|
2022-04-26 03:40:22 +00: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
|
5168d8d08d
|
配置文件还原
|
2022-04-22 18:45:43 +08:00 |
|
fengtianyangyang
|
230a8810ef
|
积分商品,砍价商品结算单错误问题
|
2022-04-22 18:44:32 +08:00 |
|
OceansDeep
|
e8e8c1abcc
|
!149 修复结算时，无有效商品，造成空订单问题
Merge pull request !149 from OceansDeep/feature/pg
|
2022-04-22 08:50:52 +00: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 |
|
OceansDeep
|
363dbd3a7f
|
!148 修复项目启动时可能会造成es client must not be null的问题
Merge pull request !148 from OceansDeep/feature/pg
|
2022-04-22 01:13:07 +00: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 |
|