|
3745015592
|
feat: 增加根据条件筛选订单功能
|
2024-08-02 17:44:00 +08:00 |
|
|
a573f817f5
|
1
|
2024-08-02 11:01:17 +08:00 |
|
|
d0842aadc5
|
1
|
2024-08-01 22:41:52 +08:00 |
|
|
66571b43a1
|
feat(purchase_order): 添加合并今日商户和平台订单功能
|
2024-08-01 18:03:45 +08:00 |
|
|
a6031b3318
|
feat(SystemStoreStorageLists): 优化了系统商店存储列表的商品名称和图片获取方式
|
2024-08-01 16:53:26 +08:00 |
|
|
a5ccb95cf2
|
feat: 修改仓库产品逻辑和库存发送队列,增加财务PM判断逻辑
|
2024-08-01 16:46:25 +08:00 |
|
|
e550772d12
|
feat: 添加仓库信息功能
|
2024-08-01 15:42:58 +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 |
|
|
d9bb85651e
|
1
|
2024-07-30 10:25:21 +08:00 |
|
|
ab62fbc3f1
|
Merge branch 'main' into dev
|
2024-07-29 17:40:22 +08:00 |
|
|
a746ed879f
|
feat: 修改OrderWetchaPushSend类以优化商品信息格式
|
2024-07-29 17:15:46 +08:00 |
|
|
b548c5f5c2
|
feat(OrderWetchaPushSend.php): 修改商品信息展示,增加单位显示
|
2024-07-29 16:42:45 +08:00 |
|
|
6879da0968
|
feat: 添加对store_id的查询条件
|
2024-07-29 15:59:12 +08:00 |
|
|
fa559efd5c
|
feat(OrderController): 修改拆单逻辑,增加退款判断
|
2024-07-29 15:06:33 +08:00 |
|
|
2d3b99b370
|
feat(OrderController): 增加退款申请成功后的返回信息
|
2024-07-29 14:39:44 +08:00 |
|
|
6a9dc9ddc2
|
feat: 重构订单退款逻辑并优化代码结构
|
2024-07-29 14:35:10 +08:00 |
|
|
71126e9ecb
|
feat(OrderLogic): 修正用户地址队伍拼接错误
|
2024-07-27 15:00:20 +08:00 |
|
|
3d7d447c7d
|
feat: 修改订单逻辑以处理用户地址信息
|
2024-07-27 14:56:35 +08:00 |
|
|
10fbddf295
|
feat: 修改订单逻辑以支持新字段rose
|
2024-07-27 14:52:46 +08:00 |
|
|
22c89d8ddd
|
feat(OrderEnum): 根据订单状态和退款状态更新订单类型
|
2024-07-27 10:16:28 +08:00 |
|
|
50dd13542e
|
feat(OrderEnum): 添加退货状态查询功能
|
2024-07-27 10:12:51 +08:00 |
|
|
ce0fa6c394
|
feat: 修改StoreOrder模型以处理订单状态的获取逻辑
|
2024-07-27 10:10:04 +08:00 |
|
|
1c1a34e618
|
feat(PayNotifyLogic): 修改用户支付通知逻辑,调整资金流动记录
|
2024-07-27 09:46:33 +08:00 |
|
|
1def86886d
|
feat: 增加对余额支付的处理逻辑
|
2024-07-27 09:34:38 +08:00 |
|
|
7e99a8afa9
|
feat(CapitalFlowLogic): 修改资金流水逻辑,增加支付类型判断
|
2024-07-27 09:24:44 +08:00 |
|
|
8f9ba883a2
|
feat(StoreOrderCartInfoLists): 修改商品信息查询逻辑
|
2024-07-26 11:55:19 +08:00 |
|
|
7264546a3a
|
feat(BaseLikeController): 对象数据转为数组
|
2024-07-26 11:36:53 +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 |
|
|
560c0d4320
|
Merge pull request 'dev' (#54) from dev into main
Reviewed-on: #54
|
2024-07-25 17:35:19 +08:00 |
|
|
f132fb7f9b
|
feat: 添加对不存在商品信息的过滤
|
2024-07-25 14:20:34 +08:00 |
|
|
de036da9fb
|
Merge pull request 'refactor(UserLists.php): 优化了会员时间的处理逻辑' (#53) from rose into dev
Reviewed-on: #53
|
2024-07-25 11:41:15 +08:00 |
|
|
f4d45c7e5e
|
refactor(UserLists.php): 优化了会员时间的处理逻辑
|
2024-07-25 11:37:13 +08:00 |
|
|
08a079ab15
|
Merge pull request 'feat(UserLists.php): 修改会员等级判断逻辑' (#52) from rose into dev
Reviewed-on: #52
|
2024-07-25 09:47:02 +08:00 |
|
|
fb5fe6574a
|
feat(UserLists.php): 修改会员等级判断逻辑
|
2024-07-25 09:46:43 +08:00 |
|
|
483c029388
|
Merge pull request 'feat: 添加了对用户列表查询中VIP时间的显示' (#51) from rose into dev
Reviewed-on: #51
|
2024-07-25 09:43:57 +08:00 |
|
|
dedf7434b3
|
feat: 添加了对用户列表查询中VIP时间的显示
|
2024-07-25 09:43:36 +08:00 |
|
|
7076f0bb30
|
Merge pull request 'feat: 添加了对会员时间的格式化处理' (#50) from rose into dev
Reviewed-on: #50
|
2024-07-25 09:39:50 +08:00 |
|
|
c94d247261
|
feat: 添加了对会员时间的格式化处理
|
2024-07-25 09:39:28 +08:00 |
|
|
d50382f17e
|
Merge pull request 'rose' (#49) from rose into dev
Reviewed-on: #49
|
2024-07-25 09:35:29 +08:00 |
|
|
d1e7124518
|
feat: 修正了用户订单中默认地址的获取逻辑,并添加了地址创建时间的记录。
|
2024-07-23 15:45:37 +08:00 |
|
|
9560b4f2be
|
feat: 添加地址API省份、城市、区、街道、村、队信息录入
|
2024-07-23 15:24:06 +08:00 |
|
|
ed8fdb3422
|
feat: 新增用户真实姓名字段及修改订单逻辑
|
2024-07-23 15:08:51 +08:00 |
|
|
31d4826466
|
feat: 添加'rose'属性到产品库存管理
|
2024-07-23 11:00:59 +08:00 |
|
|
fcdc6572f2
|
Merge pull request 'feat(order): 调整订单逻辑优先级' (#48) from dev into main
Reviewed-on: #48
|
2024-07-23 09:13:52 +08:00 |
|
|
26dd7aaeb7
|
feat(order): 调整订单逻辑优先级
|
2024-07-23 09:13:27 +08:00 |
|
|
9fc1675e29
|
Merge pull request 'feat(OrderLogic): 修正用户 ship 为 5 时订单价格计算逻辑' (#47) from dev into main
Reviewed-on: #47
|
2024-07-23 08:59:32 +08:00 |
|