liu
|
5f268a60f5
|
修改
|
2024-07-06 10:00:40 +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 |
|
|
|
f528005b21
|
feat: 修改用户签到逻辑
|
2024-07-05 17:42:41 +08:00 |
|
|
|
b2ea6f2028
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-05 17:39:41 +08:00 |
|
|
|
1167cecba3
|
feat: 修改了用户逻辑，增加了对手机号注册的判断和错误处理
|
2024-07-05 17:39:36 +08:00 |
|
liu
|
5289952597
|
对应充值逻辑
|
2024-07-05 17:22:37 +08:00 |
|
|
|
95ba546859
|
feat: 移除用户船只验证条件
|
2024-07-05 17:09:16 +08:00 |
|
|
|
9eec5a198d
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-05 16:55:39 +08:00 |
|
|
|
c122bcb386
|
feat(PayNotifyLogic): 重构收银台下单直接到账逻辑并移除冗余代码
|
2024-07-05 16:55:26 +08:00 |
|
liu
|
97c2b775d7
|
修改回调参数异常
|
2024-07-05 16:55:25 +08:00 |
|
|
|
b430a6242e
|
fix: 修复支付类型判断错误
|
2024-07-05 16:46:22 +08:00 |
|
|
|
5992ea61a6
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-05 16:46:00 +08:00 |
|
|
|
eb39074822
|
feat: 修改支付通知逻辑
|
2024-07-05 16:45:54 +08:00 |
|
liu
|
99f22f97a2
|
调试金额
|
2024-07-05 16:32:03 +08:00 |
|
liu
|
ec8841d67e
|
充值采购款列表
|
2024-07-05 15:49:31 +08:00 |
|
liu
|
406fa2831b
|
修改取消活动价逻辑
|
2024-07-05 15:28:57 +08:00 |
|
|
|
a8f68ff099
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-05 14:38:45 +08:00 |
|
|
|
9082a73f80
|
feat: 修改支付控制器及逻辑，优化支付成功后的处理流程，并调整会员充值计算方式。
|
2024-07-05 14:38:32 +08:00 |
|
liu
|
e67e8be75f
|
修改分润金额逻辑
|
2024-07-05 14:30:41 +08:00 |
|
liu
|
1409782ff7
|
修改更新减去的门店价格
|
2024-07-05 14:17:48 +08:00 |
|
|
|
f9114271ec
|
feat(UserSignLogic): 修改用户签到逻辑，增加用户充值查询
|
2024-07-05 11:52:08 +08:00 |
|
|
|
380e121726
|
feat(UserShipLogic): 增加判断逻辑，避免重复设置村长或队长
|
2024-07-05 11:47:41 +08:00 |
|
|
|
faf5fab258
|
feat: 修改用户签到逻辑
|
2024-07-05 11:34:46 +08:00 |
|
|
|
0dd6f94171
|
feat: 根据订单价格调整会员积分计算逻辑
|
2024-07-05 11:31:18 +08:00 |
|
liu
|
37f0de8c37
|
冻结相关处理
|
2024-07-05 11:14:26 +08:00 |
|
liu
|
0a96bcd30b
|
门店保证金统计修改
|
2024-07-05 10:30:51 +08:00 |
|
liu
|
cb8edc5a67
|
修改查询逻辑
|
2024-07-04 17:14:29 +08:00 |
|
|
|
4f2617068c
|
fix: 修复错误提示信息
|
2024-07-04 14:48:39 +08:00 |
|
|
|
42c7cd4f7e
|
feat: 添加了查询订单支付状态的API功能
|
2024-07-04 13:58:59 +08:00 |
|
|
|
4f7397a1fc
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-04 11:32:47 +08:00 |
|
|
|
87161dd9be
|
feat: 修改支付控制器以处理不同类型的支付通知
|
2024-07-04 11:32:32 +08:00 |
|
liu
|
2132126a41
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-04 10:15:34 +08:00 |
|
liu
|
ad1e4f3f5d
|
修改限制
|
2024-07-04 10:15:25 +08:00 |
|
|
|
0dc0ebe48b
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-04 10:10:48 +08:00 |
|
