liu
|
b7218e96e6
|
修改门店收款的商户后台的统计
|
2024-06-25 17:11:35 +08:00 |
|
|
|
61175aa684
|
Merge pull request 'fix_address' (#12) from fix_address into main
Reviewed-on: #12
|
2024-06-25 14:38:32 +08:00 |
|
liu
|
bcef6451d6
|
修改商品列表查询
|
2024-06-25 14:36:58 +08:00 |
|
liu
|
da38902072
|
处理搜索的分类问题
|
2024-06-25 14:26:55 +08:00 |
|
|
|
f52b285dc9
|
Merge pull request 'fix_address' (#11) from fix_address into main
Reviewed-on: #11
|
2024-06-25 09:55:19 +08:00 |
|
liu
|
a75d9fb64e
|
修复地址
|
2024-06-25 09:54:34 +08:00 |
|
liu
|
00ddc6c5c1
|
Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store
|
2024-06-25 09:51:10 +08:00 |
|
|
|
4ad3351522
|
Merge pull request 'dev' (#10) from dev into main
Reviewed-on: #10
|
2024-06-24 15:18:49 +08:00 |
|
liu
|
837d11a88b
|
登录绑定手机号相关
|
2024-06-24 15:18:28 +08:00 |
|
|
|
d0915b4c68
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-24 15:16:26 +08:00 |
|
|
|
9df52eb5ac
|
feat: 修改库存逻辑增加库存类型
|
2024-06-24 15:16:21 +08:00 |
|
|
|
0d41b39a39
|
feat: 优化用户充值列表查询逻辑
|
2024-06-24 15:13:27 +08:00 |
|
liu
|
2e64e690ac
|
微信小程序登录绑定相关
|
2024-06-24 14:24:58 +08:00 |
|
|
|
1c622039c0
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-24 14:15:26 +08:00 |
|
|
|
b89ffb00b4
|
恢复原本价格
|
2024-06-24 14:15:22 +08:00 |
|
liu
|
1cca6ee0ec
|
退款微信进资金流水
|
2024-06-24 14:13:37 +08:00 |
|
|
|
883847e49d
|
feat: 修改 IndexController 中的订单号
|
2024-06-24 14:10:57 +08:00 |
|
|
|
2524a5766c
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-24 12:52:07 +08:00 |
|
|
|
3af9d12ce9
|
feat: 更新了路由、模型、视图等部分的代码，优化了部分逻辑，修复了已知问题，并改进了代码的可读性和可维护性。
|
2024-06-24 12:51:58 +08:00 |
|
|
|
8960188732
|
feat: 更新了workerman/webman-framework依赖版本
|
2024-06-24 12:51:35 +08:00 |
|
liu
|
9d30b7d87c
|
处理校验
|
2024-06-24 12:22:59 +08:00 |
|
|
|
db01c4735e
|
Merge pull request 'dev' (#9) from dev into main
Reviewed-on: #9
|
2024-06-24 12:13:30 +08:00 |
|
liu
|
f319a4e60b
|
地址报错相关处理和退款回调相关处理
|
2024-06-24 11:13:59 +08:00 |
|
liu
|
cbd3f2b34b
|
用户余额,采购款退款相关日志记录
|
2024-06-24 11:01:44 +08:00 |
|
liu
|
b3e010d251
|
增加数量
|
2024-06-24 10:46:52 +08:00 |
|
liu
|
fb756ff31e
|
加匹配字段
|
2024-06-24 10:45:01 +08:00 |
|
liu
|
bca64c64ba
|
退款字段
|
2024-06-24 10:42:31 +08:00 |
|
liu
|
f1e807ab29
|
现金退款相关
|
2024-06-24 10:41:18 +08:00 |
|
liu
|
f010d54c7a
|
兼容退余额和采购款
|
2024-06-24 10:11:13 +08:00 |
|
liu
|
e5d514bdd4
|
修改兼容
|
2024-06-24 09:46:00 +08:00 |
|
liu
|
3ee83dcc86
|
总后台微信退款逻辑
|
2024-06-24 09:39:45 +08:00 |
|
|
|
624dccab9a
|
Merge pull request 'feat(PayNotifyLogic): 修改了小程序发货通知的推送优先级' (#8) from dev into main
Reviewed-on: #8
|
2024-06-24 09:22:55 +08:00 |
|
|
|
296953484b
|
feat(PayNotifyLogic): 修改了小程序发货通知的推送优先级
|
2024-06-24 09:22:02 +08:00 |
|
|
|
f7c814d2ac
|
Merge pull request 'dev' (#7) from dev into main
Reviewed-on: #7
|
2024-06-23 20:25:51 +08:00 |
|
|
|
3e425d97fc
|
feat(PayNotifyLogic): 修复用户订单支付逻辑，优化代码，增加条件判断
|
2024-06-23 20:12:50 +08:00 |
|
|
|
e7a74c1b10
|
feat(PayNotifyLogic): 修改支付通知逻辑，修复错误，优化代码，增加临时活动兑换券逻辑
|
2024-06-23 20:12:14 +08:00 |
|
|
|
c6bcec76fa
|
feat(OrderLogic, PayNotifyLogic): 修改订单和支付逻辑，增加异常捕获和处理，修复了库存更新错误，并优化了相关代码。
|
2024-06-23 19:56:55 +08:00 |
|
|
|
6641010821
|
feat(PayNotifyLogic): 修改支付通知逻辑，修复错误，优化代码，增加临时活动更改
|
2024-06-23 19:53:49 +08:00 |
|
|
|
51a44f8105
|
feat(store_order): 修改订单支付逻辑，修复了会员价和商户价格计算错误，并优化了相关代码。
|
2024-06-23 19:37:34 +08:00 |
|
|
|
3723c9c047
|
feat(PayNotifyLogic): 更新支付通知逻辑，修复错误，优化代码
|
2024-06-23 19:07:44 +08:00 |
|
|
|
5ac2750227
|
feat(PayNotifyLogic): 修改支付通知逻辑，修复了队长和村长订单获得兑换券的逻辑错误，并优化了相关代码。
|
2024-06-23 13:05:52 +08:00 |
|
|
|
8f2868a24d
|
Merge pull request 'dev' (#6) from dev into main
Reviewed-on: #6
|
2024-06-22 19:38:23 +08:00 |
|
|
|
136d9e1714
|
feat(PayController): 修改支付控制器代码，优化了小程序支付回调、微信支付查询等方法，并修复了相关bug。
|
2024-06-22 19:27:53 +08:00 |
|
|
|
89db630313
|
支付更新
|
2024-06-22 19:10:12 +08:00 |
|
liu
|
fb8460e1a9
|
兑换数量限制
|
2024-06-22 18:59:07 +08:00 |
|
liu
|
7ecd594588
|
兑换库存
|
2024-06-22 18:47:46 +08:00 |
|
liu
|
c66e012b2a
|
金额
|
2024-06-22 18:43:09 +08:00 |
|
liu
|
e5043d09ab
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-22 18:37:46 +08:00 |
|
liu
|
91ee6e8d4b
|
收银台信息处理
|
2024-06-22 18:37:36 +08:00 |
|
|
|
f559b8312e
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-22 18:35:12 +08:00 |
|
