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 |
|
paulGao
|
3ba4d24041
|
优化促销。移除结算时促销的依赖。规范部分isxxx字段命名
|
2021-12-21 18:54:11 +08:00 |
|
Chopper
|
e99d0f45fd
|
修改一个错误的非空判断
|
2021-12-21 16:59:57 +08:00 |
|
Chopper
|
351745d31f
|
促销类型错误的写入一个促销状态字段问题处理
|
2021-12-21 16:08:24 +08:00 |
|
Chopper
|
bfa960d803
|
管理端商品上下架问题处理
|
2021-12-21 14:47:39 +08:00 |
|
Chopper
|
7572e8d56f
|
解决如果商品sku参数为空等异常情况导致无法发布的问题
|
2021-12-21 11:33:55 +08:00 |
|
Chopper
|
82e773243f
|
增加readme描述
|
2021-12-21 10:38:02 +08:00 |
|
Chopper
|
795440850b
|
更名
|
2021-12-21 10:27:22 +08:00 |
|
Chopper
|
6adcb46f29
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2021-12-21 10:25:45 +08:00 |
|
Chopper
|
6cd31e630c
|
更新升级sql
|
2021-12-21 10:25:38 +08:00 |
|
fengtianyangyang
|
23b3e72579
|
'商品es初始化索引问题'
|
2021-12-20 14:56:17 +08:00 |
|
Chopper
|
e8f44ef6f2
|
短信验证码缓存key未包含uuid问题处理
|
2021-12-20 09:37:34 +08:00 |
|
paulGao
|
e4047fbd30
|
merge branch "master"
|
2021-12-16 15:02:54 +08:00 |
|
paulGao
|
7dcdb43acf
|
优化促销相关代码，修复bug
|
2021-12-16 15:02:06 +08:00 |
|
Chopper
|
9f75e1fae8
|
sql描述文字优化
|
2021-12-16 09:33:37 +08:00 |
|
Chopper
|
78c0de664c
|
优化数据库提示语
|
2021-12-16 09:30:26 +08:00 |
|
OceansDeep
|
6253590326
|
!82 修复查询积分商品参数问题
Merge pull request !82 from OceansDeep/feature/pg
|
2021-12-15 09:59:54 +00:00 |
|
paulGao
|
f0b43ddd32
|
修复查询积分商品参数问题
|
2021-12-15 17:58:55 +08:00 |
|
OceansDeep
|
51e7b4f15d
|
!81 修复查询积分商品sql语句错误问题
Merge pull request !81 from OceansDeep/feature/pg
|
2021-12-15 09:43:22 +00:00 |
|
paulGao
|
0ef244b373
|
移除mongo,将系统日志存储在es。修复拼团商品的正常购买价格为拼团价格问题
|
2021-12-15 17:42:03 +08:00 |
|
OceansDeep
|
97a1502eb2
|
!80 修复查询积分商品参数问题
Merge pull request !80 from OceansDeep/feature/pg
|
2021-12-15 09:32:39 +00:00 |
|
paulGao
|
2536e3b9f6
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
|
2021-12-15 17:32:02 +08:00 |
|
paulGao
|
7aed7254a0
|
修复查询积分商品参数问题
|
2021-12-15 17:31:39 +08:00 |
|
OceansDeep
|
44e061f321
|
!79 修复商品审核关闭后，修改商品不生成索引问题。升级mybatis-plus和hutool版本
Merge pull request !79 from OceansDeep/feature/pg
|
2021-12-15 03:37:52 +00:00 |
|
paulGao
|
a9ddcfeb95
|
修复商品审核关闭后，修改商品不生成索引问题。升级mybatis-plus版本至 3.4.3.4 和hutool版本至 5.7.16。适配新版本mybatis-plus
|
2021-12-15 11:35:41 +08:00 |
|
OceansDeep
|
822e332aaa
|
!78 移除mongo,将系统日志存储在es。修复拼团商品的正常购买价格为拼团价格问题
Merge pull request !78 from OceansDeep/feature/pg
|
2021-12-13 10:18:58 +00:00 |
|
paulGao
|
c3fbad7dbf
|
移除mongo,将系统日志存储在es。修复拼团商品的正常购买价格为拼团价格问题
|
2021-12-13 18:15:37 +08:00 |
|