Commit Graph

1798 Commits

Author SHA1 Message Date
wangsongsole 4e83adf12e Merge branch 'master' into optimize 2024-01-02 15:32:39 +08:00
wangsongsole 1ef1f9aee3 feat: 计划列表新增字段 2024-01-02 15:27:32 +08:00
wangsongsole 04f654ec70 feat: 新增字段 2024-01-02 13:56:46 +08:00
wangsongsole 426ce185a7 💪 optimize: 优化代码 2023-12-28 15:57:08 +08:00
wangsongsole 42f244fcd3 🐛 fix: 修复keys列表日志查询报错 2023-12-28 15:55:44 +08:00
wangsongsole 46c2aa141a ♻️ refactor: 调整订单详情数据接口 2023-12-26 17:03:48 +08:00
wangsongsole 5a3d09c58f ♻️ refactor: 更改订单状态 2023-12-20 20:51:19 +08:00
wangsongsole 9316c05168 🎨 style: 修改样式 2023-12-20 15:54:01 +08:00
wangsongsole 5f392248c1 feat: 新增订单重试领取按钮 2023-12-20 14:07:05 +08:00
wangsongsole 070bf45544 🐛 fix: 修复bug 2023-12-19 17:58:38 +08:00
wangsongsole 193ac52d0b 🎨 style: 优化订单列表展示 2023-12-19 17:19:05 +08:00
wangsongsole 81d4329581 feat: 订单列表新增订单状态、核销状态数量 2023-12-19 17:14:27 +08:00
wangsongsole c8a7435d76 feat: 立减金新增到账数量 2023-12-19 11:52:52 +08:00
wangsongsole d505df314c ♻️ refactor: 禁用key批次详情日志按钮 2023-12-06 14:22:39 +08:00
wangsongsole a42f42faaa ♻️ refactor: 禁用日志 2023-12-06 14:08:29 +08:00
wangsongsole f5a565721b ♻️ refactor: 取消回调地址必填校验 2023-11-16 18:20:20 +08:00
wangsongsole 79511b6cb1 feat: 对接回调剩余接口 2023-11-15 20:54:14 +08:00
wangsongsole 8b301a19d7 feat: 新增通知回调模块 2023-11-15 09:30:59 +08:00
wangsongsole 04d2aa67e1 💪 optimize: 优化计划列表代码 2023-10-25 14:37:39 +08:00
wangsongsole 79088a1857 🎈 per: 优化代码并修复bug 2023-10-25 14:31:16 +08:00
wangsongsole eb68c41abf 🚑️ hotfix: 修复营销计划-状态筛选-创建中不生效 2023-10-24 10:01:20 +08:00
wangsongsole af0c8cccfb ♻️ refactor: 隐藏开放信息入口 2023-10-23 09:40:18 +08:00
wangsongsole ed2a299b03 🚑️ hotfix: 商户回调地址不限制长度 2023-10-20 16:10:28 +08:00
wangsongsole d123b6076f ✏️ typos: 取消商户编号校验符 2023-10-19 19:12:23 +08:00
wangsongsole 1616860da0 feat: 对接商户编辑接口 2023-10-19 19:04:06 +08:00
wangsongsole 18275de237 feat: 计划列表新增stock_id 计划编号 2023-10-18 16:38:52 +08:00
wangsongsole 820c14c07a feat: 新增路由 2023-10-17 10:55:53 +08:00
wangsongsole e7a4bed1e6 💪 optimize: 优化代码 2023-10-16 17:18:01 +08:00
wangsongsole 7afc750a5e feat: 分销商新增字段 2023-10-16 16:55:14 +08:00
wangsongsole d160562cfa 💪 optimize: 删除冗余代码 2023-09-27 17:49:29 +08:00
wangsongsole 78bfc0e78a 💪 optimize: 调整并优化代码 2023-09-26 17:30:42 +08:00
wangsongsole 55d8fcedb1 💪 optimize: 优化代码 2023-09-26 15:34:56 +08:00
wangsongsole c6847baa53 💪 optimize: 优化引入顺序 2023-09-26 14:22:20 +08:00
wangsongsole 48c9d86e30 feat: 计划列表新增计划ID搜索条件,以及列表新增计划ID字段 2023-09-22 15:34:24 +08:00
wangsongsole c06bd59de6 🚑️ hotfix: 修复主体字段默认bug,修改计划、key批次、兑换码、优惠券复制时title过长问题 2023-09-21 17:25:36 +08:00
wangsongsole 4c45a5d41a feat: 订单列表新增“制券商户”字段 2023-09-20 15:27:10 +08:00
wangsongsole 20736879c7 💪 optimize: 优化冗余代码 2023-09-19 16:34:27 +08:00
wangsongsole f811d66ace 🔧 config: 配置环境变量 2023-09-18 10:32:31 +08:00
wangsongsole 90ea91136c 💪 optimize: 优化loadsh引入方式 2023-09-06 11:10:48 +08:00
wangsongsole d15c994b37 ♻️ refactor: 现在计划删除 2023-08-30 16:44:53 +08:00
wangsongsole 0299306262 ♻️ refactor: 替换banner外链 字段 2023-08-30 16:32:07 +08:00
wangsongsole f88bbca577 Merge branch 'master' into banner-link 2023-08-28 16:13:42 +08:00
wangsongsole 5eef9683b2 feat: 计划列表删除按钮直接放开 2023-08-28 16:13:27 +08:00
wangsongsole 34f2a379f0 Merge branch 'master' into banner-link 2023-08-18 09:08:46 +08:00
wangsongsole 4f61181409 feat: 新增卡密商品可选择发放方式 2023-08-18 09:07:21 +08:00
wangsongsole 3e29d43931 feat: 修改模板 2023-08-17 10:39:02 +08:00
wangsongsole 6ee4788617 💪 optimize: 优化兑换码代码-统一商品组件 2023-08-09 10:51:21 +08:00
wangsongsole 3e48af5dfe 🗑️ deprecateCode: 删除key编辑废弃代码 2023-08-09 10:38:35 +08:00
wangsongsole 7f1594600e feat: 新增兑换码模块本地字段 2023-08-09 10:02:02 +08:00
wangsongsole 9672093fa3 💊 fix: 修复bug 2023-08-08 19:40:47 +08:00
wangsongsole da8bff7b64 💪 optimize: 优化代码 2023-08-08 15:41:56 +08:00
wangsongsole 46aac53545 🚑️ hotfix: 修复权益商品和优惠券商品切换时 - 商品详情页展示异常 2023-08-07 09:39:23 +08:00
wangsongsole 69dcda153d feat: 权益商品新增tabs 2023-08-07 09:38:27 +08:00
wangsongsole 2f1cbf6194 feat: 开启卡密 2023-08-04 10:41:42 +08:00
wangsongsole 98af135aea feat: 新增key码批量导出 2023-08-03 15:43:02 +08:00
wangsongsole 5c6edcefa4 feat: 订单列表新增已退回状态 2023-07-28 15:07:08 +08:00
wangsongsole 5978863b57 feat: 订单新增部分退款状态 2023-07-28 11:09:36 +08:00
wangsongsole a6baa488f1 🎨 style: 核销状态下拉框新增已过期状态 2023-07-28 10:59:20 +08:00
wangsongsole 7c869aaeaa ♻️ refactor: 核销状态3改为已过期 2023-07-28 10:53:09 +08:00
wangsongsole 90708c0ff9 feat: 新增订单未核销状态 2023-07-28 10:31:02 +08:00
wangsongsole 9b160905f8 💊 fix: 修复bug 2023-07-26 20:47:45 +08:00
wangsongsole f5bb524d8f feat: 权益商品默认商品图 2023-07-25 17:56:24 +08:00
wangsongsole d90bb154e3 feat: 新增云闪付模块,并新增商品类型枚举 2023-07-11 14:29:40 +08:00
wangsongsole 79785be9f8 💊 fix: 修复字段错误 2023-07-07 20:39:49 +08:00
wangsongsole 11f50b3fab 💊 fix: 修复订单查询字段空格问题 2023-07-07 20:33:17 +08:00
wangsongsole 3c296ce848 💊 fix: 修复订单列表条件查询抖动问题 2023-07-07 20:29:40 +08:00
wangsongsole f0cc0e2c85 💊 fix: 修复订单条件清除时报错 2023-07-07 20:13:30 +08:00
wangsongsole c4234b9a57 feat: 订单列表新增查询条件 2023-07-07 19:56:04 +08:00
wangsongsole bf2f870aa4 feat: 营销计划名称新增校验规则 2023-07-07 13:54:37 +08:00
wangsongsole 5891e5d443 🚸 usability: 优化用户体验 2023-07-06 14:51:43 +08:00
wangsongsole bd4c4846be feat: 营销计划名称增加校验 2023-07-06 13:56:24 +08:00
wangsongsole 0f68bc756c 🔀 merge: 合并分支 2023-07-06 09:34:24 +08:00
wangsongsole e05268f630 💊 fix: 修复商品列表直充商品无法删除 2023-06-30 15:53:42 +08:00
wangsongsole 0d118e4a9b 💊 fix: 官方价+合同价保留2位小数 2023-06-29 18:33:54 +08:00
wangsongsole 9e9f07ed4f 💊 fix: 【新增兑换码】商品范围中,随机红包的成本价格展示红包的区间值,固额红包的成本价展示红包的面额 2023-06-29 15:47:50 +08:00
wangsongsole fae314d678 💊 fix: 【订单列表】后端返回了更新时间,但是前端没有展示出来 2023-06-29 11:46:56 +08:00
wangsongsole 9ede3c86f4 💊 fix: 修复下载列表问题 2023-06-29 11:04:23 +08:00
wangsongsole cf88118f8a ⚰️ removeCode: 删除多余表头 2023-06-28 11:45:04 +08:00
wangsongsole bbc1aeee73 💊 fix: 修复bug 2023-06-27 18:21:52 +08:00
wangsongsole d718d199d6 💊 fix: 【订单列表】红包商品类型应该为“兑换码现金红包” 2023-06-27 17:52:01 +08:00
wangsongsole a03f3feb7e 💊 fix: 云效bug 2023-06-26 15:11:43 +08:00
wangsongsole 522274def8 feat: 对接订单现金红包接口 2023-06-26 10:27:32 +08:00
wangsongsole 19ec697640 ✏️ typos: 修改错别字 2023-06-16 15:35:06 +08:00
zhangds a25e842c03 fix:修复交互弹窗样式 2023-06-15 17:23:12 +08:00
zhangds f4e341f6f6 feat: 修改订单显示账号 2023-06-15 15:20:23 +08:00
zhangds ed0d712240 feat: 修复多余文件 2023-06-15 11:27:34 +08:00
zhangds 402d712094 feat: 增加作废查询 2023-06-15 11:08:51 +08:00
zhangds 9ac3f9ca49 feat: 批量上传作废 2023-06-15 09:46:54 +08:00
zhangds 54735790a8 feat: 增加批量作废接口查询 2023-06-15 09:44:08 +08:00
zhangds 2d841bf21f feat: 增加key查询作废 2023-06-14 17:50:19 +08:00
zhangds 4ca72636b4 feat: 1.增加兑换码,优惠券作废新查询接口 2023-06-14 17:04:32 +08:00
zhangds ae6b85d9f6 feat: 增加key批次作废,查询待领取接口 2023-06-14 16:52:06 +08:00
wangsongsole a95fedd39e 💪 optimize: 优化代码 2023-06-09 11:31:46 +08:00
wangsongsole cad0966826 ♻️ refactor: 调整商品范围列表代码 2023-06-09 11:26:37 +08:00
wangsongsole 97fc2a64db 🐛 fix: 修复商品范围权益商品编辑报错 2023-06-02 14:15:52 +08:00
wangsongsole 2f6f7231f9 feat: 系统模板新增红包类型 2023-06-01 16:14:55 +08:00
wangsongsole 731b5bcb78 🎈 per: 优化代码 2023-06-01 14:14:48 +08:00
wangsongsole e6a32a6e24 🎈 per: 优化兑换码编辑、新增、复制代码 2023-06-01 14:04:27 +08:00
wangsongsole ebc94cfb13 ⚰️ removeCode: 删除log 2023-06-01 13:34:53 +08:00
wangsongsole f3124da762 🚸 usability: 商品范围列表 红包类型字段更正为(随机红包/固额红包) 2023-06-01 11:47:29 +08:00