1452 Commits

Author SHA1 Message Date
paulGao
6ce2b65d89 适配优化的sql,将平台id改为0 2022-06-08 16:15:14 +08:00
fengtianyangyang
fb45fee426 提现申请时,预存款金额为0无法审核通过错误 2022-06-07 18:41:31 +08:00
Chopper
ffca49f469 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2022-06-07 18:30:24 +08:00
Chopper
f32c7a7253 运费计算模式调整 同一运费模版的商品,采用累加计算,起送费/虚件(重)费用。 2022-06-07 18:30:21 +08:00
OceansDeep
a64ccdba78
!185 修复一个可能出现的获取促销信息的bug
Merge pull request !185 from OceansDeep/feature/pg
2022-06-07 07:24:58 +00:00
paulGao
5f6bae6fa9 修复一个可能出现的获取促销信息的bug 2022-06-07 15:18:07 +08:00
OceansDeep
fd503b4071
!184 过滤无效促销信息异常增加日志
Merge pull request !184 from OceansDeep/feature/pg
2022-06-07 07:07:54 +00:00
paulGao
9ece357e39 过滤无效促销信息异常增加日志 2022-06-07 15:07:14 +08:00
OceansDeep
d53c8362a2
!183 修复一个可能出现的获取促销信息的bug
Merge pull request !183 from OceansDeep/feature/pg
2022-06-07 04:31:08 +00:00
paulGao
8f3ca8c28d 修复一个可能出现的获取促销信息的bug 2022-06-07 12:30:29 +08:00
OceansDeep
7f5675ae3c
!182 修复一个可能出现的获取促销信息的bug
Merge pull request !182 from OceansDeep/feature/pg
2022-06-07 04:16:37 +00:00
paulGao
7b9f4be98c 修复一个可能出现的获取促销信息的bug 2022-06-07 12:16:08 +08:00
Chopper
ca352ca341 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2022-06-07 09:37:25 +08:00
Chopper
a22ccbdda5 兼容MINIO 2022-06-07 09:35:58 +08:00
OceansDeep
e6b50248de
!181 修复券活动获取的优惠券某些情况不能使用问题
Merge pull request !181 from OceansDeep/feature/pg
2022-06-06 07:26:12 +00:00
paulGao
ee3f8a9261 修复券活动获取的优惠券某些情况不能使用问题 2022-06-06 15:24:52 +08:00
OceansDeep
922d7222cd
!180 修复一个可能发生的获取订单信息时发生的错误
Merge pull request !180 from OceansDeep/feature/pg
2022-06-06 02:13:39 +00:00
paulGao
4a8900105b Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2022-06-06 10:12:17 +08:00
paulGao
65a4bb7778 修复一个可能发生的获取订单信息时发生的错误 2022-06-06 10:12:09 +08:00
OceansDeep
3944551c06
!179 修复取消订单商品时库存更新问题
Merge pull request !179 from OceansDeep/feature/pg
2022-06-02 09:13:07 +00:00
paulGao
66d7ffbb17 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2022-06-02 16:58:42 +08:00
paulGao
c4d879a0ad 修复取消订单商品时库存更新问题 2022-06-02 16:50:26 +08:00
OceansDeep
b97f77c740
!176 智能商品推荐
Merge pull request !176 from viper/Intelligent_recommendation
2022-06-02 07:17:40 +00:00
OceansDeep
27ad9b0599
!177 增加结算时当前商品促销最新状态的查询
Merge pull request !177 from OceansDeep/feature/pg
2022-06-02 02:32:37 +00:00
paulGao
234b8ab31c 增加结算时当前商品促销最新状态的查询(修复手动删除或下架促销活动时,购物车商品还是促销价格问题) 2022-06-02 10:31:24 +08:00
Chopper
519a608316 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2022-06-02 09:16:46 +08:00
Chopper
d4a13c8a82 店铺商品数量,店铺缓存数据2小时。优化 2022-06-02 09:16:30 +08:00
xiaochangbai
ccb57411a2 refactor:优化代码 2022-06-01 21:27:51 +08:00
xiaochangbai
486bebe6d2 feat:智能商品推荐 2022-06-01 18:03:30 +08:00
OceansDeep
5b3129bf01
!174 优化商品信息变更时,删除商品缓存流程
Merge pull request !174 from OceansDeep/feature/pg
2022-06-01 07:24:22 +00:00
paulGao
23c742c4c6 优化商品信息变更时,删除商品缓存流程 2022-06-01 15:23:21 +08:00
OceansDeep
90d3bbd79e
!173 修复新增商品时,批发商品规则没有保存问题
Merge pull request !173 from OceansDeep/feature/pg
2022-05-31 09:27:36 +00:00
paulGao
400a06d2ac 修复新增商品时,批发商品规则没有保存问题 2022-05-31 17:23:21 +08:00
OceansDeep
594d2f620c
!172 修复编辑商品时默认读取缓存中的数据
Merge pull request !172 from OceansDeep/feature/pg
2022-05-31 09:01:34 +00:00
paulGao
1a6ec578de 修复编辑商品时默认读取缓存中的数据 2022-05-31 17:01:01 +08:00
OceansDeep
e009604595
!171 修复无法新建批发商品
Merge pull request !171 from OceansDeep/feature/pg
2022-05-31 08:34:24 +00:00
paulGao
8b23c623d1 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2022-05-31 16:34:01 +08:00
paulGao
a3c4e72902 修复无法新建批发商品 2022-05-31 16:33:10 +08:00
chopper711
7e54412fc3
!167 修复直播延迟消息状态错误
Merge pull request !167 from viper/fix_broadcast-status-msg
2022-05-31 08:09:02 +00:00
OceansDeep
564970a324
!170 分类编辑时,清除缓存;优化代码
Merge pull request !170 from OceansDeep/feature/pg
2022-05-31 06:38:52 +00:00
paulGao
1ecd32027e 分类编辑时,清除缓存;优化代码 2022-05-31 14:37:18 +08:00
OceansDeep
ceb5727337
!169 修复新增编辑商品无商品图片问题
Merge pull request !169 from OceansDeep/feature/pg
2022-05-30 02:42:56 +00:00
paulGao
17c7552f7f 增加商品批发销售模式的处理。优化生成商品sku的结构。 2022-05-30 10:39:12 +08:00
OceansDeep
8fbcad8856
!168 增加商品批发销售模式的处理。优化生成商品sku的结构。
Merge pull request !168 from OceansDeep/feature/pg
2022-05-27 10:28:46 +00:00
paulGao
a61fd454b4 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2022-05-27 16:32:56 +08:00
paulGao
c0337afbaa 优化代码。升级hutool和lombok依赖 2022-05-27 16:32:39 +08:00
paulGao
acb9e78a36 增加商品批发销售模式的处理。优化生成商品sku的结构。 2022-05-27 16:32:00 +08:00
xiaochangbai
431ff04644 fix: 修复直播延迟消息状态错误 2022-05-26 16:24:39 +08:00
Chopper
201fb0a136 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2022-05-25 17:41:36 +08:00
Chopper
90671729ea 上一周期数据问题处理 2022-05-25 17:41:31 +08:00