|
|
f120ad28be
|
Merge pull request 'feat(StoreOrderCartInfoGroupLists, StoreOrderCartInfoTwoLists): 优化了商品单位、分类和店铺名称的获取方式，增加了空值处理' (#82) from erp into rose
Reviewed-on: #82
|
2024-08-02 19:58:21 +08:00 |
|
|
|
5863d9d113
|
feat(StoreOrderCartInfoGroupLists, StoreOrderCartInfoTwoLists): 优化了商品单位、分类和店铺名称的获取方式，增加了空值处理
|
2024-08-02 19:56:15 +08:00 |
|
|
|
b7ea08c41c
|
Merge pull request 'feat(StoreOrderCartInfoController): 添加了列表二功能及对应搜索条件' (#81) from erp into rose
Reviewed-on: #81
|
2024-08-02 19:46:23 +08:00 |
|
|
|
315fd540ba
|
feat(StoreOrderCartInfoController): 添加了列表二功能及对应搜索条件
|
2024-08-02 19:43:21 +08:00 |
|
|
|
4e9857d9f5
|
Merge pull request 'feat: 增加根据条件筛选订单功能' (#80) from erp into rose
Reviewed-on: #80
|
2024-08-02 17:48:33 +08:00 |
|
|
|
3745015592
|
feat: 增加根据条件筛选订单功能
|
2024-08-02 17:44:00 +08:00 |
|
|
|
57997f4a19
|
Merge remote-tracking branch 'origin/dev' into rose
|
2024-08-02 15:53:54 +08:00 |
|
|
|
e4b785e186
|
feat: 修改了商品支付金额、礼品券消耗、充值金额等交易统计逻辑，并更新了相关描述。
|
2024-08-02 15:52:12 +08:00 |
|
|
|
e36c9416c4
|
Merge pull request '1' (#77) from erp into rose
Reviewed-on: #77
|
2024-08-02 11:02:42 +08:00 |
|
|
|
a573f817f5
|
1
|
2024-08-02 11:01:17 +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 |
|
|
|
66571b43a1
|
feat(purchase_order): 添加合并今日商户和平台订单功能
|
2024-08-01 18:03:45 +08:00 |
|
|
|
4711643bb8
|
Merge pull request 'feat(SystemStoreStorageLists): 优化了系统商店存储列表的商品名称和图片获取方式' (#75) from erp into rose
Reviewed-on: #75
|
2024-08-01 16:53:53 +08:00 |
|
|
|
a6031b3318
|
feat(SystemStoreStorageLists): 优化了系统商店存储列表的商品名称和图片获取方式
|
2024-08-01 16:53:26 +08:00 |
|
|
|
af6e8e2387
|
Merge pull request 'feat: 修改仓库产品逻辑和库存发送队列，增加财务PM判断逻辑' (#74) from erp into rose
Reviewed-on: #74
|
2024-08-01 16:47:05 +08:00 |
|
|
|
a5ccb95cf2
|
feat: 修改仓库产品逻辑和库存发送队列，增加财务PM判断逻辑
|
2024-08-01 16:46:25 +08:00 |
|
|
|
55daad5815
|
Merge pull request 'feat: 添加仓库信息功能' (#73) from erp into rose
Reviewed-on: #73
|
2024-08-01 15:46:53 +08:00 |
|
|
|
e550772d12
|
feat: 添加仓库信息功能
|
2024-08-01 15:42:58 +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 |
|
|
|
a790577276
|
Merge pull request 'dev' (#61) from dev into rose
Reviewed-on: #61
|
2024-07-29 14:43:37 +08:00 |
|
|
|
6a9dc9ddc2
|
feat: 重构订单退款逻辑并优化代码结构
|
2024-07-29 14:35:10 +08:00 |
|
|
|
518d9fe064
|
Merge branch 'rose' of https://gitea.lihaink.cn/mkm/multi-store into rose
|
2024-07-27 11:52:44 +08:00 |
|
|
|
99dc835cb1
|
feat: 添加'开通时间'字段到用户列表，修改线下分润、支付通知等逻辑
|
2024-07-27 11:52:31 +08:00 |
|
|
|
22c89d8ddd
|
feat(OrderEnum): 根据订单状态和退款状态更新订单类型
|
2024-07-27 10:16:28 +08:00 |
|
|
|
8f9ba883a2
|
feat(StoreOrderCartInfoLists): 修改商品信息查询逻辑
|
2024-07-26 11:55:19 +08:00 |
|
|
|
4e67edcc77
|
feat: 添加真实姓名字段到用户列表
|
2024-07-26 11:31:05 +08:00 |
|
|
|
945fdac2c2
|
feat: 添加门店ID字段到用户列表
|
2024-07-26 10:17:30 +08:00 |
|
|
|
0c1b3ed5da
|
feat(UserLists.php): 移除用户编号列
|
2024-07-26 10:06:58 +08:00 |
|
|
|
f4d45c7e5e
|
refactor(UserLists.php): 优化了会员时间的处理逻辑
|
2024-07-25 11:37:13 +08:00 |
|
|
|
fb5fe6574a
|
feat(UserLists.php): 修改会员等级判断逻辑
|
2024-07-25 09:46:43 +08:00 |
|
|
|
dedf7434b3
|
feat: 添加了对用户列表查询中VIP时间的显示
|
2024-07-25 09:43:36 +08:00 |
|
|
|
c94d247261
|
feat: 添加了对会员时间的格式化处理
|
2024-07-25 09:39:28 +08:00 |
|
|
|
31d4826466
|
feat: 添加'rose'属性到产品库存管理
|
2024-07-23 11:00:59 +08:00 |
|
|
|
02aa52cd3f
|
feat: 增加'receipts'字段更新功能和用户收货地址查询
|
2024-07-22 17:03:16 +08:00 |
|
|
|
5b95bfcd49
|
feat: 修改了商品删除功能和购物车列表API
|
2024-07-22 13:54:56 +08:00 |
|
|
|
f08fcc575c
|
feat: 修改UserLists类以支持更多搜索字段
|
2024-07-20 16:48:42 +08:00 |
|
|
|
1fdedb2bc7
|
feat: 增加'store_id'和'user_ship'搜索条件
|
2024-07-20 16:31:11 +08:00 |
|
|
|
05f77fe9d2
|
refactor(UserRechargeLists): 修改已支付和未支付的状态显示
|
2024-07-19 17:48:44 +08:00 |
|
|
|
443a50b0fe
|
feat(ProductLogic): 添加新功能以计算店铺产品销售数据
|
2024-07-15 12:20:20 +08:00 |
|
|
|
75c6e3b05a
|
feat(UserLogic): 优化用户地址查询逻辑
|
2024-07-13 11:22:12 +08:00 |
|
liu
|
073042e3da
|
增加字段
|
2024-07-10 14:43:55 +08:00 |
|
liu
|
511380c0e4
|
修改限制查询
|
2024-07-10 14:42:46 +08:00 |
|
liu
|
4de5aef537
|
修改收银台预约记录
|
2024-07-10 11:55:30 +08:00 |
|
liu
|
daf05f3314
|
补充核销码
|
2024-07-10 11:20:29 +08:00 |
|
liu
|
6196e08f81
|
小程序预约商品提货记录
|
2024-07-10 11:17:46 +08:00 |
|
liu
|
74c0456f1a
|
商品规格
|
2024-07-08 16:09:03 +08:00 |
|
