|
|
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 |
|
|
|
c78b12ec2d
|
feat(UserSignLogic): 修改用户签到逻辑，增加日志记录功能
|
2024-07-02 15:40:56 +08:00 |
|
|
|
970f8c0a45
|
feat(UserSignLogLists): 添加了根据用户ID搜索的功能
|
2024-07-02 15:34:01 +08:00 |
|
|
|
ab746594ae
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-02 15:32:50 +08:00 |
|
|
|
1f122be8dc
|
feat: 增加用户签到列表API查询功能
|
2024-07-02 15:32:38 +08:00 |
|
liu
|
e9ae9ee246
|
取消下单数量限制直接为次日预提单子
|
2024-07-02 15:29:51 +08:00 |
|
liu
|
098b431bed
|
修改列表展示商品库存为空的相关逻辑
|
2024-07-02 15:27:00 +08:00 |
|
|
|
f8da0b9a96
|
feat: 更新用户列表功能以包括VIP流水
|
2024-07-02 15:23:40 +08:00 |
|
|
|
5c58375081
|
feat(UserLists): 修改用户列表返回金额查询逻辑
|
2024-07-02 15:20:23 +08:00 |
|
|
|
f1e93d4aeb
|
feat(UserSignLogic): 根据订单来源调整礼品券冻结逻辑
|
2024-07-02 15:15:42 +08:00 |
|
|
|
3e72886b7a
|
feat(UserLogic): 修正用户签到逻辑错误
|
2024-07-02 15:01:05 +08:00 |
|
|
|
d2d82f31ee
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-02 14:51:44 +08:00 |
|
|
|
e9c25fd1de
|
feat: 调整用户签到逻辑以优化首充和礼品券的冻结处理
|
2024-07-02 14:51:39 +08:00 |
|
liu
|
9bd450ce1b
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-02 14:42:58 +08:00 |
|
liu
|
faa314d14a
|
修改店铺商品统计
|
2024-07-02 14:42:48 +08:00 |
|
|
|
13d4ac1fad
|
feat(UserShipLists): 根据type_id判断是否添加搜索条件
|
2024-07-02 14:42:26 +08:00 |
|
|
|
c2a46c93a9
|
feat(BaseApiDataLists): 移除并注释掉export属性及相关代码
|
2024-07-02 14:36:27 +08:00 |
|
|
|
6347ee4f25
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-02 14:30:30 +08:00 |
|
|
|
0b3fc8a7b6
|
feat: 修改用户签到逻辑和支付通知逻辑
|
2024-07-02 14:30:20 +08:00 |
|
liu
|
e4c80b9565
|
注释店铺数据限制页数
|
2024-07-02 14:09:32 +08:00 |
|
liu
|
7421de9d10
|
修改经纬度默认
|
2024-07-02 13:54:21 +08:00 |
|
liu
|
84e0500e7c
|
Merge branch 'fix_store_user' into dev
|
2024-07-02 11:58:05 +08:00 |
|
liu
|
8788707a4a
|
更新用户区域选择
|
2024-07-02 11:57:53 +08:00 |
|
liu
|
f648bb0cdb
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-02 11:52:02 +08:00 |
|
liu
|
a717662cb9
|
修改查询逻辑
|
2024-07-02 11:51:54 +08:00 |
|
|
|
78a44016e5
|
rename: 重命名用户签到模型文件
|
2024-07-02 11:46:40 +08:00 |
|
|
|
5522ebc920
|
feat: 修改订单积分结算条件
|
2024-07-02 11:41:34 +08:00 |
|
|
|
83fce9e9dd
|
feat: 移除支付类型为3时的兑换券逻辑
|
2024-07-02 11:31:52 +08:00 |
|
|
|
01ae705dbf
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-02 11:02:10 +08:00 |
|
|
|
4b849edc76
|
feat(UserController): 更新用户签到逻辑，修复积分计算错误
|
2024-07-02 11:02:00 +08:00 |
|
