angelo
/
java-zk-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: angelo:88efae95d5d0c6d894d5ed6412ed02bd21d4458a
Branches Tags
angelo:master
angelo:online
angelo:test
angelo:dev
..
compare: angelo:7341e3c8edd2995f028f8e565f3f5d141f588f97
Branches Tags
angelo:online
angelo:test
angelo:dev
angelo:master

2 Commits
88efae95d5 ... 7341e3c8ed

Author SHA1 Message Date
cabbage 7341e3c8ed Merge remote-tracking branch 'origin/dev' into dev 2025-10-22 14:53:15 +08:00
cabbage 10518e8659 ## 一阶段点位创建时间为订单时间；二三阶段为实时； 2025-10-22 14:53:06 +08:00
2 changed files with 4 additions and 4 deletions
Show Stats Expand all files Collapse all files

4
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java
View File

@ -737,7 +737,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
.stageStatus(EBonusStageStatus.NO.getValue())
.pointType(EBonusStageType.NORMAL.getValue())
.pointGift(pointGift)
.creationTime(settleDate)
.creationTime(saOrderExt.getPayTime())
.thirdBonus1(0)
.thirdBonus2(0)
.thirdBonus3(0)
@ -768,7 +768,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
.stageStatus(EBonusStageStatus.NO.getValue())
.pointType(EBonusStageType.GIFT.getValue())
.pointGift(0)
.creationTime(settleDate)
.creationTime(saOrderExt.getPayTime())
.thirdBonus1(0)
.thirdBonus2(0)
.thirdBonus3(0)

4
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusStageServiceImpl.java
View File

@ -307,7 +307,7 @@ public class CuMemberBonusStageServiceImpl extends ServiceImpl<CuMemberBonusStag
.stageStatus(EBonusStageStatus.NO.getValue())
.pointType(targetRetailDetail.getPointType())
.pointGift(targetRetailDetail.getPointGift())
.creationTime(settleDate)
.creationTime(new Date())
.thirdBonus1(0)
.thirdBonus2(0)
.thirdBonus3(0)
@ -332,7 +332,7 @@ public class CuMemberBonusStageServiceImpl extends ServiceImpl<CuMemberBonusStag
.stageStatus(EBonusStageStatus.NO.getValue())
.pointType(targetRetailDetail.getPointType())
.pointGift(targetRetailDetail.getPointGift())
.creationTime(settleDate)
.creationTime(new Date())
.thirdBonus1(0)
.thirdBonus2(0)
.thirdBonus3(0)