账单-将lucky24和bravo从送礼中拆分出来

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

@@ -229,6 +229,12 @@ public enum BillObjTypeEnum {
     BRAVO_INCOME_ALLOT( 152, "Bravo礼物价值分成", BillTypeEnum.IN, CurrencyEnum.DIAMOND, BillDomainTypeEnum.SEND_GIFT),
     BRAVO_GIFT_DIAMOND( 153, "Bravo礼物金币奖返点", BillTypeEnum.IN, CurrencyEnum.DIAMOND, BillDomainTypeEnum.SEND_GIFT),
     ROOM_DAY_DIAMOND_REWARD(154, "日房间奖励", BillTypeEnum.IN, CurrencyEnum.DIAMOND, BillDomainTypeEnum.ACTIVITY),
+
+    LUCKY_NUM_JACKPOT_INPUT_GOLD(155, "幸运数字奖池金币投入", BillTypeEnum.OUT, CurrencyEnum.DIAMOND, BillDomainTypeEnum.ACTIVITY),
+    LUCKY_NUM_JACKPOT_OUTPUT_GOLD(156, "幸运数字奖池金币瓜分", BillTypeEnum.IN, CurrencyEnum.DIAMOND, BillDomainTypeEnum.ACTIVITY),
+
+    LUCKY_24_GIFT_PAY( 157, "幸运礼物支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND, BillDomainTypeEnum.SEND_GIFT),
+    BRAVO_GIFT_PAY( 158, "Bravo礼物支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND, BillDomainTypeEnum.SEND_GIFT),
     ;
 
     BillObjTypeEnum(int value, String desc, BillTypeEnum type, CurrencyEnum currency, BillDomainTypeEnum domain) {

accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftMessageService.java

@@ -13,6 +13,7 @@ import com.accompany.business.service.record.BillRecordService;
 import com.accompany.business.service.vip.VipAuthItemService;
 import com.accompany.business.util.VipUtil;
 import com.accompany.common.constant.Constant;
+import com.accompany.common.constant.GiftTypeEnum;
 import com.accompany.common.redis.RedisKey;
 import com.accompany.core.enumeration.BillObjTypeEnum;
 import com.accompany.core.service.base.BaseService;
@@ -81,6 +82,11 @@ public class GiftMessageService extends BaseService {
             inEnum = BillObjTypeEnum.GIFT_ROOM_INCOME;
             outEnum = BillObjTypeEnum.GIFT_ROOM_PAY;
         }
+        if (giftMessage.getGiftType() == GiftTypeEnum.LUCKY_24.getType()){
+            outEnum = BillObjTypeEnum.LUCKY_24_GIFT_PAY;
+        } else if (giftMessage.getGiftType() == GiftTypeEnum.BRAVO.getType()) {
+            outEnum = BillObjTypeEnum.BRAVO_GIFT_PAY;
+        }
 
         Date giftSendTime = new Date(giftMessage.getMessTime());
 

accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftSendService.java

@@ -31,6 +31,7 @@ import com.accompany.business.vo.luckybag.LuckyBagGiftVo;
 import com.accompany.common.config.SystemConfig;
 import com.accompany.common.constant.Attach;
 import com.accompany.common.constant.Constant;
+import com.accompany.common.constant.GiftTypeEnum;
 import com.accompany.common.redis.RedisKey;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.utils.DateTimeUtil;
@@ -525,7 +526,10 @@ public class GiftSendService extends BaseService {
                        Integer everyGiftNum, Long everyGoldNum, Integer totalGiftNum, Long totalGoldNum,
                        int giftSource, byte sendType, Date sendGiftTime) {
         //扣
-        BillObjTypeEnum objTypeEnum = null != room? BillObjTypeEnum.GIFT_ROOM_PAY: BillObjTypeEnum.GIFT_PERSON_PAY;
+        BillObjTypeEnum objTypeEnum =
+                GiftTypeEnum.LUCKY_24.getType() == gift.getGiftType()? BillObjTypeEnum.LUCKY_24_GIFT_PAY:
+                        GiftTypeEnum.BRAVO.getType() == gift.getGiftType()? BillObjTypeEnum.BRAVO_GIFT_PAY:
+                null != room? BillObjTypeEnum.GIFT_ROOM_PAY: BillObjTypeEnum.GIFT_PERSON_PAY;
         UserPurse after = reduceStockV5(sender.getUid(), sender.getPartitionId(), gift.getGiftId(),
                 totalGoldNum, totalGiftNum, giftSource, objTypeEnum);