|
|
7b5a2e76d4
|
feat: 增加用户真实姓名显示功能
|
2024-06-27 09:51:15 +08:00 |
|
liu
|
88d8a22241
|
门店余额消费新增
|
2024-06-27 09:42:54 +08:00 |
|
|
|
149afec11f
|
feat(StoreFinanceFlowLists): 添加了财务类型和财务方式的搜索条件
|
2024-06-27 09:30:35 +08:00 |
|
|
|
ec82a8735d
|
Merge pull request 'feat: 修改支付逻辑以处理不同支付方式' (#22) from dev into main
Reviewed-on: #22
|
2024-06-26 21:08:11 +08:00 |
|
|
|
6478f0f86e
|
feat: 修改支付逻辑以处理不同支付方式
|
2024-06-26 21:07:30 +08:00 |
|
|
|
8724462a1d
|
Merge pull request '调换顺序' (#21) from dev into main
Reviewed-on: #21
|
2024-06-26 20:02:20 +08:00 |
|
liu
|
f6e43fc75d
|
调换顺序
|
2024-06-26 20:01:25 +08:00 |
|
|
|
d93a45a39f
|
Merge pull request '修改校验' (#20) from dev into main
Reviewed-on: #20
|
2024-06-26 19:58:30 +08:00 |
|
liu
|
2c461bf4e6
|
修改校验
|
2024-06-26 19:58:06 +08:00 |
|
|
|
a6ccf754b4
|
Merge pull request '修改微信回调逻辑' (#19) from dev into main
Reviewed-on: #19
|
2024-06-26 19:53:25 +08:00 |
|
liu
|
5a4bd318d2
|
修改微信回调逻辑
|
2024-06-26 19:52:02 +08:00 |
|
|
|
6fb168f64e
|
Merge pull request 'dev' (#18) from dev into main
Reviewed-on: #18
|
2024-06-26 19:42:02 +08:00 |
|
|
|
8804ccef93
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-26 19:41:33 +08:00 |
|
|
|
55c72dcd4d
|
feat: 新增用户标签和 Shipping 信息功能
|
2024-06-26 19:41:27 +08:00 |
|
liu
|
255f99ea60
|
修改回调
|
2024-06-26 19:41:01 +08:00 |
|
|
|
bfc7a8266a
|
Merge pull request 'feat: 移除了重复的OrderLogic引用' (#17) from dev into main
Reviewed-on: #17
|
2024-06-26 19:06:52 +08:00 |
|
|
|
1369f195a1
|
feat: 移除了重复的OrderLogic引用
|
2024-06-26 19:06:31 +08:00 |
|
|
|
af23ac1b44
|
Merge pull request 'dev' (#16) from dev into main
Reviewed-on: #16
|
2024-06-26 18:56:35 +08:00 |
|
|
|
525fa7292f
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-26 18:55:25 +08:00 |
|
|
|
130e736cae
|
Merge remote-tracking branch 'origin/main' into dev
|
2024-06-26 18:55:12 +08:00 |
|
liu
|
9a0cd3bd4c
|
保留2位小数
|
2024-06-26 18:37:37 +08:00 |
|
liu
|
c5a21a867b
|
限制小程序查询数据
|
2024-06-26 18:32:27 +08:00 |
|
liu
|
eb0aa5b6fc
|
修改报错返回格式
|
2024-06-26 18:27:36 +08:00 |
|
liu
|
302499033c
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-26 18:12:45 +08:00 |
|
liu
|
00e8d3e1a6
|
收银机用户字段新增
|
2024-06-26 18:12:35 +08:00 |
|
|
|
7f2eb11b55
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-26 18:07:50 +08:00 |
|
|
|
7f78621b66
|
feat: 增加对空验证码的判断逻辑
|
2024-06-26 18:07:45 +08:00 |
|
liu
|
9cd1395a0a
|
新增报错提示
|
2024-06-26 18:07:37 +08:00 |
|
|
|
69cc28c0d4
|
feat(StoreOrderController): 修改writeoff_list方法获取页码和每页显示数量的来源
|
2024-06-26 18:06:02 +08:00 |
|
|
|
a54eebddb6
|
feat(StoreOrderLogic): 修改了StoreOrderLogic，移除了在线订单的物流方式查询条件，增加了分页查询功能。
|
2024-06-26 18:02:23 +08:00 |
|
|
|
9346c581b3
|
feat: 实现线下分润逻辑
|
2024-06-26 17:55:46 +08:00 |
|
liu
|
85eea99558
|
修改充值接口
|
2024-06-26 17:33:11 +08:00 |
|
liu
|
63428d5015
|
回调处理限制
|
2024-06-26 17:14:46 +08:00 |
|
liu
|
9d54b4dea1
|
增加采购款 余额支付冻结礼品券逻辑
|
2024-06-26 17:07:56 +08:00 |
|
|
|
dba7e7ec8c
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-26 16:50:40 +08:00 |
|
|
|
6cfc2c773e
|
feat(order): 修改订单逻辑以处理用户信息变更
|
2024-06-26 16:50:35 +08:00 |
|
liu
|
fdddbbec51
|
测试短信调用
|
2024-06-26 16:38:04 +08:00 |
|
liu
|
338354ee77
|
调试收银台短信验证
|
2024-06-26 16:30:06 +08:00 |
|
liu
|
fc36227b33
|
调试
|
2024-06-26 16:13:47 +08:00 |
|
liu
|
4cb0f02df1
|
调试短信
|
2024-06-26 16:11:56 +08:00 |
|
liu
|
a2da972b9b
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-26 16:03:03 +08:00 |
|
liu
|
f9b10e51ce
|
新增后台商品列表一级分类查询商品逻辑
|
2024-06-26 16:02:54 +08:00 |
|
|
|
6c34f028a2
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-26 15:51:11 +08:00 |
|
|
|
4f2e432d10
|
feat(order): 修改订单逻辑，统一计算价格字段
|
2024-06-26 15:51:00 +08:00 |
|
liu
|
379c8aea4c
|
切换冻结相关得值返回
|
2024-06-26 15:47:03 +08:00 |
|
liu
|
bfb85eecd1
|
切换冻结相关得值返回
|
2024-06-26 15:44:14 +08:00 |
|
liu
|
3f7d500347
|
处理价格按照订单下单价格展示
|
2024-06-26 15:41:01 +08:00 |
|
|
|
d4184391fb
|
feat(CartList.php): 修正购物车价格计算逻辑
|
2024-06-26 15:29:39 +08:00 |
|
|
|
cdfd35b936
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-26 15:28:19 +08:00 |
|
|
|
41c77533b8
|
feat(CartList): 根据活动状态调整商品价格和支付价格计算逻辑
|
2024-06-26 15:28:13 +08:00 |
|
