chc
|
f0a80338da
|
Merge remote-tracking branch 'origin/master'
|
2024-01-25 14:02:24 +08:00 |
|
chc
|
6b5ca5b337
|
分类缓存获取
|
2024-01-25 14:02:18 +08:00 |
|
OceansDeep
|
61f9d7812d
|
!330 fix & improve
Merge pull request !330 from OceansDeep/pg
|
2024-01-24 10:54:33 +00:00 |
|
misworga831
|
d5eeafc554
|
fix: 优化虚拟商品不需要填写收货地址
|
2024-01-24 18:53:31 +08:00 |
|
misworga831
|
2175433444
|
fix: 优化取消订单返还促销商品库存
|
2024-01-24 18:52:43 +08:00 |
|
pikachu1995@126.com
|
cfbb1a1519
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
|
2024-01-24 14:54:29 +08:00 |
|
pikachu1995@126.com
|
1302ca6de4
|
优化结算单退款计算逻辑
|
2024-01-24 14:54:23 +08:00 |
|
chc
|
239b520939
|
Merge remote-tracking branch 'origin/master'
|
2024-01-24 11:32:43 +08:00 |
|
chc
|
56d9dbee5b
|
库存预警功能,预警为0不进行预警
|
2024-01-24 11:32:28 +08:00 |
|
OceansDeep
|
41decf1fa1
|
!329 fix & improve
Merge pull request !329 from OceansDeep/pg
|
2024-01-24 02:11:26 +00:00 |
|
misworga831
|
1d2cb5737d
|
fix: 修复促销商品库存扣减问题
|
2024-01-24 10:10:43 +08:00 |
|
misworga831
|
a2496b267a
|
fix: 优化商品图片获取
|
2024-01-24 10:10:11 +08:00 |
|
pikachu1995@126.com
|
178544fe2d
|
管理端支持下载结算单账单
|
2024-01-24 09:48:25 +08:00 |
|
pikachu1995@126.com
|
9e3b9c8f38
|
店铺结算单增加积分/砍价商品退款统计
|
2024-01-23 15:06:14 +08:00 |
|
OceansDeep
|
b439d8283f
|
!328 fix & improve
Merge pull request !328 from OceansDeep/pg
|
2024-01-22 10:57:02 +00:00 |
|
misworga831
|
fb48bce38d
|
fix: 优化商品图片地址存储结构，只保留图片地址，去除其他无效参数，优化商品图片规则，改为全部通用spu图片，可为第一个 规格项 单独设置一个图片。
|
2024-01-22 18:56:13 +08:00 |
|
pikachu1995@126.com
|
b189fbe238
|
腾讯COS图片路径缺少符号
|
2024-01-22 15:59:33 +08:00 |
|
OceansDeep
|
26c1c97442
|
!327 fix & improve
Merge pull request !327 from OceansDeep/pg
|
2024-01-22 02:55:04 +00:00 |
|
misworga831
|
ee8f5b6e1e
|
fix: 优化商品图片地址存储结构，只保留图片地址，去除其他无效参数，优化商品图片规则，改为全部通用spu图片，可为第一个 规格项 单独设置一个图片。
|
2024-01-22 10:44:24 +08:00 |
|
misworga831
|
6755515b1f
|
upgrade: 更新 hutool 和 mybatis plus 版本
|
2024-01-22 10:43:09 +08:00 |
|
Lele
|
074036c0b5
|
!326 退款状态功能增加字段
Merge pull request !326 from Lele/dev
|
2024-01-18 09:45:11 +00:00 |
|
lele0521
|
c7d0820eed
|
Merge branch 'master' into dev
# Conflicts:
# DB/version4.3toMASTER.sql
|
2024-01-18 17:42:37 +08:00 |
|
lele0521
|
97c0fdbf1d
|
feat: 退款状态功能增加字段
|
2024-01-18 17:40:05 +08:00 |
|
chc
|
a962939db8
|
库存预警功能
|
2024-01-18 11:44:08 +08:00 |
|
Lele
|
a9802710ef
|
!325 修复日志格式异常
Merge pull request !325 from Lele/dev
|
2024-01-17 10:30:54 +00:00 |
|
lele0521
|
aaaa0b1ebf
|
Merge branch 'master' into dev
|
2024-01-17 18:06:13 +08:00 |
|
lele0521
|
f34d10146a
|
fix: 修复日志异常
|
2024-01-17 17:07:20 +08:00 |
|
Lele
|
b875cbdda4
|
!324 补充提交部分退款售后逻辑
Merge pull request !324 from Lele/dev
|
2024-01-16 09:24:05 +00:00 |
|
lele0521
|
d80a3f7f48
|
fix: 补充提交部分退款售后逻辑
|
2024-01-16 17:18:28 +08:00 |
|
Lele
|
259946e78f
|
!323 增加操作日志、新增会员昵称默认规则、增加退款状态
Merge pull request !323 from Lele/dev
|
2024-01-16 08:49:35 +00:00 |
|
lele0521
|
9c24adf77d
|
fix: 补充提交部分退款售后逻辑
|
2024-01-16 16:45:27 +08:00 |
|
lele0521
|
4c47d4aba2
|
fix: 区分商家、管理端OSS资源文件夹的创建
|
2024-01-16 15:53:37 +08:00 |
|
lele0521
|
7f9061cfc5
|
fix: Merging dev
|
2024-01-16 11:29:03 +08:00 |
|
chc
|
085dad2107
|
库存预警功能回退
|
2024-01-16 10:10:07 +08:00 |
|
chc
|
055a7fffdb
|
首页暂不显示预警
|
2024-01-11 13:33:46 +08:00 |
|
chc
|
6cea6af59b
|
分包裹发货，库存预警
|
2024-01-11 13:33:13 +08:00 |
|
chc
|
6f0f8106e0
|
分包裹SQL
|
2024-01-08 19:15:07 +08:00 |
|
lele0521
|
c9a0ce7985
|
feat: 增加退款状态（部分退款、全部退款）
|
2024-01-05 17:29:34 +08:00 |
|
lele0521
|
b40533c553
|
feat: 增加操作日志（商品、用户、促销相关修改操作）
|
2024-01-04 18:10:57 +08:00 |
|
lele0521
|
e2fff23080
|
feat: 新增会员昵称默认规则
|
2024-01-04 17:36:39 +08:00 |
|
Chopper711
|
72482ee395
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2023-12-18 08:40:31 +08:00 |
|
Chopper711
|
5366034556
|
fix: 禁用演示站点地区维护功能费
|
2023-12-18 08:40:24 +08:00 |
|
OceansDeep
|
484e2a2318
|
!320 fix & improve
Merge pull request !320 from OceansDeep/pg
|
2023-12-05 06:23:34 +00:00 |
|
misworga831
|
0873fba7df
|
fix: 优化商品参数聚合搜索
|
2023-12-05 14:21:55 +08:00 |
|
OceansDeep
|
4aa6f864f0
|
!319 fix & improve
Merge pull request !319 from OceansDeep/pg
|
2023-12-05 06:07:08 +00:00 |
|
misworga831
|
183b2ba30c
|
fix: 优化商品参数聚合搜索
|
2023-12-05 11:48:56 +08:00 |
|
lele0521
|
071f15347e
|
feat: 新增会员绑定手机号功能
|
2023-12-04 16:05:17 +08:00 |
|
OceansDeep
|
71ed58e665
|
!318 fix & improve
Merge pull request !318 from OceansDeep/pg
|
2023-11-23 03:17:21 +00:00 |
|
misworga831
|
50c7e20ba6
|
fix: 修复活动优惠券，没有生成商品促销信息问题
|
2023-11-23 11:16:08 +08:00 |
|
misworga831
|
876b801fa1
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into pg
|
2023-11-21 10:15:06 +08:00 |
|