moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.1: 账单枚举类调整、账单获取增加礼物总价值字段

Browse Source
This commit is contained in:
lzm
2022-10-08 16:20:06 +08:00
parent ef73c3bad2
commit 237105951a
6 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/GiftAdminService.java
View File

@@ -144,8 +144,9 @@ public class GiftAdminService extends RedisSupportService<Gift, GiftExample> {
GiftSendRecord giftSendRecord = giftSendRecordService.insertGiftInfo(uid, targetUid, roomUid, (byte) 2 GiftSendRecord giftSendRecord = giftSendRecordService.insertGiftInfo(uid, targetUid, roomUid, (byte) 2
, 1, giftId, giftNum, totalGoldNum, giftNum * gift.getGoldPrice()); , 1, giftId, giftNum, totalGoldNum, giftNum * gift.getGoldPrice());
// 插入账单的记录 // 插入账单的记录
billRecordService.insertGeneralBillRecord(targetUid, uid, giftSendRecord.getSendRecordId().toString(), BillObjTypeEnum.GIFT_PERSON_INCOME, // billRecordService.insertGeneralBillRecord(targetUid, uid, giftSendRecord.getSendRecordId().toString(), BillObjTypeEnum.GIFT_PERSON_INCOME,
totalDiamond.doubleValue()); // totalDiamond.doubleValue());
billRecordService.insertGiftSendBillRecord(targetUid, uid, roomUid, giftSendRecord.getSendRecordId().toString(), BillObjTypeEnum.GIFT_ROOM_INCOME, totalDiamond, giftId, giftNum,totalGoldNum);
// 更新DB的钱包 // 更新DB的钱包
userPurseMapperExpand.updatePurseDiamond(totalDiamond, targetUid); userPurseMapperExpand.updatePurseDiamond(totalDiamond, targetUid);
// 删除缓存钱包 // 删除缓存钱包

6
accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/BillObjTypeEnum.java
View File

@@ -16,11 +16,11 @@ public enum BillObjTypeEnum {
GIFT_ROOM_PAY((byte) 3, "房间礼物支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND), GIFT_ROOM_PAY((byte) 3, "房间礼物支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
GIFT_ROOM_INCOME((byte) 4, "房间收礼物收入", BillTypeEnum.IN, CurrencyEnum.CRYSTAL), GIFT_ROOM_INCOME((byte) 4, "房间收礼物收入", BillTypeEnum.IN, CurrencyEnum.GOLD),
GIFT_PERSON_PAY((byte) 5, "私聊礼物支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND), GIFT_PERSON_PAY((byte) 5, "私聊礼物支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
GIFT_PERSON_INCOME((byte) 6, "私聊礼物收入", BillTypeEnum.IN, CurrencyEnum.CRYSTAL), GIFT_PERSON_INCOME((byte) 6, "私聊礼物收入", BillTypeEnum.IN, CurrencyEnum.GOLD),
PACKET_DIAMOND_PAY((byte) 7, "金币红包支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND), PACKET_DIAMOND_PAY((byte) 7, "金币红包支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
@@ -30,7 +30,7 @@ public enum BillObjTypeEnum {
PACKET_GIFT_INCOME((byte) 10, "礼物红包收入", BillTypeEnum.OUT, CurrencyEnum.CRYSTAL), PACKET_GIFT_INCOME((byte) 10, "礼物红包收入", BillTypeEnum.OUT, CurrencyEnum.CRYSTAL),
ROOM_PERCENTAGE_INCOME((byte) 11, "房间流水抽成收入", BillTypeEnum.IN, CurrencyEnum.CRYSTAL), ROOM_PERCENTAGE_INCOME((byte) 11, "房间流水抽成收入", BillTypeEnum.IN, CurrencyEnum.GOLD),
EXCHANGE_CRYSTAL_TO_DIAMOND_PAY((byte) 12, "水晶兑换钻石支出", BillTypeEnum.OUT, CurrencyEnum.CRYSTAL), EXCHANGE_CRYSTAL_TO_DIAMOND_PAY((byte) 12, "水晶兑换钻石支出", BillTypeEnum.OUT, CurrencyEnum.CRYSTAL),

6
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftService.java
View File

@@ -154,7 +154,7 @@ public class GiftService extends BaseService {
if (!sendResult) { if (!sendResult) {
return new BusiResult(BusiStatus.PURSEMONEYNOTENOUGH); return new BusiResult(BusiStatus.PURSEMONEYNOTENOUGH);
} }
userPurseService.addCrystal(targetUid, diamondNum.doubleValue(), BillObjTypeEnum.GIFT_PERSON_INCOME.getDesc()); userPurseService.addGold(targetUid, diamondNum.doubleValue(), BillObjTypeEnum.GIFT_PERSON_INCOME.getDesc());
// billRecordService.insertBillRecordBySendGift(uid, uid, null, Constant.BillType.giftPay, null, -goldPrice, null, giftNum, giftId); // billRecordService.insertBillRecordBySendGift(uid, uid, null, Constant.BillType.giftPay, null, -goldPrice, null, giftNum, giftId);
// billRecordService.insertBillRecordBySendGift(uid, uid, null, Constant.BillType.giftIncome, diamondNum, null, null, giftNum, giftId); // billRecordService.insertBillRecordBySendGift(uid, uid, null, Constant.BillType.giftIncome, diamondNum, null, null, giftNum, giftId);
// giftSendRecordService.insertGiftInfo(uid, targetUid, type, giftId, giftNum); // giftSendRecordService.insertGiftInfo(uid, targetUid, type, giftId, giftNum);
@@ -277,7 +277,7 @@ public class GiftService extends BaseService {
sendChatRoomMsgBySendGift(uid, targetUid, room.getRoomId(), giftId, giftNum); sendChatRoomMsgBySendGift(uid, targetUid, room.getRoomId(), giftId, giftNum);
if (uid.equals(targetUid)) {//自己给自己刷礼物 if (uid.equals(targetUid)) {//自己给自己刷礼物
userPurseService.addCrystal(targetUid, diamondNum.doubleValue(), BillObjTypeEnum.GIFT_PERSON_INCOME.getDesc()); userPurseService.addGold(targetUid, diamondNum.doubleValue(), BillObjTypeEnum.GIFT_PERSON_INCOME.getDesc());
GiftSendRecord giftSendRecord = giftSendRecordService.insertGiftInfo(uid, targetUid, roomUid, room.getType(), type, giftId, giftNum, totalGoldPrice, diamondNum); GiftSendRecord giftSendRecord = giftSendRecordService.insertGiftInfo(uid, targetUid, roomUid, room.getType(), type, giftId, giftNum, totalGoldPrice, diamondNum);
String objId = giftSendRecord.getSendRecordId().toString(); String objId = giftSendRecord.getSendRecordId().toString();
billRecordService.insertGiftSendBillRecord(uid, targetUid, roomUid, objId, BillObjTypeEnum.GIFT_ROOM_PAY, totalGoldPrice.doubleValue(), giftId, giftNum, totalGoldPrice); billRecordService.insertGiftSendBillRecord(uid, targetUid, roomUid, objId, BillObjTypeEnum.GIFT_ROOM_PAY, totalGoldPrice.doubleValue(), giftId, giftNum, totalGoldPrice);
@@ -410,7 +410,7 @@ public class GiftService extends BaseService {
Room room = roomService.getRoomByUid(roomUid); Room room = roomService.getRoomByUid(roomUid);
if (uid.equals(targetUid)) {//自己给自己刷礼物 if (uid.equals(targetUid)) {//自己给自己刷礼物
userPurseService.addCrystal(targetUid, diamondNum.doubleValue(), BillObjTypeEnum.GIFT_PERSON_INCOME.getDesc()); userPurseService.addGold(targetUid, diamondNum.doubleValue(), BillObjTypeEnum.GIFT_PERSON_INCOME.getDesc());
GiftSendRecord giftSendRecord = giftSendRecordService.insertGiftInfo(uid, targetUid, roomUid, room.getType(), type, giftId, giftNum, totalGoldPrice, diamondNum); GiftSendRecord giftSendRecord = giftSendRecordService.insertGiftInfo(uid, targetUid, roomUid, room.getType(), type, giftId, giftNum, totalGoldPrice, diamondNum);
String objId = giftSendRecord.getSendRecordId().toString(); String objId = giftSendRecord.getSendRecordId().toString();
billRecordService.insertGiftSendBillRecord(uid, targetUid, roomUid, objId, BillObjTypeEnum.GIFT_ROOM_PAY, totalGoldPrice.doubleValue(), giftId, giftNum, totalGoldPrice); billRecordService.insertGiftSendBillRecord(uid, targetUid, roomUid, objId, BillObjTypeEnum.GIFT_ROOM_PAY, totalGoldPrice.doubleValue(), giftId, giftNum, totalGoldPrice);

2
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/record/BillRecordService.java
View File

@@ -363,6 +363,8 @@ public class BillRecordService extends ServiceImpl<BillRecordMapper,BillRecord>
//充值账单需要给showStr设值 //充值账单需要给showStr设值
String showStr = getShowStrByObjType(billRecord.getObjType(), billRecord.getActualAmount()); String showStr = getShowStrByObjType(billRecord.getObjType(), billRecord.getActualAmount());
searchVo.setShowStr(showStr); searchVo.setShowStr(showStr);
// 礼物收入/支出显示礼物总价值
searchVo.setGiftTotalGoldNum(billRecord.getGiftTotalGoldNum());
Users user = userMap.get(billRecord.getUid()); Users user = userMap.get(billRecord.getUid());
if (user != null) { if (user != null) {

2
accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/BillSearchVo.java
View File

@@ -28,4 +28,6 @@ public class BillSearchVo {
private Long receiveUid; private Long receiveUid;
private Date createTime; private Date createTime;
private Long giftTotalGoldNum;
} }

2
accompany-business/accompany-business-web/src/main/java/com/accompany/business/mq/MyMessageListener.java
View File

@@ -60,7 +60,7 @@ public class MyMessageListener {
} }
if (!uid.equals(targetUid)) {//一堆一刷礼物已经前置处理，不在此处处理 if (!uid.equals(targetUid)) {//一堆一刷礼物已经前置处理，不在此处处理
// userPurseService.updateMinusGoldNum(uid,totalGoldNum);//刷礼物人 // userPurseService.updateMinusGoldNum(uid,totalGoldNum);//刷礼物人
userPurseService.addCrystal(targetUid, diamondNum, BillObjTypeEnum.GIFT_PERSON_INCOME.getDesc()); userPurseService.addGold(targetUid, diamondNum, BillObjTypeEnum.GIFT_PERSON_INCOME.getDesc());
GiftSendRecord giftSendRecord = giftSendRecordService.insertGiftInfo(uid, targetUid, roomUid, roomType, type, giftId, giftNum, totalGoldNum, diamondNum); GiftSendRecord giftSendRecord = giftSendRecordService.insertGiftInfo(uid, targetUid, roomUid, roomType, type, giftId, giftNum, totalGoldNum, diamondNum);
String objId = giftSendRecord.getSendRecordId().toString(); String objId = giftSendRecord.getSendRecordId().toString();