lijianlin
|
a3a6577f9b
|
01-14 优化消耗查询
|
2 days ago |
wangguorui
|
8fc3c1eaca
|
Merge remote-tracking branch 'origin/milestone-20260113-现金管理0109' into milestone-20260113-现金管理0109
# Conflicts:
# src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java
|
2 days ago |
|
wangguorui
|
7c89b6c5d8
|
1月14日，金币消费导出添加字段，并优化退款类型数字转文字
|
2 days ago |
|
lijianlin
|
fc5bff56b6
|
01-14 修改消耗查询，不再联查
|
2 days ago |
|
lijianlin
|
8d88222359
|
01-14 消耗查询，金币数默认值0
|
2 days ago |
|
wangguorui
|
267fbb9b04
|
金币消费导出添加字段
|
3 days ago |
|
wangguorui
|
1667664115
|
Merge branch 'refs/heads/milestone-20251209-多语言二期' into milestone-20260113-现金管理0109
|
3 days ago |
|
wangguorui
|
b29e1beb96
|
1月13日现金管理，跨地区操作优化（2）
|
3 days ago |
|
wangguorui
|
ac14add20e
|
Merge remote-tracking branch 'origin/milestone-20251209-多语言二期' into milestone-20251209-多语言二期
|
3 days ago |
|
wangguorui
|
e6696c7816
|
1月8日现金管理多语言配置，导出文件的名称进行优化
|
1 week ago |
|
wangguorui
|
1caec82d05
|
1月7日现金管理多语言配置，导出文件的名称进行多语言配置以及各模块优化
|
1 week ago |
|
wangguorui
|
3d7bce5178
|
1月13日现金管理，跨地区操作优化
|
3 days ago |
|
lijianlin
|
27fa168d1b
|
01-13 消耗查询连表条件删减
|
3 days ago |
huangqizhen
|
7af4f55bfb
|
1.13 初始化
|
3 days ago |
|
lijianlin
|
4a37350bf5
|
Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20260113-现金管理0109' into milestone-20260113-现金管理0109
|
3 days ago |
|
lijianlin
|
ba338ccd83
|
01-13 消耗页面显示已退款订单的消耗详情信息
|
3 days ago |
|
lijianlin
|
77f3c30543
|
01-13 消耗筛选新增是否已退款筛选
|
3 days ago |
|
huangqizhen
|
c86cd580ed
|
Merge branch 'refs/heads/milestone-20251215-红包修改' into dev
# Conflicts:
# src/main/java/com/example/demo/controller/cash/CashCollectionController.java
|
3 days ago |
|
lijianlin
|
d4a4e36028
|
01-12 0金币消费与退款订单传erp
|
4 days ago |
|
huangqizhen
|
2fe0047266
|
1.12 添加提交金币为零
|
4 days ago |
|
lijianlin
|
ce2dceec96
|
01-12 待处理的退款订单通过时校验金币够不够扣
|
4 days ago |
|
lijianlin
|
59b09ffc5a
|
01-12 更新方法price字段优化
|
4 days ago |
|
lijianlin
|
7311a4dcef
|
01-11 更改link接口地址
|
5 days ago |
|
lijianlin
|
c46f01f62c
|
01-11 修复退红包参数缺失 异常输出修改
|
5 days ago |
|
lijianlin
|
f3b8f3350a
|
01-10 退款更改累充额
|
6 days ago |
|
lijianlin
|
9f59ad66c8
|
01-10 更改扣款顺序
|
6 days ago |
|
lijianlin
|
aa84098d50
|
01-10 审核不该状态bug修复
|
6 days ago |
|
lijianlin
|
19ae62db78
|
01-10 红包退款地址更换link测试环境
|
6 days ago |
|
lijianlin
|
3383aa8308
|
01-10 红包退款优化
|
6 days ago |
|
huangqizhen
|
b7551f7e7a
|
1.7 修改飞书报警
|
6 days ago |
|
lijianlin
|
2928dabf04
|
01-10 增加旧订单飞书报警，红包退款优化
|
6 days ago |
|
huangqizhen
|
72fbb10c97
|
1.7 修改增加传参linkId
|
6 days ago |
|
huangqizhen
|
4a13b58dc8
|
1.7 修改增加传参linkId
|
6 days ago |
|
lijianlin
|
728c7c9d02
|
01-10 修改link红包接口业务判断；判断是否为老订单
|
6 days ago |
|
lijianlin
|
1463d04cbd
|
Merge remote-tracking branch 'origin/milestone-20251215-红包修改' into milestone-20251215-红包修改
|
1 week ago |
|
lijianlin
|
27a90e956b
|
01-09 新增退款时传入price；红包退款，判断为旧订单则执行原退款流程
|
1 week ago |
|
lijianlin
|
d9cd4c183a
|
01-09 新增退款是传入price；红包退款，判断为旧订单则执行原退款流程
|
1 week ago |
|
huangqizhen
|
87c6e0dc37
|
1.7 修改增加传参price
|
1 week ago |
|
huangqizhen
|
8c09e4cf55
|
1.7 修改传参linkid
|
1 week ago |
|
lijianlin
|
84fdfa22cc
|
01-08 红包退款 price与linkid校验
|
1 week ago |
|
wangguorui
|
f41b853731
|
1月8日现金管理多语言配置，导出文件的名称进行优化
|
1 week ago |
|
wangguorui
|
e0aaa582d7
|
1月7日现金管理多语言配置，导出文件的名称进行多语言配置以及各模块优化
|
1 week ago |
|
huangqizhen
|
6dab285199
|
1.7 修改传参接口
|
1 week ago |
|
lijianlin
|
0db8274260
|
Merge remote-tracking branch 'origin/milestone-20251215-红包修改' into milestone-20251215-红包修改
|
1 week ago |
|
lijianlin
|
d3ff123b8e
|
01-07 撤销扣款顺序更改
|
1 week ago |
|
lijianlin
|
b29c95bdab
|
01-07 退款扣金币抵扣红包 修改扣款顺序至任务免费永久
|
1 week ago |
|
huangqizhen
|
ad9b71f402
|
1.7 红包数据同步修改
|
1 week ago |
|
huangqizhen
|
ec6e504e1d
|
Merge branch 'refs/heads/huangqizheng/feature-20260106155423-红包修改' into milestone-20251215-红包修改
# Conflicts:
# src/main/java/com/example/demo/Util/GoldTistV2.java
# src/main/java/com/example/demo/domain/entity/UserGoldRecord.java
# src/main/java/com/example/demo/service/Temporary/RedService.java
# src/main/java/com/example/demo/serviceImpl/Temporary/RedServiceImpl.java
# src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java
# src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java
|
1 week ago |
|
huangqizhen
|
fe311e80b8
|
1.7 红包数据同步
|
1 week ago |
|
lijianlin
|
1f4ddf6764
|
01-06 审核接口返回值修改+红包退款link接口拆分
|
1 week ago |
