From 237105951ac7665155c22ead448d68536415d8d6 Mon Sep 17 00:00:00 2001 From: lzm <17817447469@163.com> Date: Sat, 8 Oct 2022 16:20:06 +0800 Subject: [PATCH] =?UTF-8?q?v1.1:=20=E8=B4=A6=E5=8D=95=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E7=B1=BB=E8=B0=83=E6=95=B4=E3=80=81=E8=B4=A6=E5=8D=95=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=A2=9E=E5=8A=A0=E7=A4=BC=E7=89=A9=E6=80=BB=E4=BB=B7?= =?UTF-8?q?=E5=80=BC=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/accompany/admin/service/gift/GiftAdminService.java | 5 +++-- .../com/accompany/core/enumeration/BillObjTypeEnum.java | 6 +++--- .../com/accompany/business/service/gift/GiftService.java | 6 +++--- .../business/service/record/BillRecordService.java | 2 ++ .../main/java/com/accompany/business/vo/BillSearchVo.java | 2 ++ .../java/com/accompany/business/mq/MyMessageListener.java | 2 +- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/GiftAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/GiftAdminService.java index 99d207f1e..0fa49f621 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/GiftAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/GiftAdminService.java @@ -144,8 +144,9 @@ public class GiftAdminService extends RedisSupportService { GiftSendRecord giftSendRecord = giftSendRecordService.insertGiftInfo(uid, targetUid, roomUid, (byte) 2 , 1, giftId, giftNum, totalGoldNum, giftNum * gift.getGoldPrice()); // 插入账单的记录 - billRecordService.insertGeneralBillRecord(targetUid, uid, giftSendRecord.getSendRecordId().toString(), BillObjTypeEnum.GIFT_PERSON_INCOME, - totalDiamond.doubleValue()); + // billRecordService.insertGeneralBillRecord(targetUid, uid, giftSendRecord.getSendRecordId().toString(), BillObjTypeEnum.GIFT_PERSON_INCOME, + // totalDiamond.doubleValue()); + billRecordService.insertGiftSendBillRecord(targetUid, uid, roomUid, giftSendRecord.getSendRecordId().toString(), BillObjTypeEnum.GIFT_ROOM_INCOME, totalDiamond, giftId, giftNum,totalGoldNum); // 更新DB的钱包 userPurseMapperExpand.updatePurseDiamond(totalDiamond, targetUid); // 删除缓存钱包 diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/BillObjTypeEnum.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/BillObjTypeEnum.java index ca97df059..45e9a71c8 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/BillObjTypeEnum.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/BillObjTypeEnum.java @@ -16,11 +16,11 @@ public enum BillObjTypeEnum { 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_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), @@ -30,7 +30,7 @@ public enum BillObjTypeEnum { 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), diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftService.java index 442041c4f..16de5b01b 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftService.java @@ -154,7 +154,7 @@ public class GiftService extends BaseService { if (!sendResult) { 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.giftIncome, diamondNum, null, null, giftNum, giftId); // giftSendRecordService.insertGiftInfo(uid, targetUid, type, giftId, giftNum); @@ -277,7 +277,7 @@ public class GiftService extends BaseService { sendChatRoomMsgBySendGift(uid, targetUid, room.getRoomId(), giftId, giftNum); 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); String objId = giftSendRecord.getSendRecordId().toString(); 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); 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); String objId = giftSendRecord.getSendRecordId().toString(); billRecordService.insertGiftSendBillRecord(uid, targetUid, roomUid, objId, BillObjTypeEnum.GIFT_ROOM_PAY, totalGoldPrice.doubleValue(), giftId, giftNum, totalGoldPrice); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/record/BillRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/record/BillRecordService.java index 433ee957b..43dcf8902 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/record/BillRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/record/BillRecordService.java @@ -363,6 +363,8 @@ public class BillRecordService extends ServiceImpl //充值账单需要给showStr设值 String showStr = getShowStrByObjType(billRecord.getObjType(), billRecord.getActualAmount()); searchVo.setShowStr(showStr); + // 礼物收入/支出显示礼物总价值 + searchVo.setGiftTotalGoldNum(billRecord.getGiftTotalGoldNum()); Users user = userMap.get(billRecord.getUid()); if (user != null) { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/BillSearchVo.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/BillSearchVo.java index 30095fc12..726206e5b 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/BillSearchVo.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/BillSearchVo.java @@ -28,4 +28,6 @@ public class BillSearchVo { private Long receiveUid; private Date createTime; + private Long giftTotalGoldNum; + } diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/mq/MyMessageListener.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/mq/MyMessageListener.java index a191bdc6c..50ed8284e 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/mq/MyMessageListener.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/mq/MyMessageListener.java @@ -60,7 +60,7 @@ public class MyMessageListener { } if (!uid.equals(targetUid)) {//一堆一刷礼物已经前置处理，不在此处处理 // 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); String objId = giftSendRecord.getSendRecordId().toString();