|
|
bb44d88dd1
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-03 16:51:46 +08:00 |
|
|
|
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 |
|
|
|
5ac195ccfb
|
feat: 修改用户地址API逻辑，增加地址默认设置功能
|
2024-07-03 15:13:27 +08:00 |
|
|
|
b46af51480
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-03 14:09:24 +08:00 |
|
|
|
1639b54301
|
feat(UserLogic): 根据用户等级限制区域管理员添加
|
2024-07-03 14:09:12 +08:00 |
|
liu
|
f23348e8a1
|
修改首次下单和后续默认下单拿最近订单下单的店铺的逻辑
|
2024-07-03 11:23:17 +08:00 |
|
|
|
51948aaf35
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-03 10:23:23 +08:00 |
|
|
|
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 |
|
|
|
7366a9e581
|
feat(user): 添加用户船只信息
|
2024-07-02 18:55:58 +08:00 |
|
|
|
611ec62516
|
Merge pull request 'dev' (#30) from dev into main
Reviewed-on: #30
|
2024-07-02 18:39:43 +08:00 |
|
|
|
c89cb282e2
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-02 18:34:51 +08:00 |
|
|
|
4ec0221c46
|
feat(UserLists): 修正计算冻结获得数量的逻辑
|
2024-07-02 18:34:47 +08:00 |
|
liu
|
d7fc782c9a
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-02 18:29:23 +08:00 |
|
liu
|
1845833509
|
创建返回值
|
2024-07-02 18:29:12 +08:00 |
|
|
|
9c7299a408
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-02 18:28:25 +08:00 |
|
|
|
7ffa50ac7b
|
feat: 增加订单不存在返回错误
|
2024-07-02 18:28:20 +08:00 |
|
liu
|
c6ce41b2ef
|
兼容权限报错
|
2024-07-02 18:27:02 +08:00 |
|
|
|
645e95a08e
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-02 18:08:37 +08:00 |
|
|
|
b3b20746ca
|
feat(UserLists): 修改用户签到冻结金额计算方式
|
2024-07-02 18:08:28 +08:00 |
|
liu
|
f93f65b379
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-02 18:06:29 +08:00 |
|
liu
|
a77e0b5706
|
回调加入商品日志处理修改
|
2024-07-02 18:06:16 +08:00 |
|
|
|
a1bfcec42a
|
feat: 修改用户签到逻辑以增加积分
|
2024-07-02 17:56:56 +08:00 |
|
|
|
84ad33d3fc
|
feat: 移除了用户签到状态更新的代码
|
2024-07-02 17:50:55 +08:00 |
|
|
|
c93c7806c5
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-02 17:49:51 +08:00 |
|
|
|
a8fa857589
|
feat: 增加新功能(API)
|
2024-07-02 17:49:47 +08:00 |
|
liu
|
5de3cf3a97
|
修改现金付款的直接修改状态
|
2024-07-02 17:48:27 +08:00 |
|
liu
|
4c511d39b3
|
修改回调除开次日回调的逻辑
|
2024-07-02 17:44:20 +08:00 |
|
|
|
576fe28098
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-02 17:39:59 +08:00 |
|
|
|
7b5fff7a3c
|
feat: 修改UserSignLogic类中的write_log方法为write方法，并调整参数，同时更新相关用户的integral。
|
2024-07-02 17:39:53 +08:00 |
|
liu
|
0af9f3f65b
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-02 17:31:33 +08:00 |
|
liu
|
e085325ebc
|
修改加入商品逻辑
|
2024-07-02 17:31:19 +08:00 |
|
|
|
b17d964850
|
feat: 重构支付通知逻辑，优化了兑换券的增减操作，并移除了相关冗余代码。
|
2024-07-02 17:30:30 +08:00 |
|
|
|
7b8c960fec
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-02 17:02:33 +08:00 |
|
|
|
d6aaceb425
|
feat: 修改订单和支付逻辑，增加用户等级判断和积分计算
|
2024-07-02 17:02:21 +08:00 |
|
liu
|
749911f804
|
修改分页限制逻辑检测数量
|
2024-07-02 17:01:58 +08:00 |
|
liu
|
77c14d6508
|
收银台下单库存校验
|
2024-07-02 16:33:09 +08:00 |
|
|
|
23bf1ecee8
|
feat(UserSignLogic): 修改核销商品获得逻辑并更新文档
|
2024-07-02 16:10:44 +08:00 |
|
|
|
63e86b21d7
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-02 16:02:35 +08:00 |
|
|
|
0dd210e470
|
feat(StoreOrderLists): 修改收银台和小程序订单的搜索条件
|
2024-07-02 16:02:30 +08:00 |
|
liu
|
e5dafb1437
|
余额支付短信校验
|
2024-07-02 16:01:50 +08:00 |
|
|
|
2f443ec364
|
feat: 修改UserSignLists, UserSignLogLists和UserSignLogic类以实现新的订单处理逻辑
|
2024-07-02 15:59:47 +08:00 |
|
|
|
60300206f4
|
feat(StoreOrderLists): 修改收银台订单支付类型查询条件
|
2024-07-02 15:47:13 +08:00 |
|
