448 Commits

Author SHA1 Message Date
puhui999
22449ed21a 拼团记录:接口对接
(cherry picked from commit c445173855aece19a97a548bacad624c8414ad31)
2024-03-05 16:04:39 +08:00
owen
e30e0e2d32 统计:交易统计Review修改
(cherry picked from commit 2a58b04a9835b741c61a11b849ea36fb2f4210fc)
2024-03-05 16:03:05 +08:00
YunaiV
2b4c192423 promotion:调整拼团活动的界面
(cherry picked from commit 78062dd474a9fcecbeec46b436b17d8f7f43883b)
2024-03-05 16:03:00 +08:00
YunaiV
be2f92754b promotion:新增记录记录列表
(cherry picked from commit cf7ac2cb10f2cf6196c8fb4a2a7aaf3db7b98f1c)
2024-03-05 15:58:09 +08:00
YunaiV
d9ec3f6e61 promotion:新增砍价记录列表
(cherry picked from commit 860872a8908db18fa2c87e3c5096bfc1c287f5a6)
2024-03-05 15:58:04 +08:00
owen
cbba91dac5 交易:核销
(cherry picked from commit 58b6b1ba578c1f869a82bfd028e86543092419e9)
2024-03-05 15:57:14 +08:00
YunaiV
e92709da70 promotion:优化秒杀活动的界面
(cherry picked from commit 7c491ff62a619854cc24c029fc36bff208527c8f)
2024-03-05 15:57:09 +08:00
YunaiV
7d44b98116 trade:优化运费模版的实现
(cherry picked from commit a9bbbc7b0acbb8d4ac6dd6435f3f1c74067fd866)
2024-03-05 15:54:35 +08:00
YunaiV
6a8aa02960 trade:完善订单详情
(cherry picked from commit 4fddbccea17327c11f2a00be57b35a6495d219b6)
2024-03-05 15:53:59 +08:00
YunaiV
a83db39abf trade:微调 order 列表界面
(cherry picked from commit 588ce1c9aeb2884b7a1194107e25bc754a445f4a)
2024-03-05 15:53:54 +08:00
owen
e05b749e4d 会员:会员配置的积分相关字段加上point前缀
(cherry picked from commit 3a96812d472f4976ac2a52ba069773a53a933450)
2024-03-05 15:53:20 +08:00
owen
24a650d89b 会员:积分配置改为会员配置
(cherry picked from commit 3ab1ed707f9821246f62f8b0fb52e80fa7aa86de)
2024-03-05 15:53:16 +08:00
owen
6b6c9f5f02 签到:签到后增加用户积分、经验
(cherry picked from commit 0066d79876b7c406bf70d4c03f4eeed2d3ede5e5)
2024-03-05 15:52:41 +08:00
owen
18bdea83be 会员详情,修改会员积分
(cherry picked from commit 4b7e57e67d51631662625b1f62ee788693edc82f)
2024-03-05 15:52:21 +08:00
owen
05e6668322 会员详情,查询钱包信息
(cherry picked from commit 675f3df5cbc8623058ae75ef5a4ca4a92334b8d0)
2024-03-05 15:50:46 +08:00
owen
9b4bb4025b 统计:交易统计
(cherry picked from commit c322fb3d0d6624907fca85a2454a10e7bcc87083)
2024-03-05 15:50:37 +08:00
owen
75e0a701f3 分销:修正分享海报
(cherry picked from commit a5dd7f4a81c29cc8a18aeb243a859c7d10834957)
2024-03-05 13:14:55 +08:00
owen
28d312c857 分销:重命名提现类型字段
(cherry picked from commit 2c22ef8ef1744b8fd1b70868c177ba180404a9e2)
2024-03-05 13:14:11 +08:00
shizhong
2c74888712 feat: 【工作流】--委派 2023-09-26 19:56:57 +08:00
YunaiV
d46b9deb18 code review:驳回逻辑
(cherry picked from commit 245147223f5943164f30211bb3fe94fe2f818824)
2023-09-25 13:32:48 +08:00
kehaiyou
0bef9924fe fix: 【工作流】--回退的高亮和api地址更换
(cherry picked from commit f40d1de62a7cee36fd36afd8dcb210ef84bcb684)
2023-09-25 13:30:17 +08:00
kehaiyou
6888fd90d1 feat: 支持回退按钮
(cherry picked from commit de79e79d91f4949df9314f2238a30c9bd319eafe)
2023-09-25 13:15:55 +08:00
owen
36f6745ecb trade: 分销业务 - 佣金提现后台管理
(cherry picked from commit 854acf6e703c238056bd7a91a2f1f117ef5d5eea)
2023-09-25 12:48:07 +08:00
puhui999
9607127897 spu:分佣属性和分佣保持一致
(cherry picked from commit 5dc0c6e3da8e7d200773d79cb31d699004b6cd6d)
2023-09-25 12:43:15 +08:00
puhui999
2e4cad38bb mall-order:修复 todo 提到的问题
(cherry picked from commit 7e511d1e4f0b7c412245b43bd56f36074564a616)
2023-09-25 12:42:27 +08:00
owen
ad35b40a76 trade: 分销业务后台功能:修改上级推广人
(cherry picked from commit 5ed909263a55ed41b6c31befebeb2eae115bf7a7)
2023-09-25 12:42:08 +08:00
owen
9dbf4feeae trade: 分销业务后台功能:清除推广员、修改推广资格
(cherry picked from commit 7ea35713566f786fd398e72121174bebfc4ab139)
2023-09-25 12:42:04 +08:00
YunaiV
ca0ec86913 code review:会员详情
(cherry picked from commit 0e2ea3959164c2b5719bb906ee5408e92890981b)
2023-09-25 12:41:27 +08:00
YunaiV
58f01a8bc5 code review:完善订单详情和售后退款 TODO 提到的问题
(cherry picked from commit 3c315cf28799362c1d8b34fdf862b1fadf7db3ad)
2023-09-25 12:38:53 +08:00
owen
f0d95e4a93 trade: 优化分销用户佣金字段名称
(cherry picked from commit e9d5027e72d86c308b766d08936e15d4217301c1)
2023-09-25 12:38:25 +08:00
owen
91ab91fdbb trade: 优化分销用户绑定用户编号、绑定时间字段名称
(cherry picked from commit 726331541222c7822695b88f709a7db8f1df9d10)
2023-09-25 12:38:22 +08:00
owen
eab116cfce trade: 分销用户管理
(cherry picked from commit 34ce7f7ec512eaa42bf86b04ddf2e67c082ecdde)
2023-09-25 12:38:18 +08:00
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
绮梦
b58b8bb6ea 新增用户详情下成长值页面。
(cherry picked from commit fe6cf7ce98d475039aedf296c426e164d53e6220)
2023-09-25 12:26:40 +08:00
owen
4d0f941f7c member: 佣金记录
(cherry picked from commit 73f8cef3b44569f48eef2c2fb2bef3b87864a36f)
2023-09-25 12:25:28 +08:00
owen
c2f411607e member: 分销配置
(cherry picked from commit 5a9764c08c0a2c12cabd0416638313f9f4942db7)
2023-09-25 12:25:23 +08:00
puhui999
c960ba1e20 完善订单详情和售后退款日志展示样式重构
(cherry picked from commit 46fd154e3a77189b9ad748e57e13ab7f2b6aae93)
2023-09-25 12:24:59 +08:00
shizhong
ec76b555a3 解决合并出现的问题 2023-09-20 16:53:38 +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