paulGao
|
c3221a6fff
|
优化代码结构。优化促销更新。
|
2021-12-29 11:53:46 +08:00 |
|
OceansDeep
|
cbbfbae772
|
!93 fix bugs
Merge pull request !93 from OceansDeep/feature/pg
|
2021-12-28 12:02:05 +00:00 |
|
paulGao
|
c65fd99b15
|
优化更新商品索引促销信息时为异步执行。
|
2021-12-28 19:59:52 +08:00 |
|
paulGao
|
4d49d3c77a
|
修复订单收货时，更新订单完成时间。
|
2021-12-28 19:59:00 +08:00 |
|
paulGao
|
aad32a4a1f
|
修复满额活动赠品订单错误问题
|
2021-12-28 19:58:20 +08:00 |
|
zhanglei829
|
ec912efa01
|
fix bug
|
2021-12-28 15:18:13 +08:00 |
|
OceansDeep
|
bf2fdc2761
|
!91 修复下架商品没有删除商品索引问题。修复下单使用优惠券使金额变为0元时消费服务获取数据不正确。
Merge pull request !91 from OceansDeep/feature/pg
|
2021-12-27 10:03:12 +00:00 |
|
paulGao
|
168c630a13
|
修复下架商品没有删除商品索引问题。修复下单使用优惠券使金额变为0元时消费服务获取数据不正确导致没有及时更新订单状态问题。
|
2021-12-27 18:01:58 +08:00 |
|
paulGao
|
e7563203fe
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
|
2021-12-27 14:39:19 +08:00 |
|
paulGao
|
9bf1dbe030
|
修复清除无效索引时的异常。某些情况下新建用户会创建两条member_wallet数据。优化代码。
|
2021-12-27 14:38:45 +08:00 |
|
OceansDeep
|
dbcee40b93
|
!90 修复优化促销
Merge pull request !90 from OceansDeep/feature/pg
|
2021-12-25 11:08:54 +00:00 |
|
paulGao
|
2af334d793
|
merge branch "master"
|
2021-12-25 19:08:18 +08:00 |
|
paulGao
|
f9a8675942
|
修复优化促销
|
2021-12-25 18:35:44 +08:00 |
|
fengtianyangyang
|
521a6174fe
|
'修改路径'
|
2021-12-25 15:38:02 +08:00 |
|
Chopper
|
c85bc7b8ea
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2021-12-25 09:32:00 +08:00 |
|
OceansDeep
|
825e44b353
|
!89 修复首次发布商品不会生成商品索引问题
Merge pull request !89 from OceansDeep/feature/pg
|
2021-12-24 08:21:02 +00:00 |
|
paulGao
|
ed840a95a1
|
优化搜索热词管理，增加搜索热词删除
|
2021-12-24 16:11:53 +08:00 |
|
Chopper
|
ef31d6af83
|
砍价商品获取错误问题处理
|
2021-12-24 15:56:41 +08:00 |
|
Chopper
|
b1e70ebf12
|
促销金额大于商品金额的极端情况显示问题处理
|
2021-12-24 15:46:25 +08:00 |
|
Chopper
|
3af0031214
|
注册赠券功能bug修复
|
2021-12-24 15:45:48 +08:00 |
|
paulGao
|
b648aa94b3
|
修复首次发布商品不会生成商品索引问题；代码优化；修复bug；
|
2021-12-24 14:59:38 +08:00 |
|
Chopper
|
0e864043a6
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2021-12-24 11:13:42 +08:00 |
|
OceansDeep
|
eb25827937
|
!88 修复文章内容编辑无格式问题
Merge pull request !88 from OceansDeep/feature/pg
|
2021-12-23 11:23:18 +00:00 |
|
paulGao
|
f4a07b2911
|
修复文章内容编辑无格式问题
|
2021-12-23 19:22:00 +08:00 |
|
paulGao
|
cdfeb5dbdc
|
修复更新订单的售后商品数量时，传递goodsId改成goodsSkuId
|
2021-12-23 17:17:31 +08:00 |
|
Chopper
|
40bc890870
|
空品牌问题处理
|
2021-12-23 15:27:06 +08:00 |
|
paulGao
|
18874e3755
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
|
2021-12-23 13:59:56 +08:00 |
|
Chopper
|
a3d2b84ecb
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2021-12-23 11:58:53 +08:00 |
|
Chopper
|
5f16a5c791
|
各个应用微信支付配置分开
|
2021-12-23 11:58:47 +08:00 |
|
paulGao
|
f086a58096
|
添加xss过滤sell关键字
|
2021-12-23 10:58:19 +08:00 |
|
paulGao
|
dfcf71aec7
|
移除mongo,将系统日志存储在es。修复拼团商品的正常购买价格为拼团价格问题
|
2021-12-23 10:55:43 +08:00 |
|
OceansDeep
|
f2e8d03f80
|
!87 修复管理员上下架商品报错问题
Merge pull request !87 from OceansDeep/feature/pg
|
2021-12-23 00:37:38 +00:00 |
|
paulGao
|
0736f1c550
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
|
2021-12-23 08:17:50 +08:00 |
|
paulGao
|
bdd1195d20
|
修复管理员上下架商品报错问题
|
2021-12-23 08:17:45 +08:00 |
|
Chopper
|
e5511d5c09
|
订单联合查询将innerjoin 修改为 left join
|
2021-12-22 17:57:49 +08:00 |
|
Chopper
|
7634801f7c
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
# Conflicts:
# framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java
|
2021-12-22 17:04:12 +08:00 |
|
Chopper
|
1db86f2865
|
es中商品索引信息，以及虚拟商品会携带大量优惠券信息下单问题处理
|
2021-12-22 17:00:30 +08:00 |
|
OceansDeep
|
626e58b515
|
!86 修复结算时促销为空的问题
Merge pull request !86 from OceansDeep/feature/pg
|
2021-12-22 08:51:27 +00:00 |
|
paulGao
|
787617f504
|
修复结算时促销为空的问题
|
2021-12-22 16:50:50 +08:00 |
|
OceansDeep
|
3fb4e488bb
|
!85 修复结算时无促销报错问题
Merge pull request !85 from OceansDeep/feature/pg
|
2021-12-22 07:40:24 +00:00 |
|
paulGao
|
c5187a63b9
|
修复结算时无促销报错问题
|
2021-12-22 15:34:20 +08:00 |
|
Chopper
|
e5f725cf16
|
索引初始化对商品删除与否增加判定
|
2021-12-22 12:51:33 +08:00 |
|
Chopper
|
3d56c9cc81
|
商品非空判定处理
|
2021-12-22 12:42:04 +08:00 |
|
Chopper
|
0ae1ae5df4
|
如果无法获取到消息，则不记录足迹，不再抛出异常
|
2021-12-22 12:27:46 +08:00 |
|
Chopper
|
c0c530adad
|
增加对商品为空的判定
|
2021-12-22 12:22:52 +08:00 |
|
Chopper
|
e962a594ba
|
商品信息获取逻辑调整
|
2021-12-22 12:13:43 +08:00 |
|
Chopper
|
0ac7900948
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2021-12-21 19:29:59 +08:00 |
|
Chopper
|
6748b2911a
|
去除一个无效的类
|
2021-12-21 19:29:54 +08:00 |
|
OceansDeep
|
3e4152fd9b
|
!84 优化促销。移除结算时促销的依赖。规范部分isxxx字段命名
Merge pull request !84 from OceansDeep/feature/pg
|
2021-12-21 10:58:54 +00:00 |
|
paulGao
|
7dfffd60b8
|
merge master
|
2021-12-21 18:56:39 +08:00 |
|