Commit Graph

388 Commits

Author SHA1 Message Date
edb88f8548 订单列表:列表重构 添加门店、物流检索条件
(cherry picked from commit 5dceda614a)
2023-09-20 12:12:58 +08:00
99ef6f83ba 订单列表:列表重构: 完善订单发货、修改地址、订单调价、订单备注
(cherry picked from commit be143ea21b)
2023-09-20 12:12:52 +08:00
612cc026b3 增加用户详情页以及 签到、积分等用户详情下的子tab页。
增加 用户、签到、积分 接口的VO,方便在组件中使用。

(cherry picked from commit 10d9f11fba)
2023-09-20 12:12:11 +08:00
2b67180f80 会员: 修改会员等级,使用单独的表单、接口
(cherry picked from commit 51738f8f6e)
2023-09-20 12:12:02 +08:00
9efe122318 订单列表:列表重构 ③ 添加备注表单和发货表单
(cherry picked from commit 0d202a7a85)
2023-09-20 12:11:09 +08:00
b74d4df4f8 会员:增加用户分组
(cherry picked from commit 78917cd2be)
2023-09-20 12:11:04 +08:00
c89d08e22a 订单列表:列表重构 ② and 完善订单详情
(cherry picked from commit 345c09ee6c)
2023-09-20 12:10:57 +08:00
788cba3bc5 会员:用户标签增加下拉框使用的 精简信息列表查询接口
(cherry picked from commit 884bb055b0)
2023-09-20 12:09:04 +08:00
9b15c04efc 会员:后台调整会员等级
(cherry picked from commit 7bef240926)
2023-09-20 12:08:53 +08:00
e27733aed8 code review:签到记录
(cherry picked from commit be485cc4ab)
2023-09-19 21:04:40 +08:00
57df63dc35 code review:签到配置
(cherry picked from commit 82628ce780)
2023-09-19 21:04:29 +08:00
8006325621 会员:增加会员等级增删改查
(cherry picked from commit f1735a4010)
2023-09-19 21:04:04 +08:00
5a0579e087 code review:会员签到配置
(cherry picked from commit 76a63e01c9)
2023-09-19 21:03:59 +08:00
21643274cb 订单列表:列表重构 ①
(cherry picked from commit 2eb740765e)
2023-09-19 21:03:26 +08:00
bcb0ed847e 会员:
1.增加会员标签功能

(cherry picked from commit 334962fe09)
2023-09-19 20:59:58 +08:00
779c6c760c 会员中心:会员管理 50%
(cherry picked from commit 4fd9dfd1f8)
2023-09-19 20:57:35 +08:00
a7f0c8d3a2 会员积分和会员签到模块todo修改
(cherry picked from commit 19444021ca)
2023-09-19 20:57:26 +08:00
1854e891cb fix: 完善砍价活动管理对齐后端
(cherry picked from commit 44be35b5ce)
2023-09-19 20:53:01 +08:00
81d8e36ccc 商城:
1. 修复拼团活动,修改商品的拼团价格,会存在 *100 的问题

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

(cherry picked from commit 9984de0dc7)
2023-09-19 20:50:06 +08:00
a7610dbab3 code review:优化支付通知的实现
(cherry picked from commit 1ab7ea0640)
2023-09-19 20:45:22 +08:00
db1e2beaf0 code review:优化收银台的实现,解决 TODO
(cherry picked from commit 7625e6757c)
2023-09-19 20:44:38 +08:00
817548c825 会员积分针对代码格式、功能优化
1.优化todo建议
2.删除无用代码

(cherry picked from commit de941ec6ba)
2023-09-19 20:41:09 +08:00
0991528c17 会员签到针对代码格式、功能优化
1.优化todo建议
 2.删除无用代码

(cherry picked from commit f310f65842)
2023-09-19 20:40:40 +08:00
191d149959 feat: 支付功能迁移(初稿)
(cherry picked from commit a6eab3cc9a)
2023-09-19 20:39:21 +08:00
541fc97796 feat: 完善砍价活动管理
(cherry picked from commit 4947716983)
2023-09-19 20:36:04 +08:00
f9be77efd4 bugfix:分配角色菜单时,调用接口 404 问题
(cherry picked from commit ef31ec7aaf)
2023-09-19 20:35:42 +08:00
3f479ecffc feat: 支付管理/应用信息(alpha)
(cherry picked from commit 323417b0d4)
2023-09-19 20:25:26 +08:00
da5ad39251 fix: combinationActivity 调整
(cherry picked from commit c327f79177)
2023-09-19 20:24:40 +08:00
4cef3e3e5f 登录时,直接从用户信息中,获取菜单。目的:加快首页的加载速度
(cherry picked from commit ee802d6335)
2023-09-19 19:59:19 +08:00
74aac991bc 发布 1.8.0 版本 2023-07-27 20:53:52 +08:00
2104de6a71 review 秒杀、拼团活动的 CRUD
(cherry picked from commit a003b59e39)
2023-07-27 19:51:42 +08:00
84d538ad69 fix: 完善拼团活动 CRUD
(cherry picked from commit dc39ad0cd1)
2023-07-27 19:45:36 +08:00
85cc7cdb46 fix: mall SeckillConfig
(cherry picked from commit 3fd9f1b43e)
2023-07-27 19:43:51 +08:00
0394f81dab fix: mall SeckillActivity and CombinationActivity
(cherry picked from commit 4057130275)
2023-07-27 19:41:21 +08:00
d1cc7d134b fix: mall SeckillActivity
(cherry picked from commit ce3ca7c6ce)
2023-07-27 19:41:03 +08:00
de53abb249 fix: mall SeckillActivity
(cherry picked from commit 36c0bce184)
2023-07-27 19:40:57 +08:00
1ab348f8df fix: mall SeckillActivity
(cherry picked from commit b98149f1a7)
2023-07-27 19:40:48 +08:00
22f869db89 feat: mall CombinationActivity
(cherry picked from commit 2e96b1c984)
2023-07-27 19:36:45 +08:00
195ae79bfc 会员中心代码
1.合并积分模块只member module
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码

(cherry picked from commit 4251dc5d61)
2023-07-27 19:36:28 +08:00
1d0d9d24ad fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件
(cherry picked from commit 51e79f29cc)
2023-07-27 19:35:12 +08:00
a22eea8e90 review 营销活动
(cherry picked from commit 5d613e69b3)
2023-07-27 19:34:54 +08:00
70c2fe409c fix:完善秒杀活动管理①
(cherry picked from commit b1e7f14963)
2023-07-27 19:33:06 +08:00
7da1b04ae2 feat:添加秒杀活动管理
(cherry picked from commit 3d47d6744e)
2023-07-27 19:27:44 +08:00
1b5c983d1d 提交订单页面和详情页面 20230619
(cherry picked from commit 42a7aec0b5)
2023-07-27 19:15:56 +08:00
0f9629707f feat: 完事秒杀时段管理
(cherry picked from commit f7b195b226)
2023-07-27 19:14:57 +08:00
a233d16dbb feat: 秒杀时段管理
(cherry picked from commit a75720ec06)
2023-07-27 19:14:47 +08:00
8bf1f04044 code review:订单列表
(cherry picked from commit e3f250fff0)
2023-07-27 19:11:50 +08:00
98c977a732 初始化积分模块
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理

(cherry picked from commit 1dca8476b3)
2023-07-27 19:06:34 +08:00
b9ba1d36c2 20230606 add trade-order and details
(cherry picked from commit 985d764f62)
2023-07-27 18:54:36 +08:00