lijianlin
|
17d4ab6a98
|
Merge branch 'milestone-20251215-优化' of http://39.101.133.168:8807/huangqizhen/gold-java into lijianlin/feature-20251209-现金管理三期
|
4 weeks ago |
|
lijianlin
|
79bce58fbd
|
12-12 同步金币数量进入商品数量（不乘一百）
|
4 weeks ago |
|
lijianlin
|
a577026c68
|
12-12 同步金豆*100计入永久金币
|
4 weeks ago |
|
lijianlin
|
0aade1b7c4
|
12-12 新增现金转换前支付信息
|
4 weeks ago |
|
lijianlin
|
f46f1886dd
|
Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20251211-fix' into dev
# Conflicts:
# src/main/resources/mapper/WorkBenchMapper.xml
|
1 month ago |
|
lijianlin
|
1cb29839f9
|
12-11 修复营收接口
|
1 month ago |
|
lijianlin
|
4908f8c61d
|
Merge remote-tracking branch 'refs/remotes/origin/milestone-20251203-冲刺计划' into dev
|
1 month ago |
|
lijianlin
|
b16dbd191e
|
12-11 同步审核字段
|
1 month ago |
 sunjiabei
|
7db77c5391
|
12月10日消费修复
|
1 month ago |
|
lijianlin
|
1257bbb421
|
Merge branch 'milestone-20251203-冲刺计划' of http://39.101.133.168:8807/huangqizhen/gold-java into lijianlin/feature-20251209-现金管理三期
|
1 month ago |
|
lijianlin
|
9f80eb6c0a
|
12-10 收款赠送免费金币
|
1 month ago |
huangqizhen
|
0f7329d726
|
12.5 累计消耗
|
1 month ago |
|
lijianlin
|
1ef52d0816
|
12-09 频道管理合计数的频道权限修复
|
1 month ago |
|
lijianlin
|
3d1a8e11f7
|
12-09 同步订单金额×100
|
1 month ago |
|
sunjiabei
|
4f7a6f4310
|
Merge remote-tracking branch 'origin/milestone-20251203-冲刺计划' into milestone-20251203-冲刺计划
# Conflicts:
# src/main/java/com/example/demo/service/Temporary/RedService.java
|
1 month ago |
|
sunjiabei
|
e74fabab56
|
12月5日消费红包
|
1 month ago |
|
huangqizhen
|
6af54d2f50
|
12.5 累计消耗
|
1 month ago |
|
huangqizhen
|
809c92efa8
|
12.5 累计消耗
|
1 month ago |
|
huangqizhen
|
29a01d70b9
|
12.5 累计消耗
|
1 month ago |
|
sunjiabei
|
b60cba10d4
|
12月5日消费红包
|
1 month ago |
|
sunjiabei
|
4cc2d4849f
|
Merge remote-tracking branch 'origin/milestone-20251203-冲刺计划' into milestone-20251203-冲刺计划
|
1 month ago |
|
sunjiabei
|
fa719da156
|
12月5日消费
|
1 month ago |
|
huangqizhen
|
0c09f2e70d
|
12.5 累计消耗
|
1 month ago |
|
sunjiabei
|
86a1151181
|
12月4日消费精网号传递
|
1 month ago |
|
huangqizhen
|
6575ca6b5f
|
12.4 储值修改逻辑
|
1 month ago |
|
lijianlin
|
52bf03c29b
|
12-04 发送精网号，修改链接地址（开发与测试）
|
1 month ago |
|
lijianlin
|
9d2e6d3baf
|
12-04 发送精网号，修改链接地址
|
1 month ago |
|
huangqizhen
|
68194d2c96
|
12.4 修改充值bug
|
1 month ago |
|
lijianlin
|
783ccb868c
|
12-04 发送红包，连接改正式
|
1 month ago |
|
lijianlin
|
ec2afc99fa
|
12-04 累充事务隔离
|
1 month ago |
|
lijianlin
|
642dec90ca
|
12-04 同步线上收款订单，修改ios到账地区
|
1 month ago |
|
sunjiabei
|
49f243f435
|
12月4日消费精网号传递
|
1 month ago |
|
lijianlin
|
8e40c6cdb6
|
12-04 发送精网号方法，储值发送精网号
|
1 month ago |
|
huangqizhen
|
72d63cbc16
|
12.3 冲刺计划累计充值逻辑修改
|
1 month ago |
|
huangqizhen
|
823c1ed420
|
Merge branch 'refs/heads/milestone-20251203-冲刺计划' into huangqizheng/feature-20251203174217-冲刺计划
|
1 month ago |
|
huangqizhen
|
5554d943d1
|
12.3 冲刺计划累计充值
|
1 month ago |
|
lijianlin
|
c1122e5124
|
12-03 线上订单同步，继续补充字段
|
1 month ago |
wangguorui
|
9b9ffd55ac
|
12月3日现金管理多语言配置,优化退款方式导出Excel（2）
|
1 month ago |
|
wangguorui
|
01c919175f
|
12月3日现金管理多语言配置,优化退款方式导出Excel
|
1 month ago |
|
wangguorui
|
2464be7348
|
12月2日现金管理多语言配置，反向查询中文
|
1 month ago |
|
wangguorui
|
1600577d53
|
Merge branch 'refs/heads/wangguorui/feature-20251125171605-现金管理多语言配置' into milestone-20251125-多语言
# Conflicts:
# src/main/java/com/example/demo/controller/coin/ConsumeController.java
|
1 month ago |
|
wangguorui
|
c3b169f02d
|
12月2日现金管理多语言配置，反向查询中文
|
1 month ago |
|
sunjiabei
|
b138f5476c
|
Merge remote-tracking branch 'origin/milestone-20251125-多语言' into milestone-20251125-多语言
|
1 month ago |
|
sunjiabei
|
54926b0cb5
|
12月2日同步
|
1 month ago |
|
lijianlin
|
99429bd026
|
Merge remote-tracking branch 'origin/milestone-20251125-多语言' into milestone-20251125-多语言
|
1 month ago |
|
lijianlin
|
fe3fd8602a
|
Merge branch 'milestone-20251125-多语言' of http://39.101.133.168:8807/huangqizhen/gold-java into lijianlin/feature-20251104110749-现金管理二期
# Conflicts:
# src/main/java/com/example/demo/controller/coin/RefundController.java
|
1 month ago |
|
sunjiabei
|
24788325b7
|
12月2日地区传值
|
1 month ago |
|
lijianlin
|
100cacf53c
|
12-01 线上订单同步，补充字段
|
1 month ago |
|
wangguorui
|
a878abc602
|
12月1日现金管理多语言配置，修改msg
|
1 month ago |
|
wangguorui
|
c00c460f84
|
12月1日现金管理多语言配置，修改msg
|
1 month ago |
