|
|
204e7f006d
|
feat: 添加用户标签功能
|
2024-06-17 17:06:25 +08:00 |
|
|
|
adfd149e5d
|
feat(StoreController): 修改店铺搜索接口返回格式
|
2024-06-17 16:46:08 +08:00 |
|
|
|
89596e38d3
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-17 16:44:35 +08:00 |
|
|
|
a82e96e259
|
feat: 增加用户积分查询和门店信息查询功能
|
2024-06-17 16:44:32 +08:00 |
|
liu
|
7b6816aa80
|
修改分类同步修改店铺名
|
2024-06-17 16:07:43 +08:00 |
|
|
|
6aa8964f55
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-17 15:56:34 +08:00 |
|
|
|
5dc332ae0a
|
feat(StoreOrderController): 优化获取成功返回结果
|
2024-06-17 15:56:26 +08:00 |
|
liu
|
3ccaee4897
|
临时大屏数据查询接口
|
2024-06-17 15:50:05 +08:00 |
|
liu
|
725dc922bf
|
修改合并
|
2024-06-17 15:32:36 +08:00 |
|
liu
|
d6f0446dce
|
M2b3c4erge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-17 15:30:23 +08:00 |
|
liu
|
bc881d8e09
|
字段和店铺商品的逻辑修改
|
2024-06-17 15:27:43 +08:00 |
|
|
|
f1d5a04b46
|
feat(store_order): 订单打印功能实现
|
2024-06-17 15:27:22 +08:00 |
|
|
|
9dde487cb9
|
feat(order): 修正订单验证码图片保存路径及采购款不足错误
|
2024-06-17 15:12:03 +08:00 |
|
|
|
1432a29f05
|
feat: 修改用户充值列表获取用户真实姓名方法
|
2024-06-17 14:55:33 +08:00 |
|
|
|
08c8de158b
|
feat(user): 修改UserRechargeController和UserRechargeLists类
|
2024-06-17 14:49:10 +08:00 |
|
|
|
eff0242d8f
|
feat: 添加了批次的商品更新功能
|
2024-06-17 14:30:30 +08:00 |
|
|
|
ab96b647ef
|
feat: 移除了更新分支商品的冗余代码
|
2024-06-17 14:29:18 +08:00 |
|
|
|
5722cf09e7
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-17 14:28:21 +08:00 |
|
|
|
26f3117e89
|
feat: 修改了商品管理的逻辑，优化了商品更新流程，增加了对商品分类的更新操作。
|
2024-06-17 14:28:17 +08:00 |
|
liu
|
00ebf84f8e
|
合并冲突
|
2024-06-17 14:22:59 +08:00 |
|
liu
|
449a0a7d2e
|
起批量
|
2024-06-17 14:20:50 +08:00 |
|
|
|
65ecfcdcde
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-17 14:20:38 +08:00 |
|
|
|
b6211105c0
|
feat(store): 添加门店会员充值功能
|
2024-06-17 14:19:54 +08:00 |
|
liu
|
c3e6bdf5d0
|
新增门店收款和门店收款金额
|
2024-06-17 14:09:39 +08:00 |
|
|
|
b0bda50449
|
feat: 增加商品兑换功能
|
2024-06-17 13:47:45 +08:00 |
|
|
|
ed5d63035b
|
feat(StoreController): 更新了 StoreController 中的用户识别方式
|
2024-06-17 13:39:56 +08:00 |
|
|
|
f384483d22
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-17 13:38:46 +08:00 |
|
|
|
097ca47c07
|
feat: 添加批次字段到商品列表和逻辑类
|
2024-06-17 13:34:30 +08:00 |
|
liu
|
55c4d35849
|
修改查询逻辑
|
2024-06-17 11:52:13 +08:00 |
|
liu
|
2a9887e632
|
修改分类更新小程序查询的商户分类 更新短信验证码模板
|
2024-06-17 11:43:28 +08:00 |
|
|
|
f1219258c3
|
feat: 增加微信支付查询接口及条码支付功能
|
2024-06-17 11:04:23 +08:00 |
|
|
|
1eb395bbe0
|
feat: 修改了订单API，添加了支付通知逻辑
|
2024-06-17 10:51:55 +08:00 |
|
|
|
00a72c0b71
|
feat: 添加订单核销功能
|
2024-06-17 10:22:44 +08:00 |
|
|
|
950cd2fe3a
|
feat: 修改用户注册逻辑，增加默认值
|
2024-06-17 10:07:30 +08:00 |
|
|
|
0286d428e6
|
feat: 添加门店会员充值功能
|
2024-06-17 10:02:16 +08:00 |
|
|
|
04776f7b80
|
feat: 修改支付通知逻辑，引入UserSign模型，调整村长和队长订单获得兑换券逻辑，优化库存发送数据字段。
|
2024-06-16 20:52:11 +08:00 |
|
liu
|
87227e38fa
|
修改返回
|
2024-06-15 18:57:28 +08:00 |
|
liu
|
dc1fea9a15
|
充钱支付返回值修改
|
2024-06-15 18:52:20 +08:00 |
|
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 |
|
