独联体2
This commit is contained in:
@@ -292,9 +292,10 @@ public enum BillObjTypeEnum {
|
||||
DAILY_TASK_NEW_ANCHOR_DIAOMND( 196, "新公会主播金币", BillTypeEnum.IN, CurrencyEnum.DIAMOND, BillDomainTypeEnum.DAILY_TASK),
|
||||
DAILY_TASK_NEW_ANCHOR_GOLD( 197, "新公会主播钻石", BillTypeEnum.IN, CurrencyEnum.GOLD, BillDomainTypeEnum.DAILY_TASK),
|
||||
DAILY_SHOP_BUY_DIAMOND( 198, "金豆兑换金币收入", BillTypeEnum.IN, CurrencyEnum.DIAMOND, BillDomainTypeEnum.DAILY_TASK),
|
||||
ANCHOR_EXTRA_GOLD( 199, "主播额外钻石收入", BillTypeEnum.IN, CurrencyEnum.GOLD, BillDomainTypeEnum.EXTRA_GOLD),
|
||||
OWNER_EXTRA_GOLD( 200, "公会长额外钻石收入", BillTypeEnum.IN, CurrencyEnum.GOLD, BillDomainTypeEnum.EXTRA_GOLD),
|
||||
ROOM_EXTRA_GOLD( 201, "房间额外钻石收入", BillTypeEnum.IN, CurrencyEnum.GOLD, BillDomainTypeEnum.EXTRA_GOLD),
|
||||
ANCHOR_EXTRA_GOLD( 199, "次日钻石奖励", BillTypeEnum.IN, CurrencyEnum.GOLD, BillDomainTypeEnum.EXTRA_GOLD),
|
||||
ANCHOR_EXTRA_LUCKY_GOLD( 200, "CIS主播钻石奖励", BillTypeEnum.IN, CurrencyEnum.GOLD, BillDomainTypeEnum.EXTRA_GOLD),
|
||||
OWNER_EXTRA_GOLD( 201, "CIS公会长钻石奖励", BillTypeEnum.IN, CurrencyEnum.GOLD, BillDomainTypeEnum.EXTRA_GOLD),
|
||||
ROOM_EXTRA_GOLD( 202, "CIS房主钻石奖励", BillTypeEnum.IN, CurrencyEnum.GOLD, BillDomainTypeEnum.EXTRA_GOLD),
|
||||
;
|
||||
|
||||
BillObjTypeEnum(int value, String desc, BillTypeEnum type, CurrencyEnum currency, BillDomainTypeEnum domain) {
|
||||
|
@@ -51,7 +51,7 @@ public class ExtraDiamondDayService {
|
||||
userPurseService.addGold(ownerUid, ownerDiamondNum.doubleValue(), OWNER_EXTRA_GOLD);
|
||||
}
|
||||
if (ownerLuckyDiamond.compareTo(BigDecimal.ZERO) > 0) {
|
||||
userPurseService.addGold(ownerUid, ownerDiamondNum.doubleValue(), OWNER_EXTRA_GOLD);
|
||||
userPurseService.addGold(ownerUid, ownerLuckyDiamond.doubleValue(), OWNER_EXTRA_GOLD);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -110,10 +110,10 @@ public class GuildGiftRecordService extends ServiceImpl<GuildGiftRecordMapper, G
|
||||
}
|
||||
|
||||
if (partitionInfo.getId() == PartitionEnum.SOVIET.getId()) {
|
||||
extraDiamondDayService.updateGuildExtraDiamond(guildMember, cycleDate, statDate, 0D, totalDiamondNum, createTime);
|
||||
extraDiamondDayService.updateGuildExtraDiamond(guildMember, cycleDate, statDate, totalDiamondNum, 0D, createTime);
|
||||
statDate = DateTimeUtil.convertWithZoneId(createTime, partitionInfo.getZoneId()).format(dateFormatter);
|
||||
extraDiamondDayService.updateRoomExtraDiamond(guildMember, giftSendRecord.getReciveUid(), partitionInfo.getId(),
|
||||
statDate, giftSendRecord.getRoomUid(), 0D, totalDiamondNum, createTime);
|
||||
statDate, giftSendRecord.getRoomUid(), totalDiamondNum, 0D, createTime);
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -5,7 +5,7 @@
|
||||
INSERT INTO `room_extra_diamond_day` (`partition_id`, `stat_date`, `guild_member_id`, `guild_id`, `uid`,
|
||||
`room_uid`, `diamond_num`, `lucky_diamond_num`, `create_time`, `update_time`)
|
||||
VALUES (#{partitionId}, #{statDate}, #{guildMemberId}, #{guildId}, #{uid}, #{roomUid}, #{normalDiamondNum},
|
||||
#{luckyDiamondNum}, #{luckyDiamondNum},#{time} ,#{time})
|
||||
#{luckyDiamondNum},#{time} ,#{time})
|
||||
ON DUPLICATE KEY UPDATE
|
||||
diamond_num = diamond_num + values (diamond_num),
|
||||
lucky_diamond_num = lucky_diamond_num + values (lucky_diamond_num),
|
||||
|
Reference in New Issue
Block a user