liu
|
1976367b3c
|
预留模板到货短信
|
2024-06-15 18:46:37 +08:00 |
|
|
|
80d24acad4
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-15 18:45:21 +08:00 |
|
|
|
1f9765d44f
|
feat: 优化了支付通知逻辑，增加了条件判断以处理不同情况下的手续费、平台费用等支出和收入。
|
2024-06-15 18:45:10 +08:00 |
|
liu
|
d04149ba48
|
更新数据字段
|
2024-06-15 18:12:07 +08:00 |
|
liu
|
bf98d4837a
|
修改回调和商品成本
|
2024-06-15 18:00:53 +08:00 |
|
|
|
6b75053f6f
|
feat(OrderEnum): 添加会员订单获取类型
|
2024-06-15 17:19:37 +08:00 |
|
|
|
b2bea08671
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-15 17:18:01 +08:00 |
|
|
|
4c8ce2bd64
|
feat(OrderEnum): 添加订单保证金类型
|
2024-06-15 17:17:57 +08:00 |
|
liu
|
dfc7266fb0
|
补齐模型调用
|
2024-06-15 17:15:18 +08:00 |
|
|
|
f8e232fc58
|
feat: 修改财务流水分支逻辑并优化订单枚举类
|
2024-06-15 17:13:44 +08:00 |
|
|
|
68624a0304
|
feat(OrderLogic): 修改订单逻辑，优化用户分享关系获取方式
|
2024-06-15 16:47:50 +08:00 |
|
|
|
fe1aecaf87
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-15 16:46:13 +08:00 |
|
|
|
d4c53ac69d
|
feat(order): 添加用户等级判断逻辑以调整订单总价和抵扣金额
|
2024-06-15 16:41:04 +08:00 |
|
liu
|
39173539d4
|
修改参数报错
|
2024-06-15 16:38:53 +08:00 |
|
|
|
a75b72224e
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-15 16:07:54 +08:00 |
|
|
|
bfbd01fcc1
|
feat: 增加用户余额和购买资金字段，优化支付通知逻辑，限制充值会员不能前端设置
|
2024-06-15 16:07:50 +08:00 |
|
liu
|
8c1608207e
|
新增发送短信验证检验用户采购款够支付否
|
2024-06-15 16:06:28 +08:00 |
|
liu
|
341cbe7457
|
兼容商户端订单查询
|
2024-06-15 15:54:32 +08:00 |
|
liu
|
8e82e40379
|
收银台相关验证码逻辑新增
|
2024-06-15 15:35:03 +08:00 |
|
|
|
98683fcc52
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-15 15:08:09 +08:00 |
|
|
|
b756c07191
|
feat: 修改用户余额字段及相关逻辑
|
2024-06-15 15:07:59 +08:00 |
|
liu
|
bc867d7362
|
小程序登录临时处理
|
2024-06-15 14:30:23 +08:00 |
|
|
|
94d89f86dc
|
feat: 移除 UserAddressValidate 类中的 detail 字段验证
|
2024-06-15 14:15:05 +08:00 |
|
|
|
df8e852373
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-15 13:44:41 +08:00 |
|
|
|
e2c471c030
|
feat: 修改支付逻辑增加充值功能
|
2024-06-15 13:44:32 +08:00 |
|
liu
|
1109eb92f1
|
购物车新增删除标识
|
2024-06-15 11:42:54 +08:00 |
|
liu
|
5e5cc45490
|
兼容已经删除的创建相关
|
2024-06-15 11:36:34 +08:00 |
|
|
|
e960f06837
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-15 11:13:57 +08:00 |
|
|
|
97a7a830c3
|
feat: 增加地址API功能
|
2024-06-15 11:13:52 +08:00 |
|
liu
|
64fce0c613
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-15 11:07:15 +08:00 |
|
liu
|
aa2c146300
|
修改采购款标识
|
2024-06-15 11:07:02 +08:00 |
|
|
|
177d9576c7
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-15 11:00:29 +08:00 |
|
|
|
48a66a5328
|
feat(UserLists): 添加搜索功能实现ListsSearchInterface
|
2024-06-15 11:00:20 +08:00 |
|
liu
|
545e01e75a
|
新增采购款支付方式和预留用户分享逻辑
|
2024-06-15 10:49:53 +08:00 |
|
|
|
9cefd94d26
|
feat: 添加对短信服务商的支持
|
2024-06-15 10:38:13 +08:00 |
|
|
|
1741babcf4
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-15 10:18:36 +08:00 |
|
|
|
975a296b46
|
feat: 添加库存类型参数和库存处理逻辑
|
2024-06-15 10:18:32 +08:00 |
|
liu
|
fc59e41fc6
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-15 09:46:51 +08:00 |
|
liu
|
112e9b9c4a
|
更新充值到用户得采购款
|
2024-06-15 09:46:41 +08:00 |
|
|
|
d48ee7b613
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-15 09:44:28 +08:00 |
|
|
|
03ea382ab7
|
feat: 修改了供应链订单获得逻辑
|
2024-06-15 09:44:23 +08:00 |
|
liu
|
b3d6645953
|
返回用户相关金额
|
2024-06-15 09:38:59 +08:00 |
|
liu
|
6e68525779
|
兼容分类查询
|
2024-06-14 18:19:05 +08:00 |
|
liu
|
41ff69e0d9
|
兼容2级和1级别查询
|
2024-06-14 18:16:52 +08:00 |
|
liu
|
305707d179
|
修改时间查询
|
2024-06-14 17:55:56 +08:00 |
|
liu
|
189c872815
|
新增时间搜索
|
2024-06-14 17:53:31 +08:00 |
|
liu
|
46ba3cb31f
|
修改默认查询店铺数据
|
2024-06-14 17:44:59 +08:00 |
|
liu
|
449ecc0508
|
修改默认商户id
|
2024-06-14 17:35:04 +08:00 |
|
|
|
fbae752232
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-14 16:40:52 +08:00 |
|
|
|
e8ee8531d0
|
feat(UserShipLists): 修改用户 ship 列表中的会员等级描述
|
2024-06-14 16:40:48 +08:00 |
|
