79 Commits

Author SHA1 Message Date
puhui999
69eb2c0f3a 完善订单详情和售后退款 TODO 提到的问题
(cherry picked from commit 73628d39309854e7c086a660efe7dc866a7faceb)
2023-09-25 12:30:24 +08:00
owen
b398062102 trade: 分销业务从 member 模块 转移到 trade模块
(cherry picked from commit 1e2120806d26f0749b89329b0dd94f0fa5d15edc)
2023-09-25 12:30:17 +08:00
owen
d33f42a525 trade: 分销业务从 member 模块 转移到 trade模块
(cherry picked from commit 2ed5d12be8c01bf8ed280086ef5b870f82553966)
2023-09-25 12:30:13 +08:00
owen
f5804431a3 trade: 增加交易中心配置表
(cherry picked from commit 35664d1f3296712e741b4f7e93830c4fdd76e799)
2023-09-25 12:30:09 +08:00
puhui999
c960ba1e20 完善订单详情和售后退款日志展示样式重构
(cherry picked from commit 46fd154e3a77189b9ad748e57e13ab7f2b6aae93)
2023-09-25 12:24:59 +08:00
owen
6f8dc79283 promotion: 优惠券模板 productSpuIds 改成 productScopeValues
(cherry picked from commit 5f557c7be5e06f9734bbc90ef4b4fe31b6bd9e25)
2023-09-20 12:39:13 +08:00
owen
842c922855 mall:优惠券发送优化
(cherry picked from commit 76c4644b4b9d292643672666fa06363e0c6c8908)
2023-09-20 12:38:35 +08:00
puhui999
d740a4d894 订单管理:完善订单详情
(cherry picked from commit f0249e94a5829fb3fa2eff0b1b9955c96e0ebe6d)
2023-09-20 12:34:53 +08:00
YunaiV
8364e52477 code review:售后详情
(cherry picked from commit 29b8d06ff272f2bde5275a74d4d2b99362e19648)
2023-09-20 12:32:48 +08:00
owen
c999b72692 mall:优惠券 商品适用范围,增加商品分类
(cherry picked from commit 27219e1833f49fa60acc2d7809f2f7497230a2e4)
2023-09-20 12:30:42 +08:00
puhui999
c738fd417a 订单售后列表:完善售后详情及相关操作
(cherry picked from commit ed739aec551cb6fad7a462cbd24e8bdea4b99b28)
2023-09-20 12:30:14 +08:00
puhui999
52776c97da 订单售后列表:初始化售后详情
(cherry picked from commit 8a51c9c771472ebe7ccf21ad986d03c4e4b354e4)
2023-09-20 12:25:56 +08:00
puhui999
875211e24f 订单售后列表:重构列表
(cherry picked from commit 4f81468695f19586aef9a3bbf4ed93dd13d697a3)
2023-09-20 12:25:50 +08:00
owen
529ac7d347 mall: 完善后台发送优惠券
(cherry picked from commit beef6a0a9478dd43c2c91d537097c169e3c156c7)
2023-09-20 12:25:36 +08:00
owen
1a49567613 商品:完善后台商品评论功能
(cherry picked from commit 814b4631c944a4657128210378bda40294628b3f)
2023-09-20 12:19:40 +08:00
puhui999
9d9ccaa1b8 完善 code review 提到的问题
(cherry picked from commit 7db6c121bb6e788bf4b05a0772a510cdcb3d9ed1)
2023-09-20 12:18:16 +08:00
YunaiV
46ab58ddf0 code review:订单列表、订单详情
(cherry picked from commit cfbc2ed74cd2854266746c88545affb85fb79551)
2023-09-20 12:14:05 +08:00
puhui999
edb88f8548 订单列表:列表重构 添加门店、物流检索条件
(cherry picked from commit 5dceda614ab3804196f0ad7ad103ac347bc6fe9a)
2023-09-20 12:12:58 +08:00
puhui999
99ef6f83ba 订单列表:列表重构: 完善订单发货、修改地址、订单调价、订单备注
(cherry picked from commit be143ea21b70f2281c3f302fbacfd7dc07ab3ed4)
2023-09-20 12:12:52 +08:00
puhui999
9efe122318 订单列表:列表重构 ③ 添加备注表单和发货表单
(cherry picked from commit 0d202a7a85782b97c03827fa26b9716ad9727d4f)
2023-09-20 12:11:09 +08:00
puhui999
c89d08e22a 订单列表:列表重构 ② and 完善订单详情
(cherry picked from commit 345c09ee6ce5a3c8893bef56c8334573fb0d9bf8)
2023-09-20 12:10:57 +08:00
puhui999
21643274cb 订单列表:列表重构 ①
(cherry picked from commit 2eb740765e76e7ea4e4559de5441e2c3e7c9993e)
2023-09-19 21:03:26 +08:00
puhui999
1854e891cb fix: 完善砍价活动管理对齐后端
(cherry picked from commit 44be35b5ce3159b525d17ab7abbd931c114867e8)
2023-09-19 20:53:01 +08:00
YunaiV
81d8e36ccc 商城:
1. 修复拼团活动,修改商品的拼团价格,会存在 *100 的问题

(cherry picked from commit 127e6b202edce8b41cdcd3e726eb4fde45b12441)
2023-09-19 20:50:49 +08:00
YunaiV
0fd07c0cbc 商城:
1. 调整优惠劵的目录
2. 简化秒杀时间配置

(cherry picked from commit 9984de0dc7251779434a5bf95c3aa9aab3c4cd65)
2023-09-19 20:50:06 +08:00
puhui999
541fc97796 feat: 完善砍价活动管理
(cherry picked from commit 49477169837c87c5590ee4c31945d285792a7375)
2023-09-19 20:36:04 +08:00
puhui999
da5ad39251 fix: combinationActivity 调整
(cherry picked from commit c327f79177f000edab15c8304d73ed5bc7c910bd)
2023-09-19 20:24:40 +08:00
shizhong
74aac991bc 发布 1.8.0 版本 2023-07-27 20:53:52 +08:00
YunaiV
2104de6a71 review 秒杀、拼团活动的 CRUD
(cherry picked from commit a003b59e3920dfd4a3536b7314857a5c2f5838fd)
2023-07-27 19:51:42 +08:00
puhui999
84d538ad69 fix: 完善拼团活动 CRUD
(cherry picked from commit dc39ad0cd1b5bc4a12983b971449ca1a6792d4b9)
2023-07-27 19:45:36 +08:00
puhui999
85cc7cdb46 fix: mall SeckillConfig
(cherry picked from commit 3fd9f1b43e42a10feb6fd04b2d9dbc2ab5f6edd6)
2023-07-27 19:43:51 +08:00
puhui999
0394f81dab fix: mall SeckillActivity and CombinationActivity
(cherry picked from commit 40571302753292182bb8a7052aae1fb6f3117503)
2023-07-27 19:41:21 +08:00
puhui999
d1cc7d134b fix: mall SeckillActivity
(cherry picked from commit ce3ca7c6cef7dbe18b224f831be4fae75d9407b2)
2023-07-27 19:41:03 +08:00
puhui999
de53abb249 fix: mall SeckillActivity
(cherry picked from commit 36c0bce1845b288ec1ea2f5f1528c07247502c21)
2023-07-27 19:40:57 +08:00
puhui999
1ab348f8df fix: mall SeckillActivity
(cherry picked from commit b98149f1a75058edc9e85914772a1ae4cacf479d)
2023-07-27 19:40:48 +08:00
puhui999
22f869db89 feat: mall CombinationActivity
(cherry picked from commit 2e96b1c9840b7adfbc8110eb3a36bd2b406dc392)
2023-07-27 19:36:45 +08:00
puhui999
1d0d9d24ad fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件
(cherry picked from commit 51e79f29cc70ad1670b93829bab3d5d23751c263)
2023-07-27 19:35:12 +08:00
YunaiV
a22eea8e90 review 营销活动
(cherry picked from commit 5d613e69b3d651806f7710eebb2b14e5c7034097)
2023-07-27 19:34:54 +08:00
puhui999
70c2fe409c fix:完善秒杀活动管理①
(cherry picked from commit b1e7f149638243885ae97f6c31f5df24d9b6ffa2)
2023-07-27 19:33:06 +08:00
puhui999
7da1b04ae2 feat:添加秒杀活动管理
(cherry picked from commit 3d47d6744e0dd78d4df350c5eb6421dba889f8af)
2023-07-27 19:27:44 +08:00
xiaobai
1b5c983d1d 提交订单页面和详情页面 20230619
(cherry picked from commit 42a7aec0b51c4c9f0d2588972a3fddfd3bd2f981)
2023-07-27 19:15:56 +08:00
puhui999
0f9629707f feat: 完事秒杀时段管理
(cherry picked from commit f7b195b226308e4f016817a1bba5ca1a52921906)
2023-07-27 19:14:57 +08:00
puhui999
a233d16dbb feat: 秒杀时段管理
(cherry picked from commit a75720ec0646f4fe5bdf21126bd5c3cf719170e9)
2023-07-27 19:14:47 +08:00
YunaiV
8bf1f04044 code review:订单列表
(cherry picked from commit e3f250fff07ee496c54050d1ed28041c9786d0fd)
2023-07-27 19:11:50 +08:00
xiaobai
b9ba1d36c2 20230606 add trade-order and details
(cherry picked from commit 985d764f623e24402b1ba91562d2994b28d1aeec)
2023-07-27 18:54:36 +08:00
YunaiV
f641785df9 code review:优惠劵管理
(cherry picked from commit 51e76ffd53aa1cc76f85cfb4389ac257f2804f8a)
2023-07-27 18:53:49 +08:00
shizhong
0d0b2265c6 !164 优惠券迁移vue3 Merge pull request !164 from dhb52/dev 2023-07-27 18:53:17 +08:00
YunaiV
16c518e18a code review:门店自提、快递运费
(cherry picked from commit 60c1604d4947df8f2eaaa748780af9db9f75831f)
2023-07-27 18:46:14 +08:00
xiaobai
a29421dd41 临时提交
(cherry picked from commit 505f5cfa0c543f779abe43d6d77f260991486fdf)
2023-07-27 18:44:50 +08:00
dhb52
e2faf6a2a4 style: 添加VO
(cherry picked from commit c5a7d05821d4eae7197cbd0dba66f544ee214ecc)
2023-07-27 18:42:44 +08:00