Commit Graph

  • 34ee8fa11d TASK: name信息; shahaibo 2025-02-11 13:08:00 +08:00
  • b7dc95af26 TASK:name信息; shahaibo 2025-02-11 11:35:57 +08:00
  • 297391d57e BUGFIX:试用订单邮件 订单更新时间判断; shahaibo 2025-02-11 11:27:08 +08:00
  • aff870fba7 Merge remote-tracking branch 'origin/dev/dev' into dev/dev shahaibo 2025-02-11 10:25:08 +08:00
  • 7b1ac47228 Merge branch 'dev/dev_xp' into dev/dev xupei 2025-02-10 16:15:20 +08:00
  • 7eb9abbdb5 优化接收Stripe回调时数据重复存储问题(添加唯一索引) xupei 2025-02-10 16:11:59 +08:00
  • 521bd5071a Merge branch 'dev/dev_xp' into dev/dev xupei 2025-02-10 11:21:52 +08:00
  • ab7e1705c4 修改print scale的数据结构 xupei 2025-02-10 11:18:04 +08:00
  • a2390a6ab2 BUGFIX:试用订单邮件 订单更新时间判断; shahaibo 2025-02-10 10:34:01 +08:00
  • 8dc5dcb1bd BUGFIX:试用订单邮件 订单更新时间判断; shahaibo 2025-02-10 10:11:59 +08:00
  • 5d010d2f77 BUGFIX:试用订单邮件 订单更新时间判断; shahaibo 2025-02-10 10:08:48 +08:00
  • cec5544472 BUGFIX:试用订单邮件 订单更新时间判断; shahaibo 2025-02-10 10:05:57 +08:00
  • 5f79c3276a BUGFIX:试用订单邮件 订单更新时间判断; shahaibo 2025-02-10 10:03:28 +08:00
  • aadb717c9f to dev xupei 2025-02-07 15:03:24 +08:00
  • e2e9201fdd 修改印花scale数据类型为数组 xupei 2025-02-07 14:57:28 +08:00
  • 9053bdf10c BUGFIX:试用注册; shahaibo 2025-02-07 12:48:37 +08:00
  • b14297d1af Merge branch 'dev/dev' into release/3.0 shahaibo 2025-02-07 11:58:36 +08:00
  • e90979bbdc BUGFIX:试用注册; shahaibo 2025-02-07 11:58:12 +08:00
  • e02c278e7a Merge remote-tracking branch 'origin/dev/dev' into dev/dev shahaibo 2025-02-07 10:25:20 +08:00
  • e60d9483a3 BUGFIX:试用订单邮件信息; shahaibo 2025-02-07 10:25:11 +08:00
  • ba49312fd5 BUGFIX:试用订单邮件信息; shahaibo 2025-02-07 10:23:41 +08:00
  • ba3c98771f BUGFIX: 新建订阅时更新订阅不更新账号信息 xupei 2025-02-06 18:39:06 +08:00
  • 4c738cc61d BUGFIX: 返回最新的订阅号 xupei 2025-02-06 17:35:35 +08:00
  • d648a79ec4 BUGFIX: 订阅付款失败时仍有新建订阅 xupei 2025-02-06 16:36:07 +08:00
  • c325927418 to prod xupei 2025-02-06 14:46:50 +08:00
  • dba5625446 正式支付环境下区分生产分支与测试分支 xupei 2025-02-06 14:42:45 +08:00
  • 91189968e9 在dev测试生产环境的Stripe支付功能 xupei 2025-02-06 14:37:06 +08:00
  • 433d8a460e to dev xupei 2025-02-06 14:22:27 +08:00
  • ec9857fe73 Merge branch 'dev/dev_xp' into dev/dev xupei 2025-02-06 14:09:53 +08:00
  • a9b01566e1 优化积分购买 xupei 2025-02-06 14:09:15 +08:00
  • a384aba4df TASK:定时任务开启; shahaibo 2025-02-06 10:04:30 +08:00
  • e587ad3ca1 1、支付环境切换为prod 2、邮件通知对象添加Kim 3、打开定时任务 xupei 2025-02-06 09:53:03 +08:00
  • 6a7c8b3d28 Merge branch 'dev/dev' into release/3.0 shahaibo 2025-02-05 14:26:33 +08:00
  • 6f52c956ec TASK:新的试用订单生成; shahaibo 2025-02-05 14:20:22 +08:00
  • 9e5d2f47e2 BUGFIX:绑定谷歌; shahaibo 2025-02-05 13:38:10 +08:00
  • 627f264ef3 BUGFIX:绑定谷歌; shahaibo 2025-02-05 13:02:26 +08:00
  • 464de4ee5a Merge remote-tracking branch 'origin/dev/dev' into dev/dev shahaibo 2025-02-05 12:05:07 +08:00
  • cf76235123 TASK:谷歌微信快捷区分登录注册; shahaibo 2025-02-05 12:04:53 +08:00
  • 8d9f51f50f 不再清空游客的到期时间 xupei 2025-02-05 11:22:45 +08:00
  • d840185ec7 测试 code-create DB最大连接时长 xupei 2025-02-05 10:56:17 +08:00
  • 9f4ab20b9d 测试 code-create DB最大连接时长 xupei 2025-02-05 10:49:10 +08:00
  • 0877ff8f66 支付 测试 xupei 2025-02-05 10:05:23 +08:00
  • 78046e8707 支付 测试 xupei 2025-02-04 15:29:22 +08:00
  • 9fb8bc989d Merge remote-tracking branch 'origin/dev/dev' into dev/dev shahaibo 2025-02-04 14:29:32 +08:00
  • 3c89670dae BUGFIX:design重复回退; shahaibo 2025-02-04 14:29:22 +08:00
  • 21b73d55f7 Merge remote-tracking branch 'origin/dev/dev' into dev/dev xupei 2025-02-04 14:04:17 +08:00
  • 9199cdf7e2 支付 to prod xupei 2025-02-04 14:04:01 +08:00
  • 8589216a77 TASK:绑定邮箱; shahaibo 2025-02-04 13:53:50 +08:00
  • 87768c6b53 TASK:绑定邮箱、绑定微信; shahaibo 2025-02-04 11:39:42 +08:00
  • ca320f4334 TASK:测试dev分支; shahaibo 2025-02-04 11:00:31 +08:00
  • 7697ab59fa BUGFIX:重复停止组装; shahaibo 2025-02-04 10:58:35 +08:00
  • e5e6f360dc Merge branch 'dev/dev_xp' into dev/dev xupei 2025-01-27 16:39:54 +08:00
  • 68a9462714 交易记录下载 返回文件流改为返回文件下载地址 xupei 2025-01-27 16:39:19 +08:00
  • b185a94fcc Merge branch 'dev/dev_xp' into dev/dev xupei 2025-01-27 11:00:10 +08:00
  • 708280ca14 交易记录下载post请求改get请求 xupei 2025-01-27 10:58:35 +08:00
  • 0ab1e7eef7 Merge branch 'dev/dev_xp' into dev/dev xupei 2025-01-24 15:50:15 +08:00
  • c7b1d46b18 maven 依赖冲突解决 xupei 2025-01-24 15:49:34 +08:00
  • 9357a62f0c Merge branch 'dev/dev_xp' into dev/dev xupei 2025-01-24 14:28:54 +08:00
  • c5b25e9a16 优化 删除多余代码 xupei 2025-01-24 14:28:21 +08:00
  • a35d057146 优化 导出交易记录文件 xupei 2025-01-24 14:25:32 +08:00
  • 7fc495eec9 Merge branch 'dev/dev_xp' into dev/dev xupei 2025-01-24 13:27:50 +08:00
  • 46f37942d2 将交易记录导出为excel文件 xupei 2025-01-24 13:26:53 +08:00
  • e75196c904 Merge branch 'dev/dev_xp' into dev/dev xupei 2025-01-23 14:15:38 +08:00
  • bdfa249c2e token过期 日志打印优化 xupei 2025-01-23 14:15:12 +08:00
  • d0e5f7da61 Merge branch 'dev/dev_xp' into dev/dev xupei 2025-01-23 13:57:26 +08:00
  • d8320ba83d 新增自定义异常 xupei 2025-01-23 13:56:48 +08:00
  • 23460800d6 优化请求未携带token时的日志打印 xupei 2025-01-23 13:55:48 +08:00
  • 58c8b644bc 佣金计算 打印日志 xupei 2025-01-22 16:41:40 +08:00
  • c4c04aecb6 affiliateIncome 添加字段paymentInfoId xupei 2025-01-22 16:37:40 +08:00
  • bb7c98c094 affiliate 佣金计算统计 xupei 2025-01-22 15:32:09 +08:00
  • dcdb0d06c4 Merge branch 'dev/dev_xp' into dev/dev xupei 2025-01-15 10:49:08 +08:00
  • b6a66bed41 查询交易记录 添加付款人字段 xupei 2025-01-15 10:45:51 +08:00
  • 5f277ed815 BUGFIX:toproductimage 打光积分不足提示修改; shahaibo 2025-01-13 15:12:54 +08:00
  • 845a553097 BUGFIX:微信名解析、toproductimage 打光积分不足code码修改; shahaibo 2025-01-13 14:11:03 +08:00
  • 74f89c8b2d 只填写国家和职业(不发送验证码) xupei 2025-01-13 11:15:31 +08:00
  • cff8227228 Merge branch 'dev/dev_xp' into dev/dev xupei 2025-01-13 11:13:31 +08:00
  • 51e2c9af02 只填写国家和职业(不发送验证码) xupei 2025-01-13 11:11:01 +08:00
  • cd89a77189 漏传 xupei 2025-01-13 10:56:06 +08:00
  • ab303cfeef 绑定邮箱时添加国家、职业信息 xupei 2025-01-13 10:55:08 +08:00
  • 07004a7415 TASK:去日志; shahaibo 2025-01-13 10:20:14 +08:00
  • d2069a3e7f TASK:去日志; shahaibo 2025-01-13 10:12:04 +08:00
  • 501cee0057 TASK:去日志; shahaibo 2025-01-13 10:05:38 +08:00
  • ac2454fd0e 绑定邮箱时添加国家、职业信息 xupei 2025-01-10 17:16:08 +08:00
  • 931a4cf807 to dev xupei 2025-01-10 17:01:59 +08:00
  • cb7099264e 绑定邮箱时需要填写国家和职业 xupei 2025-01-10 16:54:44 +08:00
  • e7aa951e89 漏传 xupei 2025-01-10 16:19:53 +08:00
  • ef70598180 修改查询交易记录接口 1、添加按id排序 2、添加查询所有国家 3、添加接口,更新用户国家、职业信息 xupei 2025-01-10 16:13:45 +08:00
  • 698fca8787 查询各平台交易记录 xupei 2025-01-10 13:27:27 +08:00
  • 2f86090f21 Merge branch 'dev/dev' into dev/dev_xp xupei 2025-01-10 13:05:26 +08:00
  • 2988a3b34e 修改code-create数据库 sql语句修改 xupei 2025-01-09 13:50:08 +08:00
  • 4fe5f65867 TASK:AiDA design like sort shahaibo 2025-01-08 16:56:02 +08:00
  • 4bb1953d4a Merge remote-tracking branch 'origin/dev/dev' into dev/dev shahaibo 2025-01-08 15:39:32 +08:00
  • 57a8260f03 TASK:AiDA design like sort shahaibo 2025-01-08 15:38:29 +08:00
  • e4936a23bc 编辑用户名,改为当前月允许修改5次 xupei 2025-01-08 14:20:12 +08:00
  • 9f37cb3f8d Merge branch 'release/3.0' into dev/dev xupei 2025-01-08 10:33:49 +08:00
  • b128b2436d 限制人员添加用户 xupei 2025-01-08 10:24:51 +08:00
  • 66158e94dd 限制人员添加用户 xupei 2025-01-08 10:12:43 +08:00
  • f6b489d950 添加管理员页面访问者 xupei 2025-01-08 09:50:13 +08:00
  • 30312caf82 添加管理员访问者 xupei 2025-01-07 17:27:29 +08:00
  • 1d0dd65f5e Merge branch 'dev/dev_xp' into dev/dev xupei 2025-01-07 17:21:54 +08:00