|
|
9fc4095563
|
Merge pull request 'dev' (#98) from dev into rose
Reviewed-on: #98
|
2024-08-04 13:13:32 +08:00 |
|
|
|
748c3c7267
|
feat(TradeStatisticLogic, UserStatisticLogic): Update statistic logic, optimize payment type filter conditions, adjust statistical methods
|
2024-08-04 10:32:28 +08:00 |
|
|
|
37c9cbd064
|
Merge pull request 'erp' (#76) from erp into rose
Reviewed-on: #76
|
2024-08-01 22:54:19 +08:00 |
|
|
|
d0842aadc5
|
1
|
2024-08-01 22:41:52 +08:00 |
|
|
|
a54adbd928
|
Merge pull request 'erp' (#72) from erp into rose
Reviewed-on: #72
|
2024-08-01 14:06:51 +08:00 |
|
|
|
75a2338337
|
feat: 添加了仓库产品确认操作
|
2024-08-01 13:59:30 +08:00 |
|
|
|
a441b94e94
|
feat: 添加仓库和商品仓储信息的管理功能
|
2024-07-31 18:07:22 +08:00 |
|
|
|
ddaef44baf
|
feat: 新增采购订单列表及详情模型与控制器
|
2024-07-30 17:19:09 +08:00 |
|
|
|
c1a0b6adec
|
Merge pull request 'feat(OrderEnum): 根据订单状态和退款状态更新订单类型' (#60) from dev into rose
Reviewed-on: #60
|
2024-07-27 10:16:58 +08:00 |
|
|
|
22c89d8ddd
|
feat(OrderEnum): 根据订单状态和退款状态更新订单类型
|
2024-07-27 10:16:28 +08:00 |
|
|
|
81072d2859
|
Merge pull request 'feat(OrderEnum): 添加退货状态查询功能' (#59) from dev into rose
Reviewed-on: #59
|
2024-07-27 10:13:28 +08:00 |
|
|
|
50dd13542e
|
feat(OrderEnum): 添加退货状态查询功能
|
2024-07-27 10:12:51 +08:00 |
|
|
|
af37f15da3
|
Merge pull request 'feat: 修改StoreOrder模型以处理订单状态的获取逻辑' (#58) from dev into rose
Reviewed-on: #58
|
2024-07-27 10:10:56 +08:00 |
|
|
|
ce0fa6c394
|
feat: 修改StoreOrder模型以处理订单状态的获取逻辑
|
2024-07-27 10:10:04 +08:00 |
|
|
|
1ffd1193c1
|
feat: 添加了根据毛利率计算产品流的功能
|
2024-07-25 17:33:05 +08:00 |
|
liu
|
29772c4fb4
|
用户领取礼品列表
|
2024-07-03 15:43:02 +08:00 |
|
|
|
78a44016e5
|
rename: 重命名用户签到模型文件
|
2024-07-02 11:46:40 +08:00 |
|
|
|
4b849edc76
|
feat(UserController): 更新用户签到逻辑，修复积分计算错误
|
2024-07-02 11:02:00 +08:00 |
|
liu
|
f96538a4b4
|
调用修复
|
2024-06-29 14:55:46 +08:00 |
|
|
|
ed983e0971
|
更新UserShip模型与相关控制器
|
2024-06-29 14:46:23 +08:00 |
|
|
|
af75268604
|
feat: 添加订单存储功能
|
2024-06-25 16:05:29 +08:00 |
|
|
|
f51c9174b6
|
feat: 新增创建用户记录功能
|
2024-06-22 17:04:28 +08:00 |
|
|
|
ff65d32a80
|
feat: 添加了两个新的模型类 StoreOrderTransshipment 和 StoreOrderTransshipmentInfo
|
2024-06-22 11:12:39 +08:00 |
|
|
|
fb67788183
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-21 14:42:46 +08:00 |
|
|
|
5e54943d4c
|
feat: 修改了订单相关的API文档和逻辑
|
2024-06-21 14:42:36 +08:00 |
|
liu
|
957f8ba187
|
修改模型关联
|
2024-06-21 14:11:32 +08:00 |
|
|
|
c99b68f65b
|
refactor: 移除了StoreOrder模型的getPayTimeAttr方法
|
2024-06-21 13:37:36 +08:00 |
|
|
|
e721b96263
|
feat: 添加新的支付方式统计功能
fix: 修复商品退款金额统计错误的bug
refactor: 重构代码，优化代码结构
style: 代码风格优化，添加缺失的分号
test: 添加商品退款金额的测试
docs: 更新商品退款金额的文档说明
build: 更新项目依赖
ops: 更新部署脚本
chore: 更新项目版本
|
2024-06-21 11:18:03 +08:00 |
|
|
|
3bdd52e460
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-20 18:13:25 +08:00 |
|
|
|
6db0b6fc47
|
feat: 添加积分记录功能并优化财务流查询
|
2024-06-20 18:13:20 +08:00 |
|
liu
|
9e30337399
|
修改商品统计代码
|
2024-06-20 17:45:36 +08:00 |
|
|
|
b8038b820a
|
feat(TradeStatisticLogic): 修改TradeStatisticLogic，优化本月支付人数曲线查询
|
2024-06-20 14:45:24 +08:00 |
|
|
|
67532a536a
|
feat: 重构了订单相关的统计逻辑和代码结构
|
2024-06-20 14:37:06 +08:00 |
|
|
|
140fe814c2
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-20 14:19:18 +08:00 |
|
|
|
13a5b9bb0e
|
feat: 添加工作台功能和门店统计页面
|
2024-06-20 14:19:09 +08:00 |
|
liu
|
6cbffc01a8
|
新增店铺明细查询数据
|
2024-06-20 11:41:14 +08:00 |
|
|
|
283e8f1747
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-20 11:08:43 +08:00 |
|
|
|
557170ce74
|
feat: 修改了交易统计逻辑，添加了交易统计的接口
|
2024-06-20 11:08:06 +08:00 |
|
liu
|
947b0a72fb
|
用户后台新增相关数据
|
2024-06-20 10:09:15 +08:00 |
|
|
|
e210bb7906
|
feat(WorkbenchController): 修改本月订单数和本月支付人数的统计方式
|
2024-06-18 18:14:25 +08:00 |
|
|
|
204e7f006d
|
feat: 添加用户标签功能
|
2024-06-17 17:06:25 +08:00 |
|
liu
|
2a9887e632
|
修改分类更新小程序查询的商户分类 更新短信验证码模板
|
2024-06-17 11:43:28 +08:00 |
|
|
|
04776f7b80
|
feat: 修改支付通知逻辑，引入UserSign模型，调整村长和队长订单获得兑换券逻辑，优化库存发送数据字段。
|
2024-06-16 20:52:11 +08:00 |
|
liu
|
545e01e75a
|
新增采购款支付方式和预留用户分享逻辑
|
2024-06-15 10:49:53 +08:00 |
|
|
|
975a296b46
|
feat: 添加库存类型参数和库存处理逻辑
|
2024-06-15 10:18:32 +08:00 |
|
liu
|
3bbf947674
|
财务上传凭证相关
|
2024-06-14 15:34:50 +08:00 |
|
liu
|
f0b2b3cc5a
|
店铺提现相关流程
|
2024-06-14 13:54:37 +08:00 |
|
liu
|
0e351d2344
|
地址处理
|
2024-06-11 14:29:57 +08:00 |
|
|
|
3618a0bfee
|
feat: 增加微信支付回调处理逻辑
|
2024-06-08 18:14:11 +08:00 |
|
|
|
a4ae19a64a
|
调整账单导出
|
2024-06-07 14:22:28 +08:00 |
|
