2289 Commits

Author SHA1 Message Date
chc
2be8bf27bf 虚拟订单无法售后问题 2024-05-07 10:51:01 +08:00
铉清
2d052ffb1a
多了一个结束符号进行移除
Signed-off-by: 铉清 <13698617+xuanqings@user.noreply.gitee.com>
2024-04-19 05:17:44 +00:00
Chopper711
88ab071ac7 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2024-04-01 19:14:34 +08:00
Chopper711
bda72da679 fix: 足迹为空展示空信息问题,商品库存回滚数量错误问题 2024-04-01 19:14:28 +08:00
Lele
95e5ef2d33
!341 统计数据转换异常
Merge pull request !341 from Lele/dev
2024-03-29 03:29:19 +00:00
lele0521
48a294e7c6 fix: 统计数据转换异常 2024-03-29 11:28:24 +08:00
Chopper711
794fa63302 fix: 核销订单如果订单不存在则抛出异常 2024-03-28 15:36:56 +08:00
lele0521
cdb8e851a8 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop 2024-03-27 15:16:39 +08:00
lele0521
f8ee3a8d15 fix: 统计数据转换异常 2024-03-27 15:16:26 +08:00
Lele
76ab997922
!340 修复会员基本信息显示null异常
Merge pull request !340 from Lele/dev
2024-03-27 01:03:02 +00:00
lele0521
97e7a130f1 fix: 修复会员基本信息显示null异常 2024-03-26 18:50:24 +08:00
Lele
2a96ad4af7
!339 修复商城问题文档中的bug
Merge pull request !339 from Lele/dev
2024-03-25 08:32:24 +00:00
lele0521
e1aee4a744 fix: 修复商城问题文档中的bug 2024-03-25 16:29:24 +08:00
lele0521
ecfe1524d4 fix: 修复商城问题文档中的bug 2024-03-25 16:26:21 +08:00
chc
42ea2dc986 订单后台收款后返回状态不对 2024-03-22 19:07:02 +08:00
Lele
230e2e7407
!336 【交易投诉】交由商家处理报错。
Merge pull request !336 from Lele/dev
2024-03-21 08:22:49 +00:00
lele0521
92639ba309 fix: 【交易投诉】交由商家处理报错。bug修复 2024-03-21 16:21:29 +08:00
Lele
19b3225312
!335 修复添加APP版本控制异常
Merge pull request !335 from Lele/dev
2024-03-21 05:54:53 +00:00
lele0521
e56c20469d fix: APP版本控制区分APP类型 2024-03-21 13:42:58 +08:00
Lele
a28eceaf61
!334 OSS资源管理中增加店铺名称搜索条件
Merge pull request !334 from Lele/dev
2024-03-19 10:03:16 +00:00
lele0521
1925c6d33c fix: OSS资源增加按店铺筛选 2024-03-19 17:55:11 +08:00
lele0521
fcac4002b1 fix: OSS资源增加按店铺筛选 2024-03-19 17:03:55 +08:00
lele0521
ed3a2ae9fc Merge branch 'master' into dev 2024-03-19 16:39:47 +08:00
lele0521
4955d2135b fix: OSS资源增加按店铺筛选 2024-03-19 16:39:36 +08:00
chc
9f1dacc1d4 方法名修改 2024-03-11 15:35:14 +08:00
lele0521
f0765a6627 fix: 修复分销申请逻辑 2024-03-07 11:23:50 +08:00
lele0521
a31a9fdfbd fix: 修复字段错误 2024-03-07 09:22:54 +08:00
Chopper711
fd2d0724a7 fix: token 过期后图片访问抛出一个未被捕获的异常问题处理,优化一个店铺审核的提示语 2024-02-01 15:37:59 +08:00
chc
82d7389092 Merge remote-tracking branch 'origin/master' 2024-01-29 18:33:53 +08:00
chc
a53eb3cfde 售后关闭功能同步 2024-01-29 18:33:47 +08:00
Lele
bd048d725c
!333 增加默认退款金额显示
Merge pull request !333 from Lele/dev
2024-01-29 06:37:37 +00:00
lele0521
8e275613e1 fix: 增加默认退款金额显示 2024-01-29 14:35:19 +08:00
Lele
fc869a34e0
!332 fix: 修复分销提现异常
Merge pull request !332 from Lele/dev
2024-01-25 10:42:13 +00:00
lele0521
48c84acb7c fix: 分销提现bug修复 2024-01-25 18:39:27 +08:00
OceansDeep
40d40a344e
!331 fix & improve
Merge pull request !331 from OceansDeep/pg
2024-01-25 08:46:48 +00:00
misworga831
d31257ba76 fix: 修复促销拼团订单取消后,活动结束后,检查成团没有筛选取消后的订单返还多余库存问题 2024-01-25 16:12:33 +08:00
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