1338 Commits

Author SHA1 Message Date
mkm
090955158f 优化分润逻辑与财务流水处理 2024-06-29 10:19:08 +08:00
mkm
277b7b3836 Merge pull request '处理后台报错' (#28) from dev into main
Reviewed-on: #28
2024-06-29 09:35:33 +08:00
liu
cf0ac14419 处理后台报错 2024-06-29 09:24:57 +08:00
mkm
7e5fdb9d22 Merge pull request 'feat: 修改分类列表API逻辑' (#27) from dev into main
Reviewed-on: #27
2024-06-29 09:09:20 +08:00
mkm
68bbf53795 feat: 修改分类列表API逻辑 2024-06-29 09:08:52 +08:00
mkm
7036f065b3 Merge pull request 'dev' (#26) from dev into main
Reviewed-on: #26
2024-06-28 19:12:32 +08:00
mkm
fc3b6750eb Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-28 19:11:07 +08:00
mkm
919229c8dc feat: 修改核销码查询逻辑 2024-06-28 19:10:56 +08:00
liu
1096901067 修改回调 2024-06-28 19:08:52 +08:00
mkm
aeff0c9d54 feat: 更新了商店财务流水状态更新逻辑 2024-06-28 18:52:55 +08:00
mkm
fa31930be6 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-28 18:45:59 +08:00
mkm
cdeeaaf717 feat: 更新库存逻辑核销后状态 2024-06-28 18:45:55 +08:00
liu
1acc001559 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-28 18:42:41 +08:00
liu
944480df4c 日志记录 2024-06-28 18:42:29 +08:00
mkm
28f434f0d7 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-28 18:38:19 +08:00
mkm
51df5a3a94 feat: 修改了订单核销逻辑和支付通知逻辑 2024-06-28 18:38:14 +08:00
liu
bc7cdeed63 新增采购款退款 2024-06-28 18:32:18 +08:00
liu
4b3740d502 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-28 18:08:01 +08:00
liu
93de8124ec 返回金decimal处理 2024-06-28 18:07:51 +08:00
mkm
2ce9a75c62 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-28 18:04:27 +08:00
mkm
52e63cb05d feat: 添加支付通知逻辑并优化订单处理 2024-06-28 18:04:15 +08:00
liu
5fdf3496f8 更新礼品券列表 2024-06-28 18:02:33 +08:00
liu
d752188d79 打开冻结款注释 2024-06-28 17:39:19 +08:00
liu
21c37a5345 修改地址逻辑查询 2024-06-28 17:14:30 +08:00
mkm
ea8ed066e4 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-28 16:59:56 +08:00
mkm
c0f64c83fc feat(pay-notify-logic): 修改支付通知逻辑,优化代码结构,提高可读性和可维护性。 2024-06-28 16:58:57 +08:00
liu
d46d6139a0 新增采购款下单不反兑换券 2024-06-28 16:49:53 +08:00
liu
e7f1df0576 增加店铺逻辑限制 2024-06-28 16:37:07 +08:00
mkm
9f3a36201d feat(user): 增加用户标签查询功能 2024-06-28 16:10:50 +08:00
mkm
6b59bb043d feat(UserProductStorageLists): 根据请求参数status来显示不同状态的记录 2024-06-28 15:50:46 +08:00
mkm
02cad62671 feat: 增加根据用户昵称或真实姓名搜索用户的功能,只显示正常状态的库存记录 2024-06-28 15:49:39 +08:00
mkm
eb362ad557 1 2024-06-28 15:26:59 +08:00
mkm
004ad3ccca feat: 调整分类列表API逻辑 2024-06-28 15:23:20 +08:00
mkm
4f029d5967 feat(UserController): 根据用户ID获取地址信息并添加地址别名 2024-06-28 15:10:23 +08:00
mkm
776ee99b54 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-28 15:03:19 +08:00
mkm
30cbd5eafe feat: 更新了用户商品存储逻辑和支付通知逻辑 2024-06-28 15:03:14 +08:00
liu
e7e2325a24 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-28 14:43:51 +08:00
liu
44c1bb40fd 修改充值退款退礼品券的逻辑 2024-06-28 14:43:40 +08:00
mkm
f330790647 feat(UserController): 增加用户地址信息查询功能 2024-06-28 14:43:19 +08:00
mkm
a9bb4c25d9 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-28 14:28:24 +08:00
mkm
660762b0a4 1 2024-06-28 14:27:48 +08:00
mkm
ee1960550d 1 2024-06-28 14:26:39 +08:00
liu
c24b0f7900 修改余额支付报错 2024-06-28 13:55:09 +08:00
mkm
0138c13069 feat: 添加系统店铺名称查询功能 2024-06-28 11:55:04 +08:00
mkm
643e1894e7 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-28 11:44:52 +08:00
mkm
68d55fa04e feat: 修改了 StoreRefundOrderLists 和 UserRechargeLists 类以获取用户真实姓名和昵称 2024-06-28 11:44:44 +08:00
liu
95cd3876fd 采购款日志记录变化前后的金额逻辑 2024-06-28 11:29:18 +08:00
mkm
b8d086f35d Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-28 10:22:51 +08:00
mkm
b5e8e527fe feat: 添加用户商品存储逻辑 2024-06-28 10:22:46 +08:00
mkm
266e93f527 feat(IndexController): 添加了Push服务API功能 2024-06-28 10:20:49 +08:00