|
|
01915bbaaa
|
feat: 修改CommissionLogic类以优化财务逻辑
|
2024-07-08 17:55:27 +08:00 |
|
|
|
f6c8b7865e
|
feat: 修改购物车商品查询逻辑和订单逻辑，根据用户身份调整商品价格计算方式，并更新相关文档
|
2024-07-08 17:24:50 +08:00 |
|
liu
|
74c0456f1a
|
商品规格
|
2024-07-08 16:09:03 +08:00 |
|
liu
|
820869016c
|
用户冻结券详情
|
2024-07-08 15:47:07 +08:00 |
|
|
|
07ffabfa52
|
feat: 移除StoreFinanceFlowLists中的冗余代码
|
2024-07-08 15:18:56 +08:00 |
|
liu
|
4035333cd4
|
修改后台的展示
|
2024-07-08 15:15:15 +08:00 |
|
liu
|
cbdf2c2431
|
核销修改对应的商品统计记录
|
2024-07-08 10:45:40 +08:00 |
|
liu
|
c324d025d5
|
列表厨师判断
|
2024-07-08 10:36:26 +08:00 |
|
|
|
943ac77f6f
|
Merge pull request 'dev' (#34) from dev into main
Reviewed-on: #34
|
2024-07-06 18:36:35 +08:00 |
|
liu
|
54f5653085
|
判断
|
2024-07-06 18:34:10 +08:00 |
|
liu
|
1d57453383
|
修改充值
|
2024-07-06 18:25:16 +08:00 |
|
liu
|
89426af815
|
修改
|
2024-07-06 18:01:38 +08:00 |
|
|
|
f2cc9f7f9f
|
feat(UserLists.php): 更新用户列表查询逻辑
|
2024-07-06 17:48:51 +08:00 |
|
|
|
f81989efc2
|
feat(UserLists.php): 更新用户列表功能
|
2024-07-06 17:48:42 +08:00 |
|
|
|
1ee0e2b7c2
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-06 17:32:56 +08:00 |
|
|
|
1bc854cdad
|
feat: 修改StoreController实现条码支付功能
|
2024-07-06 17:32:51 +08:00 |
|
liu
|
9cc0ce8971
|
修改标识
|
2024-07-06 17:31:43 +08:00 |
|
liu
|
c49e91001c
|
回调调试
|
2024-07-06 17:28:58 +08:00 |
|
liu
|
b66e01c585
|
设置支付标识
|
2024-07-06 17:26:26 +08:00 |
|
liu
|
8312b5755a
|
兼容充值逻辑首次不支付
|
2024-07-06 16:53:59 +08:00 |
|
|
|
53199c8aa6
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-06 16:43:25 +08:00 |
|
|
|
9cf4e962bc
|
feat(statistics): 修改销售排名接口逻辑
|
2024-07-06 16:43:12 +08:00 |
|
liu
|
562567cf07
|
待返回金额
|
2024-07-06 16:14:01 +08:00 |
|
liu
|
a6460ecaf0
|
校验地址逻辑
|
2024-07-06 16:01:39 +08:00 |
|
liu
|
b72952ce22
|
修改文字
|
2024-07-06 15:49:50 +08:00 |
|
liu
|
65a7e2da84
|
修改充值限制 显示
|
2024-07-06 15:45:17 +08:00 |
|
liu
|
a19656bbca
|
修改充值限制
|
2024-07-06 15:43:42 +08:00 |
|
liu
|
e77be2e3c3
|
修改种养殖下单不加分润
|
2024-07-06 14:36:54 +08:00 |
|
liu
|
609f981c9f
|
首次充值写入店铺数据
|
2024-07-06 11:53:41 +08:00 |
|
|
|
0e91c0cc98
|
Merge pull request 'dev' (#33) from dev into main
Reviewed-on: #33
|
2024-07-06 10:08:14 +08:00 |
|
liu
|
9f36a0e968
|
临时处理活动前端关闭
|
2024-07-06 10:03:18 +08:00 |
|
liu
|
5f268a60f5
|
修改
|
2024-07-06 10:00:40 +08:00 |
|
|
|
6df05f4139
|
Merge pull request '修改默认值' (#32) from dev into main
Reviewed-on: #32
|
2024-07-06 09:52:05 +08:00 |
|
liu
|
47d0ab5582
|
修改默认值
|
2024-07-06 09:50:19 +08:00 |
|
|
|
c8d8724b03
|
Merge pull request 'dev' (#31) from dev into main
Reviewed-on: #31
|
2024-07-05 19:22:48 +08:00 |
|
|
|
e9e9a76b32
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-05 19:22:18 +08:00 |
|
|
|
6f99259a7c
|
feat(UserRechargeController): 更新采购包礼品券金额
|
2024-07-05 19:22:13 +08:00 |
|
liu
|
a6eb80bbd0
|
转换金额
|
2024-07-05 19:19:45 +08:00 |
|
liu
|
988adf0795
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-05 19:14:05 +08:00 |
|
liu
|
2d6a45c98d
|
活动期间不加冻结
|
2024-07-05 19:13:56 +08:00 |
|
|
|
226c8f6b8c
|
feat(UserLogic): 添加'user_balance_recharge_refund'到资金流类别
|
2024-07-05 19:08:16 +08:00 |
|
|
|
ac2c632fbb
|
feat: 添加'user_balance_recharge_refund'到$categories数组
|
2024-07-05 19:02:40 +08:00 |
|
|
|
1fd70503c0
|
feat(StoreOrderLists): 根据收银台和小程序订单调整查询条件
|
2024-07-05 18:58:28 +08:00 |
|
|
|
98e93b0f69
|
feat(PayController): 修改支付回调逻辑，增加错误日志记录
|
2024-07-05 18:48:21 +08:00 |
|
|
|
de313f1bed
|
feat: 修改CapitalFlowLogic和PayNotifyLogic类中的userIncome和userExpense方法，增加新的支付类型和退款描述，优化代码格式。
|
2024-07-05 18:38:26 +08:00 |
|
|
|
b8aad3cdc2
|
feat(UserSignLogic): 修复首充逻辑判断条件
|
2024-07-05 18:32:07 +08:00 |
|
|
|
2ae218e0bd
|
feat: 移除首充逻辑中的金额判断条件
|
2024-07-05 18:12:22 +08:00 |
|
|
|
e65d201039
|
feat: 修改 UserSignLogic 类以处理订单价格类型转换
|
2024-07-05 18:02:05 +08:00 |
|
|
|
25e85e7cbd
|
feat: 修改用户控制器的短信发送、添加、详情、会员设置和充值列表等功能
|
2024-07-05 17:46:35 +08:00 |
|
|
|
f91110ccc5
|
feat(user): 更新用户充值和用户商店的采购包礼品券数量
|
2024-07-05 17:45:23 +08:00 |
|
