Commit Graph

314 Commits

Author SHA1 Message Date
wangsongsole 3951bba31b feat: 新增特性 2024-03-19 10:48:12 +08:00
wangsongsole 9400717476 🔀 merge: 合并分支 2024-03-14 15:45:54 +08:00
zhangds 0def09c38d Merge branch 'merchant' into clearingForm 2024-03-06 13:33:02 +08:00
wangsongsole 462843304e feat: 对接动态商户加密类型 2024-03-04 11:28:07 +08:00
zhangds d1898a1917 feat: 增加后台管理系统包码结算列表导出 2024-02-26 11:02:40 +08:00
zhangds 05e8f6356c Merge branch 'master' into clearingForm 2024-02-21 10:10:49 +08:00
wangsongsole 8822296656 feat: 商户密钥受对接类型影响 2024-02-06 17:11:43 +08:00
zhangds 42aa0f6af3 fix: 完成订单关联订单号 2024-02-06 14:08:18 +08:00
wangsongsole a783378148 feat: 新增商户上报 2024-02-06 13:52:12 +08:00
wangsongsole ca58568250 feat: 新增包码列表代码 2024-01-31 18:29:12 +08:00
wangsongsole 85f33b57d1 🔀 merge: 合并order分支 2024-01-31 14:50:13 +08:00
wangsongsole 89ce9e8c87 feat: 新增包结算方式 2024-01-31 14:48:13 +08:00
wangsongsole dadea66564 feat: 订单列表新增特性 2024-01-30 11:54:34 +08:00
wangsongsole 9f11e4e202 feat: 优化代码 以及订单列表调整查询字段 2024-01-29 16:28:02 +08:00
wangsongsole fd689d21cf Merge branch 'master' into dynamicPrompt 2023-12-28 14:31:46 +08:00
wangsongsole 58774a4d87 🐛 fix: 修复已取消订单颜色 2023-12-21 09:39:00 +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 af0b5e4750 🔀 merge: 合并分支 2023-11-24 10:18:58 +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 fb9765329b feat: 新增接口 2023-11-13 17:15:36 +08:00
wangsongsole 1616860da0 feat: 对接商户编辑接口 2023-10-19 19:04:06 +08:00
wangsongsole f811d66ace 🔧 config: 配置环境变量 2023-09-18 10:32:31 +08:00
wangsongsole 4f61181409 feat: 新增卡密商品可选择发放方式 2023-08-18 09:07:21 +08:00
wangsongsole 98af135aea feat: 新增key码批量导出 2023-08-03 15:43:02 +08:00
wangsongsole 13f93d12a2 🔧 config: 所有请求Authorization参数加Bearer前缀 2023-08-02 16:57:50 +08:00
wangsongsole 5c6edcefa4 feat: 订单列表新增已退回状态 2023-07-28 15:07:08 +08:00
wangsongsole 86f18f1f23 feat: 新增订单状态color 2023-07-28 11:50:31 +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 0f68bc756c 🔀 merge: 合并分支 2023-07-06 09:34:24 +08:00
zhangds ac83f22fc2 Merge branch 'searchV2.3.8' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into searchV2.3.8 2023-06-15 11:11:03 +08:00
zhangds 402d712094 feat: 增加作废查询 2023-06-15 11:08:51 +08:00
zhangds ba31f1fd81 feat: 增加key批次查询 2023-06-15 10:29:18 +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 ae6b85d9f6 feat: 增加key批次作废,查询待领取接口 2023-06-14 16:52:06 +08:00
wangsongsole 9c9a76dbb0 🎨 style: 优化优惠券样式 2023-05-24 11:08:19 +08:00
wangsongsole 02511825c1 🔀 merge branches: 合并分支 2023-05-11 13:45:18 +08:00
wangsongsole f92b5ba205 🔧 config: 更改营销系统生产环境域名 2023-05-10 22:54:15 +08:00
wangsongsole ad8bc8da36 🔧 config: 增加配置注释 2023-05-10 17:06:22 +08:00
wangsongsole 87b35add09 🎨 style: 优化代码 2023-05-09 11:25:42 +08:00
wangsongsole b399dfa2ec 🔧 config: 重新配置统一登陆环境域名 2023-05-09 11:14:53 +08:00
wangsongsole 9ee415eac4 🌈 style: 跳转跳转路径 2023-04-24 17:27:30 +08:00
wangsongsole 33300a99a8 🐞 fix: 优化路由跳转 2023-04-23 15:42:00 +08:00
wangsongsole 67dfc82c29 🦄 refactor:http 状态统一封装 兼容网关,解决报错 2023-04-21 09:12:05 +08:00
wangsongsole 7312d2c1c3 🌈 style: 更换测试环境ip 2023-04-20 18:18:16 +08:00
wangsongsole c85f2f8320 🌈 style:authorization转Authorization 2023-04-20 18:13:40 +08:00