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

Compare commits

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

No commits in common. "7341e3c8edd2995f028f8e565f3f5d141f588f97" and "88efae95d5d0c6d894d5ed6412ed02bd21d4458a" have entirely different histories.
7341e3c8ed ... 88efae95d5

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()) .stageStatus(EBonusStageStatus.NO.getValue())
.pointType(EBonusStageType.NORMAL.getValue()) .pointType(EBonusStageType.NORMAL.getValue())
.pointGift(pointGift) .pointGift(pointGift)
.creationTime(saOrderExt.getPayTime()) .creationTime(settleDate)
.thirdBonus1(0) .thirdBonus1(0)
.thirdBonus2(0) .thirdBonus2(0)
.thirdBonus3(0) .thirdBonus3(0)
@ -768,7 +768,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
.stageStatus(EBonusStageStatus.NO.getValue()) .stageStatus(EBonusStageStatus.NO.getValue())
.pointType(EBonusStageType.GIFT.getValue()) .pointType(EBonusStageType.GIFT.getValue())
.pointGift(0) .pointGift(0)
.creationTime(saOrderExt.getPayTime()) .creationTime(settleDate)
.thirdBonus1(0) .thirdBonus1(0)
.thirdBonus2(0) .thirdBonus2(0)
.thirdBonus3(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()) .stageStatus(EBonusStageStatus.NO.getValue())
.pointType(targetRetailDetail.getPointType()) .pointType(targetRetailDetail.getPointType())
.pointGift(targetRetailDetail.getPointGift()) .pointGift(targetRetailDetail.getPointGift())
.creationTime(new Date()) .creationTime(settleDate)
.thirdBonus1(0) .thirdBonus1(0)
.thirdBonus2(0) .thirdBonus2(0)
.thirdBonus3(0) .thirdBonus3(0)
@ -332,7 +332,7 @@ public class CuMemberBonusStageServiceImpl extends ServiceImpl<CuMemberBonusStag
.stageStatus(EBonusStageStatus.NO.getValue()) .stageStatus(EBonusStageStatus.NO.getValue())
.pointType(targetRetailDetail.getPointType()) .pointType(targetRetailDetail.getPointType())
.pointGift(targetRetailDetail.getPointGift()) .pointGift(targetRetailDetail.getPointGift())
.creationTime(new Date()) .creationTime(settleDate)
.thirdBonus1(0) .thirdBonus1(0)
.thirdBonus2(0) .thirdBonus2(0)
.thirdBonus3(0) .thirdBonus3(0)