1338 Commits

Author SHA1 Message Date
liu
97c2b775d7 修改回调参数异常 2024-07-05 16:55:25 +08:00
mkm
b430a6242e fix: 修复支付类型判断错误 2024-07-05 16:46:22 +08:00
mkm
5992ea61a6 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-07-05 16:46:00 +08:00
mkm
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
mkm
a8f68ff099 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-07-05 14:38:45 +08:00
mkm
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
mkm
f9114271ec feat(UserSignLogic): 修改用户签到逻辑,增加用户充值查询 2024-07-05 11:52:08 +08:00
mkm
380e121726 feat(UserShipLogic): 增加判断逻辑,避免重复设置村长或队长 2024-07-05 11:47:41 +08:00
mkm
faf5fab258 feat: 修改用户签到逻辑 2024-07-05 11:34:46 +08:00
mkm
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
mkm
4f2617068c fix: 修复错误提示信息 2024-07-04 14:48:39 +08:00
mkm
42c7cd4f7e feat: 添加了查询订单支付状态的API功能 2024-07-04 13:58:59 +08:00
mkm
4f7397a1fc Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-07-04 11:32:47 +08:00
mkm
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
mkm
0dc0ebe48b Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-07-04 10:10:48 +08:00
mkm
c899642f43 feat(UserLogic): 修正区域村长选择错误信息 2024-07-04 10:10:43 +08:00
liu
f9f0e2e4f8 修改地址逻辑 2024-07-04 10:08:13 +08:00
mkm
f9f39c2ac0 feat(store): 添加用户地址功能 2024-07-04 09:33:45 +08:00
mkm
2b364dfa62 feat(UserLogic): 添加用户船只参数验证 2024-07-04 09:21:14 +08:00
mkm
afd09bbb9b feat(UserShipController): 添加is_user_ship方法用于处理用户船只逻辑 2024-07-03 18:01:31 +08:00
mkm
7e2ad42b83 feat: 修改了CommissionLogic和PayNotifyLogic类以处理会员金额 2024-07-03 17:58:47 +08:00
mkm
5101dd4e9c feat(UserShipLogic): 添加用户船只逻辑,优化查询条件 2024-07-03 17:54:12 +08:00
mkm
ebde5684c0 feat: 移除了UserLogic中的冗余代码,并将相关逻辑移至UserShipLogic中,以提高代码可读性和可维护性。同时,增加了判断是否有村长或对长的API接口。 2024-07-03 17:25:57 +08:00
mkm
bb44d88dd1 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-07-03 16:51:46 +08:00
mkm
c668f34f29 feat: 添加会员待返回金额计算逻辑 2024-07-03 16:51:32 +08:00
liu
6819cc3b21 区分小程序和收银台消息提示逻辑 2024-07-03 16:33:48 +08:00
liu
b76f630bbd 增加限制查询未退款的逻辑 2024-07-03 16:30:45 +08:00
liu
2f1288949b 修改条形码 2024-07-03 16:27:45 +08:00
liu
3b07baf640 排除退款的逻辑 2024-07-03 16:04:20 +08:00
liu
2a9394c145 修改查询 2024-07-03 15:48:24 +08:00
liu
29772c4fb4 用户领取礼品列表 2024-07-03 15:43:02 +08:00
mkm
5ac195ccfb feat: 修改用户地址API逻辑,增加地址默认设置功能 2024-07-03 15:13:27 +08:00
mkm
b46af51480 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-07-03 14:09:24 +08:00
mkm
1639b54301 feat(UserLogic): 根据用户等级限制区域管理员添加 2024-07-03 14:09:12 +08:00
liu
f23348e8a1 修改首次下单和后续默认下单拿最近订单下单的店铺的逻辑 2024-07-03 11:23:17 +08:00
mkm
51948aaf35 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-07-03 10:23:23 +08:00
mkm
89b32e0e6f feat: 更新店铺现金财务流水控制器中的银行信息 2024-07-03 10:23:18 +08:00
liu
15414c2a41 兼容收银台展示收款信息 2024-07-03 10:20:58 +08:00
liu
40a92fbb49 余额和采购款推送消息 2024-07-03 09:31:03 +08:00
mkm
7366a9e581 feat(user): 添加用户船只信息 2024-07-02 18:55:58 +08:00