gold-java

Commit Graph

Select branches

Hide Pull Requests

dev

huangqizheng/feature-20250707173453-7.7bug修改

huangqizheng/feature-20250708175155-7.8bug修复

huangqizheng/feature-20250709163552-7.8导出传输对象修复

huangqizheng/feature-20250710151401-数据同步完成

huangqizheng/feature-20250714180618-数据同步

huangqizheng/feature-20250715100115-非测试数据筛选

huangqizheng/feature-20250717200321-优化导出

huangqizheng/feature-20250718222252-导出修改完毕

huangqizheng/feature-20250719105717-后端完毕

huangqizheng/feature-20250721170818-后端周末修改

huangqizheng/feature-20250722105318-BUG修改

huangqizheng/feature-20250725144236-精简日志

huangqizheng/feature-20250728134614-三期数据库配置

huangqizheng/feature-20250731164458-地区部分修改以及导出的封装

huangqizheng/feature-20250801114957-导出

huangqizheng/feature-20250801180134-消费导出

huangqizheng/feature-20250803175216-导出完毕

huangqizheng/feature-20250804114811-打包配置

huangqizheng/feature-20250805200446-配置修改及充值导出修改

huangqizheng/feature-20250806120055-修复BUG

huangqizheng/feature-20250808172612-bug修复

huangqizheng/feature-20250809103653-修改配置导出重新上传

huangqizheng/feature-20250809184038-研发部校验

lihuilin/hotfix-20250810160509-余额地区传参

lihuilin/hotfix-20250815-审核默认更新时间

lijianlin/feature-20250623120104-工作台与审核

lijianlin/feature-20250710152503-二期工作台与部分权限

lijianlin/feature-20250728171217-三期金豆消费相关

lijianlin/feature-202509231533026-现金管理-收款管理

master

milestone-20250702-金币重构一期

milestone-20250711-金币重构二期

milestone-20250727-金币重构三期

milestone-20251016-现金管理

sunjiabei/feature-20250623130922-消费功能

sunjiabei/feature-20250710132313-二期模块

sunjiabei/feature-20250725135225-金币三期

sunjiabei/feature-20250822111257-平台和商品id字段替换

sunjiabei/feature-20250924164720-现金管理

wangyetao/feature-20250628170337-汇率

wangyetao/feature-20250715095107-地区数据权限

工作流配置

047d324482 更新管理员优化（还没写完） lijianlin 2025-07-10 17:17:29 +0800
5feaf37856 Merge branch 'milestone-20250702-金币重构一期' into sunjiabei/feature-20250710132313-二期模块 sunjiabei 2025-07-10 16:15:06 +0800
4e5d9ea68a Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期 lijianlin/feature-20250623120104-工作台与审核 lijianlin 2025-07-10 15:22:35 +0800
879b8da64f 修改管理员（部分） lijianlin 2025-07-10 15:20:38 +0800
aba4077ea9 Merge branch 'refs/heads/huangqizheng/feature-20250710151401-数据同步完成' into milestone-20250702-金币重构一期 milestone-20250702-金币重构一期 huangqizhen 2025-07-10 15:14:55 +0800
c5f2e5261d 7.10数据库同步 huangqizheng/feature-20250710151401-数据同步完成 huangqizhen 2025-07-10 15:14:25 +0800
3e71823a73 密码修改 sunjiabei 2025-07-10 15:10:11 +0800
47d0e611c8 密码修改 sunjiabei 2025-07-10 15:04:08 +0800
9b4f475625 密码模块 sunjiabei/feature-20250623130922-消费功能 sunjiabei 2025-07-10 13:24:41 +0800
e6950a483f 充值次数与首充时间修改 lijianlin 2025-07-10 11:25:17 +0800
5e39bde176 Merge branch 'milestone-20250702-金币重构一期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250702-金币重构一期 lihuilin 2025-07-10 10:31:22 +0800
8949f2e9a0 7.9数据库同步 huangqizhen 2025-07-09 21:06:47 +0800
130db4a62f 解开传erp限制，所有订单往erp传 lijianlin 2025-07-09 20:29:49 +0800
acc2965582 新增用户与更新用户1 lijianlin 2025-07-09 20:12:58 +0800
a36dc3d488 新增用户与更新用户 lijianlin 2025-07-09 19:54:26 +0800
cf142e26c4 用户全部信息查询 sunjiabei 2025-07-09 19:28:27 +0800
ac71a60248 查id sunjiabei 2025-07-09 18:22:00 +0800
144271c3c8 Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期 lijianlin 2025-07-09 18:03:51 +0800
af8f888a88 退款驳回bug修复 lijianlin 2025-07-09 18:03:25 +0800
abb6ef1aad 查id sunjiabei 2025-07-09 17:58:33 +0800
5362ee33c8 退款通过bug修复 lijianlin 2025-07-09 17:51:40 +0800
5166afcf0f Merge branch 'milestone-20250702-金币重构一期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250702-金币重构一期 lihuilin 2025-07-09 17:43:34 +0800
f842a5a1c1 Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期 lijianlin 2025-07-09 17:42:56 +0800
0972f08e05 审核通过bug修复 lijianlin 2025-07-09 17:42:38 +0800
7a71dfa488 Merge branch 'milestone-20250702-金币重构一期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250702-金币重构一期 lihuilin 2025-07-09 17:40:14 +0800
a40ea38f07 ADMI, sunjiabei 2025-07-09 17:14:47 +0800
6902e669b8 审核通过bug修复 lijianlin 2025-07-09 17:02:08 +0800
5fc7f2a3a0 Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期 lijianlin 2025-07-09 16:37:23 +0800
9bf8481d6e Merge branch 'refs/heads/lijianlin/feature-20250623120104-工作台与审核' into milestone-20250702-金币重构一期 lijianlin 2025-07-09 16:37:08 +0800
cc352bd81d Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期 huangqizhen 2025-07-09 16:36:39 +0800
055816a026 7.9导出筛选对象修复 huangqizheng/feature-20250709163552-7.8导出传输对象修复 huangqizhen 2025-07-09 16:36:11 +0800
8fa1fc3a2e 充值审核明细添加汇率校验 lijianlin 2025-07-09 16:36:06 +0800
735b74c148 删除111111 sunjiabei 2025-07-09 16:06:14 +0800
80039241a7 充值次数bug修复，工作台实时更新接口 lijianlin 2025-07-09 15:00:43 +0800
f0db83bf61 退款校验 sunjiabei 2025-07-09 14:11:18 +0800
e598198d4b 7.8导出筛选修复 huangqizheng/feature-20250708175155-7.8bug修复 huangqizhen 2025-07-08 19:02:31 +0800
b6d976c527 7.8导出修复 huangqizhen 2025-07-08 17:52:33 +0800
14dcd1cd53 Merge branch 'milestone-20250702-金币重构一期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250702-金币重构一期 lihuilin 2025-07-08 16:44:08 +0800
2956ff8e28 Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期 lijianlin 2025-07-08 15:22:48 +0800
8c40a9f4ba 汇率校验 lijianlin 2025-07-08 15:19:14 +0800
0a068e447a 汇率校验 sunjiabei 2025-07-08 15:12:07 +0800
2ba06397d2 订单号 sunjiabei 2025-07-08 14:57:44 +0800
914eab6f70 消费扣减用户金币优化 lijianlin 2025-07-08 13:06:50 +0800
4ea799106b Merge branch 'refs/heads/lijianlin/feature-20250623120104-工作台与审核' into milestone-20250702-金币重构一期 lijianlin 2025-07-08 11:47:19 +0800
27b0ee53a7 充值审核修复驳回仍加金币bug，金币明细筛选修复，充值明细未筛选驳回与未审核数据 lijianlin 2025-07-08 11:46:02 +0800
0df1b1dce8 精网号校验 sunjiabei 2025-07-08 10:59:06 +0800
f56b782d2f 工作台卡片每小时更新一次 lijianlin 2025-07-08 09:50:04 +0800
529ec114bb Merge branch 'refs/heads/lijianlin/feature-20250623120104-工作台与审核' into milestone-20250702-金币重构一期 lijianlin 2025-07-07 18:34:54 +0800
c2a4713c32 优化更新统计表数据，取绝对值 lijianlin 2025-07-07 18:32:22 +0800
ccea361ef7 消费金币变负数 sunjiabei 2025-07-07 18:00:55 +0800
f273d34a38 消费金币变负数 sunjiabei 2025-07-07 17:51:34 +0800
803c10952a Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期 huangqizhen 2025-07-07 17:36:28 +0800
68ed2799ab Merge branch 'milestone-20250702-金币重构一期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250702-金币重构一期 lihuilin 2025-07-07 17:35:34 +0800
850fb12eb3 7.6token提取用户 huangqizheng/feature-20250707173453-7.7bug修改 huangqizhen 2025-07-07 17:35:09 +0800
10ae590d08 审核记录添加到erp lijianlin 2025-07-07 15:30:03 +0800
945610e59a Merge branch 'milestone-20250702-金币重构一期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250702-金币重构一期 lihuilin 2025-07-07 11:54:07 +0800
b792a8f82b 退款优化，工作台昨日数据改正 lijianlin 2025-07-07 11:10:49 +0800
e3fb1b452c Merge branch 'refs/heads/huangqizheng/feature-20250704135104-bug修改' into milestone-20250702-金币重构一期 huangqizhen 2025-07-06 09:53:53 +0800
8160efc981 7.6token提取用户 huangqizhen 2025-07-06 09:53:25 +0800
d95c253d24 后端退款订单校验 sunjiabei 2025-07-06 09:47:14 +0800
7992072da5 优化退款审核 lijianlin 2025-07-05 17:49:36 +0800
25fac7bc4f Merge branch 'milestone-20250702-金币重构一期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250702-金币重构一期 lihuilin 2025-07-05 14:59:36 +0800
102b087619 Merge branch 'milestone-20250702-金币重构一期' of http://39.101.133.168:8807/huangqizhen/gold-java into lijianlin/feature-20250623120104-工作台与审核 lijianlin 2025-07-05 11:42:51 +0800
a655514f32 客户金币明细优化,审核排序修复 lijianlin 2025-07-05 11:40:59 +0800
befc74adb4 报错信息优化 sunjiabei 2025-07-05 11:26:06 +0800
f94219757e 金币空值校验 sunjiabei 2025-07-05 11:08:03 +0800
1270c5c74a 楼上接口打开 sunjiabei 2025-07-05 09:56:04 +0800
0b5d9e9fb0 Merge branch 'refs/heads/lijianlin/feature-20250623120104-工作台与审核' into milestone-20250702-金币重构一期 lijianlin 2025-07-04 18:31:49 +0800
6ec338b900 工作台，同比环比优化 lijianlin 2025-07-04 18:29:45 +0800
070a6fe1c8 Merge branch 'refs/heads/lijianlin/feature-20250623120104-工作台与审核' into milestone-20250702-金币重构一期 lijianlin 2025-07-04 16:16:31 +0800
2194496b31 审核排序 lijianlin 2025-07-04 16:15:46 +0800
408cac2795 金币校验 sunjiabei 2025-07-04 16:10:42 +0800
cfe1b35df5 排序 sunjiabei 2025-07-04 15:59:49 +0800
c14711fe75 Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期 huangqizhen 2025-07-04 15:28:48 +0800
1ea76cf56a 空格筛选 sunjiabei 2025-07-04 15:09:43 +0800
6e02cc9eac Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期 huangqizhen 2025-07-04 15:01:46 +0800
419059ff4b 空格筛选 sunjiabei 2025-07-04 15:01:09 +0800
73dbc706ca 空格筛选 sunjiabei 2025-07-04 13:58:16 +0800
64d249961c 7.4bug修复明细页面时间，导出列表查询 huangqizhen 2025-07-04 13:51:18 +0800
ade721ec19 汇率数据类型修改 lijianlin 2025-07-04 13:48:55 +0800
8167d06346 工作台全年消费bug修复 lijianlin 2025-07-04 13:26:47 +0800
4252618236 拉一下Merge branch 'milestone-20250702-金币重构一期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250702-金币重构一期 lihuilin 2025-07-04 10:39:27 +0800
e9188e4773 7-3工作台优化 jianlin 2025-07-03 14:50:13 +0800
82f01e50dc Merge branch 'milestone-20250702-金币重构一期' of http://39.101.133.168:8807/huangqizhen/gold-java into lijianlin/feature-20250623120104-工作台与审核 jianlin 2025-07-03 13:06:41 +0800
8c7605fe82 7-3aop jianlin 2025-07-03 12:59:39 +0800
d024415f3c 拉一下Merge branch 'milestone-20250702-金币重构一期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250702-金币重构一期 lihuilin 2025-07-03 10:49:46 +0800
e1d6a2dc11 7.2登录及相关配置 huangqizhen 2025-07-03 10:32:34 +0800
ac90b933bb Merge branch 'refs/heads/lijianlin/feature-20250623120104-工作台与审核' into milestone-20250702-金币重构一期 jianlin 2025-07-03 10:02:54 +0800
668e39a252 7-2审核统计数，工统计表存储优化 jianlin 2025-07-03 10:01:22 +0800
c567bae07f 哪里有冲突？ lihuilin 2025-07-03 09:52:10 +0800
60bf3424c8 7.2汇率合并 huangqizhen 2025-07-02 09:28:11 +0800
5206832e34 退款逻辑 sunjiabei 2025-07-01 17:55:17 +0800
c7cebb823c Merge branch 'refs/heads/lijianlin/feature-20250623120104-工作台与审核' into milestone-20250702-金币重构一期 jianlin 2025-07-01 17:52:35 +0800
05cf4c5983 7-1审核统计数，工作台优化 jianlin 2025-07-01 17:51:11 +0800
d884849dc4 Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期 huangqizhen 2025-07-01 17:30:34 +0800
dc95d625e6 可跑（不合并） huangqizhen 2025-07-01 17:29:25 +0800
ba19635520 退款逻辑 sunjiabei 2025-07-01 17:21:45 +0800
8bc41b60d6 楼上接口+商品查询修改 sunjiabei 2025-07-01 15:54:34 +0800
bbed22916d Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20250623120104-工作台与审核' into milestone-20250702-金币重构一期 jianlin 2025-07-01 10:34:18 +0800
04b61d2687 6-30审核相关接口（缺统计数据） jianlin 2025-07-01 10:32:04 +0800