Commit Graph

353 Commits

Author SHA1 Message Date
zyna
1f22d9ad0b crm联系人init
(cherry picked from commit ed26142bb0)
2024-03-06 20:32:54 +08:00
Wanwan
f356bf8076 feat: CRM 客户限制
(cherry picked from commit 6369b334e3)
2024-03-06 20:32:43 +08:00
YunaiV
c8a3c5a3ad 主子表:暂时存储,准备重构
(cherry picked from commit 4e413a10e6)
2024-03-06 20:31:57 +08:00
Wanwan
c3dc0836c2 feat: CRM 客户公海配置
(cherry picked from commit 288aa72cdd)
2024-03-06 20:30:20 +08:00
niou233
4d02972b86 refactor: 会员商品收藏
(cherry picked from commit f2c71d5836)
2024-03-06 20:30:03 +08:00
YunaiV
adba0142f1 多租户:登录界面,根据 host 域名获取对应的租户编号
(cherry picked from commit 85ee558bef)
2024-03-05 17:57:53 +08:00
VicoHu
79cf4d31e8 fix: 修复关闭拼团活动请求URL错误的问题
Signed-off-by: VicoHu <vicohu@163.com>
(cherry picked from commit 3f803767c4)
2024-03-05 17:51:58 +08:00
YunaiV
e354a6f22e code review:产品分类
(cherry picked from commit 47bb88d892)
2024-03-05 17:51:53 +08:00
ZanGe丶
618cf7459a 【crm:产品及产品分类】
(cherry picked from commit ff6f05df84)
2024-03-05 17:49:15 +08:00
YunaiV
98fc2fe327 优化:社交登录、用户的管理
(cherry picked from commit a9b91e7436)
2024-03-05 17:44:12 +08:00
Wanwan
f780cf0c7b feat: 客户详情 + review 修改
(cherry picked from commit 23f483ac45)
2024-03-05 17:42:31 +08:00
jason
6949c196d0 转账 - 新增转账订单查询
(cherry picked from commit 753f5de81e)
2024-03-05 17:41:57 +08:00
dongshanshan
525e511670 feat: 会员商品收藏
(cherry picked from commit 9a3253ad20)
2024-03-05 17:41:11 +08:00
owen
97a94cd29f 营销:完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器,默认选中组件判断

(cherry picked from commit 881c4f3a29)
2024-03-05 17:41:01 +08:00
liuhongfeng
bccd02a53f 【新增】负责人
【修改】规范命名:期数:indexNo-》period

(cherry picked from commit 2b84de7e09)
2024-03-05 17:33:13 +08:00
jason
18cd9dde6e 转账 - 管理后台新增转账示例
(cherry picked from commit 55a961e862)
2024-03-05 17:32:29 +08:00
owen
d12dcde81d 商城装修
(cherry picked from commit e9ff8d3237)
2024-03-05 17:31:22 +08:00
Wanwan
7923078e17 feat: 调整客户表的字段
(cherry picked from commit 59cf0c29f0)
2024-03-05 17:30:11 +08:00
Wanwan
ed9ae42ba8 feat: 调整客户表的字段
(cherry picked from commit 4cdab6fb3e)
2024-03-05 17:30:07 +08:00
puhui999
0cddb9c370 三方应用新增授权方的网页应用 agentId 属性
(cherry picked from commit a624db04e9)
2024-03-05 17:29:45 +08:00
puhui999
ca7c311f88 新增社交用户 RUD
(cherry picked from commit 6ee2492ff1)
2024-03-05 17:25:31 +08:00
puhui999
212d40f290 新增社交客户端 CRUD
(cherry picked from commit 8935188a82)
2024-03-05 17:24:58 +08:00
Wanwan
c0a10146d6 feat: 客户表的 crud
(cherry picked from commit 044754cdb4)
2024-03-05 17:23:20 +08:00
puhui999
8c5cdd0ea5 商品 spu 脱离优惠卷模块
(cherry picked from commit 75135e1e4f)
2024-03-05 17:22:16 +08:00
puhui999
1298c3dd52 完善 banner 管理
(cherry picked from commit a7439ee08b)
2024-03-05 17:22:09 +08:00
kehaiyou
6bffc7991f fix: 【工作流】--加签减签review修改接口地址
(cherry picked from commit 5cfb67d047)
2024-03-05 17:21:22 +08:00
jason
16aba063d1 钱包 - 优化
支付应用 - 证书模式增加应用私钥

(cherry picked from commit bb5945958b)
2024-03-05 17:21:11 +08:00
puhui999
4fcdd63e51 新增 banner 管理
(cherry picked from commit 491b3a5018)
2024-03-05 17:21:03 +08:00
liuhongfeng
47f948f26b 【新增】回款计划 功能
(cherry picked from commit 26780c3525)
2024-03-05 17:20:37 +08:00
liuhongfeng
7b020781f0 【新增】回款管理 功能
(cherry picked from commit 7ad1457f79)
2024-03-05 17:20:32 +08:00
zhangshuai
9f04b8e34b 限时折扣
(cherry picked from commit 9f77514c17)
2024-03-05 17:20:00 +08:00
puhui999
ccec7ad410 SPU: 完善优惠卷选择
(cherry picked from commit 01d78429cc)
2024-03-05 17:15:16 +08:00
puhui999
de53601fcb SPU: 完善优惠卷选择
(cherry picked from commit 18df708b49)
2024-03-05 17:14:29 +08:00
puhui999
e9da54b100 SPU: 新增优惠卷选择
(cherry picked from commit 3464bb9c74)
2024-03-05 17:12:24 +08:00
913752709@qq.com
a5f21a9b9f feat: CRM 线索表 crud
(cherry picked from commit 7af2a3bcc3)
2024-03-05 17:11:33 +08:00
puhui999
bb18f469de 订单列表:自定义列抽离封装为组件
(cherry picked from commit 04d88ce1a6)
2024-03-05 17:11:17 +08:00
owen
174b95fdef 交易:核销订单
(cherry picked from commit 61b3bdfd4c)
2024-03-05 17:07:35 +08:00
owen
18b7dd3b7e 交易:订单核销
(cherry picked from commit 6fc232b758)
2024-03-05 17:06:12 +08:00
dhb52
d85494bf05 feat: CRM/合同 crud
(cherry picked from commit dced551698)
2024-03-05 17:05:58 +08:00
jason
b3b9fbc201 钱包 - 钱包余额流水
(cherry picked from commit 8626bccc4c)
2024-03-05 17:03:54 +08:00
owen
1dba566d1d 统计:trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】
(cherry picked from commit 6204ce6c1b)
2024-03-05 17:03:42 +08:00
owen
25a1e27a12 统计:Review修改
(cherry picked from commit cd4b4cd322)
2024-03-05 17:03:35 +08:00
owen
3c51e98682 统计:Review修改
(cherry picked from commit e1a72779d4)
2024-03-05 16:53:07 +08:00
YunaiV
f0542fef06 code review:文章管理
(cherry picked from commit 99172ea088)
2024-03-05 16:52:46 +08:00
owen
230d073fb8 商城:增加商城首页
(cherry picked from commit 3802fee661)
2024-03-05 16:52:31 +08:00
jason
e5f043c24b 钱包- 钱包余额查询
(cherry picked from commit 90d6f4da9f)
2024-03-05 16:51:04 +08:00
puhui999
7c41ce1796 营销活动:新增文章管理。
(cherry picked from commit befffb3f7d)
2024-03-05 16:50:47 +08:00
dhb52
5bf9baf456 feat: 社交平台登录
(cherry picked from commit 4d77d7e136)
2024-03-05 16:50:30 +08:00
puhui999
54e1a8843b 营销活动:新增文章分类管理
(cherry picked from commit 36bb90fbb8)
2024-03-05 16:50:22 +08:00
jason
7162525bc7 钱包-充值套餐
(cherry picked from commit f9d0c1aa1c)
2024-03-05 16:49:58 +08:00
puhui999
848e0b7023 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗
(cherry picked from commit 3500a20630)
2024-03-05 16:33:41 +08:00
youkehai
dbcefcca9b fix: 减签按钮显示和api地址修改
(cherry picked from commit 62a953815d)
2024-03-05 16:33:32 +08:00
owen
c4e6163437 统计:会员统计
(cherry picked from commit 22adab8590)
2024-03-05 16:32:14 +08:00
shizhong
f0cdee8e9a fix: 【工作流】--加签减签 2024-03-05 16:31:04 +08:00
YunaiV
a06369d427 code review:拼团记录列表
(cherry picked from commit 86323f970b)
2024-03-05 16:05:22 +08:00
puhui999
22449ed21a 拼团记录:接口对接
(cherry picked from commit c445173855)
2024-03-05 16:04:39 +08:00
owen
e30e0e2d32 统计:交易统计Review修改
(cherry picked from commit 2a58b04a98)
2024-03-05 16:03:05 +08:00
YunaiV
2b4c192423 promotion:调整拼团活动的界面
(cherry picked from commit 78062dd474)
2024-03-05 16:03:00 +08:00
YunaiV
be2f92754b promotion:新增记录记录列表
(cherry picked from commit cf7ac2cb10)
2024-03-05 15:58:09 +08:00
YunaiV
d9ec3f6e61 promotion:新增砍价记录列表
(cherry picked from commit 860872a890)
2024-03-05 15:58:04 +08:00
owen
cbba91dac5 交易:核销
(cherry picked from commit 58b6b1ba57)
2024-03-05 15:57:14 +08:00
YunaiV
e92709da70 promotion:优化秒杀活动的界面
(cherry picked from commit 7c491ff62a)
2024-03-05 15:57:09 +08:00
YunaiV
7d44b98116 trade:优化运费模版的实现
(cherry picked from commit a9bbbc7b0a)
2024-03-05 15:54:35 +08:00
YunaiV
6a8aa02960 trade:完善订单详情
(cherry picked from commit 4fddbccea1)
2024-03-05 15:53:59 +08:00
YunaiV
a83db39abf trade:微调 order 列表界面
(cherry picked from commit 588ce1c9ae)
2024-03-05 15:53:54 +08:00
owen
e05b749e4d 会员:会员配置的积分相关字段加上point前缀
(cherry picked from commit 3a96812d47)
2024-03-05 15:53:20 +08:00
owen
24a650d89b 会员:积分配置改为会员配置
(cherry picked from commit 3ab1ed707f)
2024-03-05 15:53:16 +08:00
owen
6b6c9f5f02 签到:签到后增加用户积分、经验
(cherry picked from commit 0066d79876)
2024-03-05 15:52:41 +08:00
owen
18bdea83be 会员详情,修改会员积分
(cherry picked from commit 4b7e57e67d)
2024-03-05 15:52:21 +08:00
owen
05e6668322 会员详情,查询钱包信息
(cherry picked from commit 675f3df5cb)
2024-03-05 15:50:46 +08:00
owen
9b4bb4025b 统计:交易统计
(cherry picked from commit c322fb3d0d)
2024-03-05 15:50:37 +08:00
owen
75e0a701f3 分销:修正分享海报
(cherry picked from commit a5dd7f4a81)
2024-03-05 13:14:55 +08:00
owen
28d312c857 分销:重命名提现类型字段
(cherry picked from commit 2c22ef8ef1)
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 245147223f)
2023-09-25 13:32:48 +08:00
kehaiyou
0bef9924fe fix: 【工作流】--回退的高亮和api地址更换
(cherry picked from commit f40d1de62a)
2023-09-25 13:30:17 +08:00
kehaiyou
6888fd90d1 feat: 支持回退按钮
(cherry picked from commit de79e79d91)
2023-09-25 13:15:55 +08:00
owen
36f6745ecb trade: 分销业务 - 佣金提现后台管理
(cherry picked from commit 854acf6e70)
2023-09-25 12:48:07 +08:00
puhui999
9607127897 spu:分佣属性和分佣保持一致
(cherry picked from commit 5dc0c6e3da)
2023-09-25 12:43:15 +08:00
puhui999
2e4cad38bb mall-order:修复 todo 提到的问题
(cherry picked from commit 7e511d1e4f)
2023-09-25 12:42:27 +08:00
owen
ad35b40a76 trade: 分销业务后台功能:修改上级推广人
(cherry picked from commit 5ed909263a)
2023-09-25 12:42:08 +08:00
owen
9dbf4feeae trade: 分销业务后台功能:清除推广员、修改推广资格
(cherry picked from commit 7ea3571356)
2023-09-25 12:42:04 +08:00
YunaiV
ca0ec86913 code review:会员详情
(cherry picked from commit 0e2ea39591)
2023-09-25 12:41:27 +08:00
YunaiV
58f01a8bc5 code review:完善订单详情和售后退款 TODO 提到的问题
(cherry picked from commit 3c315cf287)
2023-09-25 12:38:53 +08:00
owen
f0d95e4a93 trade: 优化分销用户佣金字段名称
(cherry picked from commit e9d5027e72)
2023-09-25 12:38:25 +08:00
owen
91ab91fdbb trade: 优化分销用户绑定用户编号、绑定时间字段名称
(cherry picked from commit 7263315412)
2023-09-25 12:38:22 +08:00
owen
eab116cfce trade: 分销用户管理
(cherry picked from commit 34ce7f7ec5)
2023-09-25 12:38:18 +08:00
puhui999
69eb2c0f3a 完善订单详情和售后退款 TODO 提到的问题
(cherry picked from commit 73628d3930)
2023-09-25 12:30:24 +08:00
owen
b398062102 trade: 分销业务从 member 模块 转移到 trade模块
(cherry picked from commit 1e2120806d)
2023-09-25 12:30:17 +08:00
owen
d33f42a525 trade: 分销业务从 member 模块 转移到 trade模块
(cherry picked from commit 2ed5d12be8)
2023-09-25 12:30:13 +08:00
owen
f5804431a3 trade: 增加交易中心配置表
(cherry picked from commit 35664d1f32)
2023-09-25 12:30:09 +08:00
绮梦
b58b8bb6ea 新增用户详情下成长值页面。
(cherry picked from commit fe6cf7ce98)
2023-09-25 12:26:40 +08:00
owen
4d0f941f7c member: 佣金记录
(cherry picked from commit 73f8cef3b4)
2023-09-25 12:25:28 +08:00
owen
c2f411607e member: 分销配置
(cherry picked from commit 5a9764c08c)
2023-09-25 12:25:23 +08:00
puhui999
c960ba1e20 完善订单详情和售后退款日志展示样式重构
(cherry picked from commit 46fd154e3a)
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 5f557c7be5)
2023-09-20 12:39:13 +08:00
owen
842c922855 mall:优惠券发送优化
(cherry picked from commit 76c4644b4b)
2023-09-20 12:38:35 +08:00
puhui999
d740a4d894 订单管理:完善订单详情
(cherry picked from commit f0249e94a5)
2023-09-20 12:34:53 +08:00
YunaiV
8364e52477 code review:售后详情
(cherry picked from commit 29b8d06ff2)
2023-09-20 12:32:48 +08:00