|
|
f51c9174b6
|
feat: 新增创建用户记录功能
|
2024-06-22 17:04:28 +08:00 |
|
|
|
d930bebe6c
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-22 16:36:07 +08:00 |
|
|
|
cc537b8345
|
feat: 增加对用户充值列表的查询功能
|
2024-06-22 16:36:02 +08:00 |
|
liu
|
151ca4bf62
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-22 16:25:37 +08:00 |
|
liu
|
d8f6fce0a4
|
后台礼品券购买,修改小程序下单展示
|
2024-06-22 16:25:20 +08:00 |
|
|
|
1feb8d5a01
|
feat: 修改用户充值列表查询逻辑
|
2024-06-22 16:25:10 +08:00 |
|
|
|
025134aacd
|
feat: 新增用户标签功能
|
2024-06-22 16:21:46 +08:00 |
|
|
|
149946b45f
|
feat: 增加根据充值类型获取用户真实姓名和标签名称的功能
|
2024-06-22 16:02:27 +08:00 |
|
|
|
bac0c6042d
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-22 15:50:30 +08:00 |
|
|
|
32baf07c71
|
feat: 根据用户ID调整用户等级和订单查询条件
|
2024-06-22 15:50:26 +08:00 |
|
liu
|
bfddf7ffa1
|
排序和修改后台用户流水相关的操作
|
2024-06-22 15:36:48 +08:00 |
|
liu
|
6619f6ae21
|
小程序明细相关
|
2024-06-22 15:34:34 +08:00 |
|
|
|
c19ba84f06
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-22 15:27:43 +08:00 |
|
|
|
d1b23d8709
|
feat: 修改订单列表和商品统计逻辑
|
2024-06-22 15:27:39 +08:00 |
|
liu
|
f5819b849b
|
回调系统增加余额加入资金流水
|
2024-06-22 15:15:11 +08:00 |
|
|
|
b21c74f103
|
feat(IndexController): 根据store_id调整统计逻辑
|
2024-06-22 15:07:41 +08:00 |
|
|
|
fd0b942c85
|
feat(WorkbenchController): 根据日期参数动态生成图表数据
|
2024-06-22 14:56:13 +08:00 |
|
|
|
13987de998
|
feat: 修改工作台逻辑以计算退款价格
|
2024-06-22 14:34:44 +08:00 |
|
|
|
f2d7ad149b
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-22 14:33:20 +08:00 |
|
|
|
131dab078a
|
feat: 修改工作台逻辑以适应退款状态变更
|
2024-06-22 14:33:15 +08:00 |
|
liu
|
5b8e557ba2
|
用户相关明细
|
2024-06-22 14:25:32 +08:00 |
|
|
|
2f756f10d7
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-22 14:17:01 +08:00 |
|
|
|
1b9f8ca9d3
|
feat: 修改了订单收益金额和收款金额的计算方式，并添加了保证金金额的计算。
|
2024-06-22 14:16:56 +08:00 |
|
liu
|
ef063da426
|
新增购物车列表扣款逻辑相关信息
|
2024-06-22 14:04:18 +08:00 |
|
|
|
abf031e75a
|
feat: 修改订单统计逻辑以区分已支付用户
|
2024-06-22 13:45:23 +08:00 |
|
|
|
09dff2250e
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-22 13:44:06 +08:00 |
|
|
|
30744407c7
|
feat(WorkbenchLogic): 修改了访客数和付款转化率的计算方式
|
2024-06-22 13:43:57 +08:00 |
|
liu
|
ca6734a647
|
同步修改计量单位
|
2024-06-22 13:39:58 +08:00 |
|
liu
|
0ff53aa4a7
|
回调处理直接给商家加上保证金
|
2024-06-22 13:37:02 +08:00 |
|
|
|
304f6ba303
|
feat(WorkbenchLogic): 优化支付时间格式处理
|
2024-06-22 11:46:48 +08:00 |
|
|
|
328e1cbd9a
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-22 11:39:56 +08:00 |
|
|
|
8faafdf164
|
feat: 添加微信支付和支付宝支付条码支付功能
|
2024-06-22 11:39:52 +08:00 |
|
liu
|
88c6c8aa7b
|
待完善返冻结相关返利
|
2024-06-22 11:38:10 +08:00 |
|
|
|
7c60652624
|
feat(WorkbenchLogic): 添加财务类型和财务项目管理
|
2024-06-22 11:33:36 +08:00 |
|
|
|
2a95eb8e1f
|
feat: 修改了交易统计逻辑，移除了不必要的余额支付计算，并调整了线下收款和总交易额的计算方式。
|
2024-06-22 11:19:56 +08:00 |
|
|
|
22579a624a
|
feat(WorkbenchLogic): 修改订单列表查询限制从10到6
|
2024-06-22 11:16:27 +08:00 |
|
|
|
d7774568ac
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-22 11:12:49 +08:00 |
|
|
|
ff65d32a80
|
feat: 添加了两个新的模型类 StoreOrderTransshipment 和 StoreOrderTransshipmentInfo
|
2024-06-22 11:12:39 +08:00 |
|
liu
|
4d87e7f3fd
|
注释限制金额调试
|
2024-06-22 11:07:20 +08:00 |
|
liu
|
8045c84b1c
|
修改字段
|
2024-06-22 11:05:18 +08:00 |
|
liu
|
1e88e5deed
|
处理收银台数量统计
|
2024-06-22 10:52:31 +08:00 |
|
liu
|
d4db924410
|
注释校验
|
2024-06-22 10:21:52 +08:00 |
|
|
|
d5255e38bb
|
feat: 修改门店收款金额计算逻辑
|
2024-06-22 10:09:14 +08:00 |
|
|
|
ccdbb687a5
|
feat: 修改了WorkbenchLogic逻辑，优化了代码结构，统一了查询条件，并调整了部分方法的参数。
|
2024-06-22 10:07:28 +08:00 |
|
|
|
e25fe49941
|
feat: 修改统计逻辑以计算总金额
|
2024-06-22 09:47:11 +08:00 |
|
|
|
f2c9bbdb7b
|
refactor(TradeStatisticLogic): 移除不必要的变量赋值
|
2024-06-21 18:16:21 +08:00 |
|
|
|
28a56119d4
|
refactor: 移除支出金额计算代码
|
2024-06-21 18:11:01 +08:00 |
|
|
|
dfa2c4d83b
|
feat(TradeStatisticLogic): 修改现金金额描述为现金收银金额
|
2024-06-21 18:08:01 +08:00 |
|
|
|
2bec4ba97c
|
feat(ProductStatisticLogic): 修改商品统计逻辑并优化查询性能
|
2024-06-21 18:05:28 +08:00 |
|
|
|
3c0848a4e4
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-21 17:28:12 +08:00 |
|
