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

账单-类型-byte改int

Browse Source
This commit is contained in:
khalil
2024-10-22 20:30:35 +08:00
parent 5cdd3105a9
commit 8b5f099dac
11 changed files with 186 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/anchor/AnchorCheckAdminService.java
View File

@@ -214,7 +214,7 @@ public class AnchorCheckAdminService extends BaseService {
officialGoldRecord.setRemark(remark);
}
officialGoldRecord.setType(Constant.BillType.releaseGold);
officialGoldRecord.setType(Constant.BillType.releaseGold.byteValue());
officialGoldRecord.setCreateTime(date);
officialGoldRecordVector.add(officialGoldRecord);

6
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/BillRecordAdminService.java
View File

@@ -51,7 +51,7 @@ public class BillRecordAdminService extends BaseService {
@Autowired
private ChargeRecordService chargeRecordService;
public void pageBillRecordList(Page<BillRecord> page, Long erbanNo, Byte billType, String startDate, String endDate){
public void pageBillRecordList(Page<BillRecord> page, Long erbanNo, Integer billType, String startDate, String endDate){
Long uid = null;
if (erbanNo != null) {
Users users = usersBaseService.getUsersByErBanNo(erbanNo);
@@ -61,7 +61,7 @@ public class BillRecordAdminService extends BaseService {
uid = users.getUid();
}
List<Byte> bList = new ArrayList<>();
List<Integer> bList = new ArrayList<>();
QueryWrapper<BillRecord> wrapper = new QueryWrapper<>();
if(billType != null){
if(billType.equals(Constant.BillType.openNoble)){
@@ -212,7 +212,7 @@ public class BillRecordAdminService extends BaseService {
}
public void exportBillRecordList(ServletOutputStream outputStream, Long erbanNo, Byte billType, String startDate, String endDate) {
public void exportBillRecordList(ServletOutputStream outputStream, Long erbanNo, Integer billType, String startDate, String endDate) {
List<BillRecordExcelVo> list = new ArrayList<>();
Page<BillRecord> page = new Page<>(-1, -1);

4
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/BillRecordAdminController.java
View File

@@ -32,7 +32,7 @@ public class BillRecordAdminController extends BaseController {
@RequestMapping("/getList")
@ResponseBody
public Pagination getBillRecordList(Long erbanNo, Byte billType, String startDate, String endDate){
public Pagination getBillRecordList(Long erbanNo, Integer billType, String startDate, String endDate){
Page<BillRecord> page = new Page<>(getPageNumber(), getPageSize());
billRecordAdminService.pageBillRecordList(page, erbanNo, billType, startDate, endDate);
Pagination p = new Pagination(page);
@@ -44,7 +44,7 @@ public class BillRecordAdminController extends BaseController {
@RequestMapping("/exportList")
@ResponseBody
public void exportBillRecordList(Long erbanNo, Byte billType, String startDate, String endDate, HttpServletResponse response) throws Exception {
public void exportBillRecordList(Long erbanNo, Integer billType, String startDate, String endDate, HttpServletResponse response) throws Exception {
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
// 这里URLEncoder.encode可以防止中文乱码

17
accompany-admin/accompany-flow-team-admin-service/src/main/java/com/accompany/service/FlowTeamMemberStatisticsService.java
View File

@@ -193,23 +193,6 @@ public class FlowTeamMemberStatisticsService {
return flowTeamMemberStatisticsMapper.isMemberInviteUserV2(memberIds, userErbanNo) > 0;
}
public UserDataPageVO<BillRecordVo> listUserBillDetails(List<Long> memberIds, Long userErbanNo, Integer pageNumber, Integer pageSize) {
Users user = usersBaseService.getUsersByErBanNo(userErbanNo);
checkCanQuery(memberIds, userErbanNo, user);
List<Byte> bList = Arrays.asList(BillObjTypeEnum.GIFT_ROOM_PAY.getValue(), BillObjTypeEnum.GIFT_PERSON_PAY.getValue(), BillObjTypeEnum.ACTIVITY_PACKET.getValue());
QueryWrapper<BillRecord> wrapper = new QueryWrapper<>();
wrapper.lambda().eq(BillRecord::getUid,user.getUid())
.ge(BillRecord::getCreateTime, user.getCreateTime())
.le(BillRecord::getCreateTime, new Date())
.in(BillRecord::getObjType, bList);
wrapper.lambda().orderByDesc(BillRecord::getCreateTime);
PageHelper.startPage(pageNumber, pageSize);
PageInfo<BillRecord> billRecordPage = new PageInfo<>(billRecordService.list(wrapper));
return convertToBillRecordVOPage(billRecordPage, user);
}
private UserDataPageVO<BillRecordVo> convertToBillRecordVOPage(PageInfo<BillRecord> billRecordPage, Users user) {
UserDataPageVO<BillRecordVo> resultPage = new UserDataPageVO<>();
resultPage.setInviteCode(user.getInviteCode());

110
accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java
View File

@@ -36,84 +36,84 @@ public class Constant {
public static class BillType {
// 账单类型:1充值2提现3消费订单支出4服务订单收入5刷礼物消费6收礼物收入7发个人红包消费8收到个人红包收入9房主佣金收入10注册送金币11分享送金币12官方送金币13关注公众号送金币
public static Byte charge = 1; // 充值
public static Byte getCash = 2; // 提现
public static Byte orderPay = 3; // 消费订单支出
public static Byte orderIncome = 4;// 服务订单收入
public static Byte giftPay = 5; // 送礼物支出
public static Byte giftIncome = 6; // 收礼物收入
public static Byte redPackPay = 7; // 发个人红包消费
public static Byte redPackIncome = 8; // 收到个人红包收入
public static Byte roomOwnerIncome = 9; // 房主佣金收入
public static Byte registSendGift = 10; // 注册送金币
public static Byte shareGold = 11; // 分享送金币
public static Byte interSendDiamond = 12; // 官方直接送钻石
public static Byte followSendGold = 13; // 关注公众号送金币
public static Byte exchangeDimondToGoldPay = 14; // 兑换钻石支出
public static Byte exchangeDimondToGoldIncome = 15;// 兑换钻石收入
public static Integer charge = 1; // 充值
public static Integer getCash = 2; // 提现
public static Integer orderPay = 3; // 消费订单支出
public static Integer orderIncome = 4;// 服务订单收入
public static Integer giftPay = 5; // 送礼物支出
public static Integer giftIncome = 6; // 收礼物收入
public static Integer redPackPay = 7; // 发个人红包消费
public static Integer redPackIncome = 8; // 收到个人红包收入
public static Integer roomOwnerIncome = 9; // 房主佣金收入
public static Integer registSendGift = 10; // 注册送金币
public static Integer shareGold = 11; // 分享送金币
public static Integer interSendDiamond = 12; // 官方直接送钻石
public static Integer followSendGold = 13; // 关注公众号送金币
public static Integer exchangeDimondToGoldPay = 14; // 兑换钻石支出
public static Integer exchangeDimondToGoldIncome = 15;// 兑换钻石收入
public static Byte hallowActRewardGold = 16; // 万圣节金币奖励
public static Byte actReward = 17; // 活动奖励
public static Byte chargeByCompanyAccount = 20; // 打款至公账充值金币
public static Integer hallowActRewardGold = 16; // 万圣节金币奖励
public static Integer actReward = 17; // 活动奖励
public static Integer chargeByCompanyAccount = 20; // 打款至公账充值金币
public static Byte redeemCode = 21; //兑换码兑换金币
public static Byte draw = 23; //促销活动得金币
public static Byte bonusPerDaySend = 24; //发送的
public static Byte bonusPerDayRecv = 25; //钻石回馈账单
public static Byte openNoble = 26; //开通贵族
public static Byte renewNoble = 27; //续费贵族
public static Byte roomNoble = 28; //房间内开通贵族分成
public static Byte openNobleReturn = 29; //开通贵族
public static Byte renewNobleReturn = 30; //续费贵族
public static Byte purchaseCarGoods = 31; //购买座驾
public static Integer redeemCode = 21; //兑换码兑换金币
public static Integer draw = 23; //促销活动得金币
public static Integer bonusPerDaySend = 24; //发送的
public static Integer bonusPerDayRecv = 25; //钻石回馈账单
public static Integer openNoble = 26; //开通贵族
public static Integer renewNoble = 27; //续费贵族
public static Integer roomNoble = 28; //房间内开通贵族分成
public static Integer openNobleReturn = 29; //开通贵族
public static Integer renewNobleReturn = 30; //续费贵族
public static Integer purchaseCarGoods = 31; //购买座驾
public static Byte renewCarGoods = 32; //续费座驾
public static Byte duibaDraw = 33; // 兑吧促销活动支出
public static Byte duibaDrawReward = 34; // 兑吧促销活动奖励
public static Byte giftMagicPay = 35; // 发送魔法支出
public static Byte giftMagicIncome = 36; // 接收魔法收入
public static Integer renewCarGoods = 32; //续费座驾
public static Integer duibaDraw = 33; // 兑吧促销活动支出
public static Integer duibaDrawReward = 34; // 兑吧促销活动奖励
public static Integer giftMagicPay = 35; // 发送魔法支出
public static Integer giftMagicIncome = 36; // 接收魔法收入
public static Byte monsterDrawReward = 37; // 打怪夺宝奖励
public static Integer monsterDrawReward = 37; // 打怪夺宝奖励
public static Byte giveCarGoods = 38; //座驾赠送
public static Integer giveCarGoods = 38; //座驾赠送
public static Byte purchaseHeadwear = 39; // 购买头饰
public static Byte renewHeadwear = 40; // 续费头饰
public static Byte donateHeadwear = 41; // 赠送头饰
public static Integer purchaseHeadwear = 39; // 购买头饰
public static Integer renewHeadwear = 40; // 续费头饰
public static Integer donateHeadwear = 41; // 赠送头饰
public static Byte packetGetCash = 42; //红包提现
public static Integer packetGetCash = 42; //红包提现
public static Byte buyOpenBoxKey = 45; //购买开箱子钥匙
public static Integer buyOpenBoxKey = 45; //购买开箱子钥匙
public static Byte eggPrizeGold = 46; // 砸金蛋得金币
public static Integer eggPrizeGold = 46; // 砸金蛋得金币
public static Byte roomFlowExtract = 47; //公会房间流水提成
public static Integer roomFlowExtract = 47; //公会房间流水提成
public static Byte buyActivityPack = 48; //购买礼包
public static Integer buyActivityPack = 48; //购买礼包
public static Byte drawGold = 49; //瓜分金币
public static Integer drawGold = 49; //瓜分金币
public static Byte eternalHeartBuy = 50; //购买永恒之心
public static Integer eternalHeartBuy = 50; //购买永恒之心
public static Byte officalDiamondReduce = 51; // 官方钻石支出
public static Integer officalDiamondReduce = 51; // 官方钻石支出
public static Byte nationalBuyFirework = 52; // 国庆活动购买礼花
public static Integer nationalBuyFirework = 52; // 国庆活动购买礼花
public static Byte doubleElevenBuyGift = 53; // 双十一购买礼物
public static Integer doubleElevenBuyGift = 53; // 双十一购买礼物
public static Byte sendGold = 54; // 主播赠送金币
public static Integer sendGold = 54; // 主播赠送金币
public static Byte receiveGold = 55; // 受赠金币
public static Integer receiveGold = 55; // 受赠金币
public static Byte releaseGold = 56; // 流水发放
public static Integer releaseGold = 56; // 流水发放
public static Byte activityBuyPack = 59; // 活动购买礼包
public static Integer activityBuyPack = 59; // 活动购买礼包
public static Byte interSendCrystal = 60; // 官方直接送水晶
public static Integer interSendCrystal = 60; // 官方直接送水晶
public static Byte clearUserGold = 61; //用户金币清除
public static Integer clearUserGold = 61; //用户金币清除
public static Byte interSendGold = 62; // 官方直接送金币
public static Integer interSendGold = 62; // 官方直接送金币
}
public static class AppVersion {

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

@@ -13,194 +13,195 @@ import java.util.Optional;
@Getter
public enum BillObjTypeEnum {
CHARGE((byte) 1, "充值", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
CHARGE( 1, "充值", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
WITHDRAW((byte) 2, "提现", BillTypeEnum.OUT, CurrencyEnum.GOLD),
WITHDRAW( 2, "提现", BillTypeEnum.OUT, CurrencyEnum.GOLD),
GIFT_ROOM_PAY((byte) 3, "房间礼物支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
GIFT_ROOM_PAY( 3, "房间礼物支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
GIFT_ROOM_INCOME((byte) 4, "房间收礼物收入", BillTypeEnum.IN, CurrencyEnum.GOLD),
GIFT_ROOM_INCOME( 4, "房间收礼物收入", BillTypeEnum.IN, CurrencyEnum.GOLD),
GIFT_PERSON_PAY((byte) 5, "私聊礼物支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
GIFT_PERSON_PAY( 5, "私聊礼物支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
GIFT_PERSON_INCOME((byte) 6, "私聊礼物收入", BillTypeEnum.IN, CurrencyEnum.GOLD),
GIFT_PERSON_INCOME( 6, "私聊礼物收入", BillTypeEnum.IN, CurrencyEnum.GOLD),
PACKET_DIAMOND_PAY((byte) 7, "钻石红包支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
PACKET_DIAMOND_PAY( 7, "钻石红包支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
PACKET_DIAMOND_INCOME((byte) 8, "钻石红包收入", BillTypeEnum.OUT, CurrencyEnum.CRYSTAL),
PACKET_DIAMOND_INCOME( 8, "钻石红包收入", BillTypeEnum.OUT, CurrencyEnum.CRYSTAL),
PACKET_GIFT_PAY((byte) 9, "礼物红包支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
PACKET_GIFT_PAY( 9, "礼物红包支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
PACKET_GIFT_INCOME((byte) 10, "礼物红包收入", BillTypeEnum.OUT, CurrencyEnum.CRYSTAL),
PACKET_GIFT_INCOME( 10, "礼物红包收入", BillTypeEnum.OUT, CurrencyEnum.CRYSTAL),
ROOM_PERCENTAGE_INCOME((byte) 11, "房间流水抽成收入", BillTypeEnum.IN, CurrencyEnum.GOLD),
ROOM_PERCENTAGE_INCOME( 11, "房间流水抽成收入", BillTypeEnum.IN, CurrencyEnum.GOLD),
EXCHANGE_CRYSTAL_TO_DIAMOND_PAY((byte) 12, "水晶兑换金币支出", BillTypeEnum.OUT, CurrencyEnum.CRYSTAL),
EXCHANGE_CRYSTAL_TO_DIAMOND_PAY( 12, "水晶兑换金币支出", BillTypeEnum.OUT, CurrencyEnum.CRYSTAL),
EXCHANGE_CRYSTAL_TO_DIAMOND_INCOME((byte) 13, "水晶兑换金币收入", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
EXCHANGE_CRYSTAL_TO_DIAMOND_INCOME( 13, "水晶兑换金币收入", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
EXCHANGE_GOLD_TO_DIAMOND_PAY((byte) 14, "钻石兑换金币支出", BillTypeEnum.OUT, CurrencyEnum.GOLD),
EXCHANGE_GOLD_TO_DIAMOND_PAY( 14, "钻石兑换金币支出", BillTypeEnum.OUT, CurrencyEnum.GOLD),
EXCHANGE_GOLD_TO_DIAMOND_INCOME((byte) 15, "钻石兑换金币收入", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
EXCHANGE_GOLD_TO_DIAMOND_INCOME( 15, "钻石兑换金币收入", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
EXCHANGE_CRYSTAL_TO_GOLD_PAY((byte) 16, "水晶兑换钻石支出", BillTypeEnum.OUT, CurrencyEnum.CRYSTAL),
EXCHANGE_CRYSTAL_TO_GOLD_PAY( 16, "水晶兑换钻石支出", BillTypeEnum.OUT, CurrencyEnum.CRYSTAL),
EXCHANGE_CRYSTAL_TO_GOLD_INCOME((byte) 17, "水晶兑换钻石收入", BillTypeEnum.IN, CurrencyEnum.GOLD),
EXCHANGE_CRYSTAL_TO_GOLD_INCOME( 17, "水晶兑换钻石收入", BillTypeEnum.IN, CurrencyEnum.GOLD),
CHARGE_BY_COMPANY_ACCOUNT((byte) 18, "打款至公账充值钻石", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
CHARGE_BY_COMPANY_ACCOUNT( 18, "打款至公账充值钻石", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
BOX_PRIZE_GOLD((byte) 19, "开宝箱获得钻石", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
BOX_PRIZE_GOLD( 19, "开宝箱获得钻石", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
OFFICIAL_DIAMOND_REDUCE((byte) 20, "官方消除金币", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
OFFICIAL_DIAMOND_REDUCE( 20, "官方消除金币", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
OFFICIAL_CRYSTAL_REDUCE((byte) 21, "官方消除水晶", BillTypeEnum.OUT, CurrencyEnum.CRYSTAL),
OFFICIAL_CRYSTAL_REDUCE( 21, "官方消除水晶", BillTypeEnum.OUT, CurrencyEnum.CRYSTAL),
OFFICIAL_GOLD_REDUCE((byte) 22, "官方消除钻石", BillTypeEnum.OUT, CurrencyEnum.GOLD),
OFFICIAL_GOLD_REDUCE( 22, "官方消除钻石", BillTypeEnum.OUT, CurrencyEnum.GOLD),
ACTIVITY_DIAMOND((byte) 23, "活动赠送金币", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
ACTIVITY_DIAMOND( 23, "活动赠送金币", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
ACTIVITY_CRYSTAL((byte) 24, "活动赠送水晶", BillTypeEnum.IN, CurrencyEnum.CRYSTAL),
ACTIVITY_CRYSTAL( 24, "活动赠送水晶", BillTypeEnum.IN, CurrencyEnum.CRYSTAL),
REJECT_WITHDRAW((byte) 25, "提现驳回钻石返还", BillTypeEnum.IN, CurrencyEnum.GOLD),
REJECT_WITHDRAW( 25, "提现驳回钻石返还", BillTypeEnum.IN, CurrencyEnum.GOLD),
OFFICIAL_GOLD_ADD((byte) 26, "官方送钻石", BillTypeEnum.IN, CurrencyEnum.GOLD),
OFFICIAL_GOLD_ADD( 26, "官方送钻石", BillTypeEnum.IN, CurrencyEnum.GOLD),
ACTIVITY_PACKET((byte) 27, "活动礼包支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
ACTIVITY_PACKET( 27, "活动礼包支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
ACTIVITY_GOLD((byte) 29, "活动赠送钻石", BillTypeEnum.IN, CurrencyEnum.GOLD),
ACTIVITY_GOLD( 29, "活动赠送钻石", BillTypeEnum.IN, CurrencyEnum.GOLD),
BUY_BOX_KEY((byte) 30, "购买玩法门票支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
BUY_BOX_KEY( 30, "购买玩法门票支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
PURCHASE_CAR_GOODS((byte) 31, "购买座驾", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
PURCHASE_CAR_GOODS( 31, "购买座驾", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
GIVE_CAR_GOODS((byte) 32, "座驾赠送", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
GIVE_CAR_GOODS( 32, "座驾赠送", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
INTER_SEND_DIAMOND((byte) 35, "官方送金币", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
INTER_SEND_DIAMOND( 35, "官方送金币", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
SEND_GOLD_IN((byte) 36, "转赠钻石收入", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
SEND_GOLD_IN( 36, "转赠钻石收入", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
SEND_GOLD_OUT((byte) 37, "转赠钻石支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
SEND_GOLD_OUT( 37, "转赠钻石支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
INTER_SEND_CRYSTAL((byte) 38, "官方送水晶", BillTypeEnum.IN, CurrencyEnum.CRYSTAL),
INTER_SEND_CRYSTAL( 38, "官方送水晶", BillTypeEnum.IN, CurrencyEnum.CRYSTAL),
REDPACKET_ROOM((byte) 39, "发出房间红包", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
REDPACKET_SERVER((byte) 40, "发出全服红包", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
REDPACKET_ROOM_BACK((byte) 41, "房间红包退款", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
REDPACKET_SERVER_BACK((byte) 42, "全服红包退款", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
REDPACKET_ROOM_GET((byte) 43, "收到房间红包", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
REDPACKET_SERVER_GET((byte) 44, "收到全服红包", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
ACTIVITY_DIAMOND_OUT((byte) 45, "活动支出金币", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
REDPACKET_ROOM( 39, "发出房间红包", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
REDPACKET_SERVER( 40, "发出全服红包", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
REDPACKET_ROOM_BACK( 41, "房间红包退款", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
REDPACKET_SERVER_BACK( 42, "全服红包退款", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
REDPACKET_ROOM_GET( 43, "收到房间红包", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
REDPACKET_SERVER_GET( 44, "收到全服红包", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
ACTIVITY_DIAMOND_OUT( 45, "活动支出金币", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
TARO_CHARGE((byte) 59, "塔罗充值", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
TARO_CHARGE( 59, "塔罗充值", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
FRIST_CHARGE_REWARD((byte) 62, "首充激励奖励金币", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
FRIST_CHARGE_REWARD( 62, "首充激励奖励金币", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
CALL_BATTLE((byte) 66, "守护星球礼包支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
CALL_BATTLE_REWARD((byte) 67, "守护星球奖励金币", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
CALL_BATTLE( 66, "守护星球礼包支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
CALL_BATTLE_REWARD( 67, "守护星球奖励金币", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
OPEN_VIP((byte) 68, "开通贵族", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
OPEN_VIP( 68, "开通贵族", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
HALL_OWNER_SINGLE_ROOM_EARN((byte) 69, "会长个播房流水分成", BillTypeEnum.IN, CurrencyEnum.CRYSTAL),
HALL_OWNER_SINGLE_ROOM_EARN( 69, "会长个播房流水分成", BillTypeEnum.IN, CurrencyEnum.CRYSTAL),
SEEK_ELFIN_PAYMENT((byte) 74, "幸运塔罗支付", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
SEEK_ELFIN_PAYMENT( 74, "幸运塔罗支付", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
REFUND_REDUCE_DIAMOND((byte) 75, "退款扣除金币", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
REFUND_REDUCE_CRYSTAL((byte) 76, "退款扣除水晶", BillTypeEnum.OUT, CurrencyEnum.CRYSTAL),
REFUND_REDUCE_GOLD((byte) 77, "退款扣除钻石", BillTypeEnum.OUT, CurrencyEnum.GOLD),
REFUND_REDUCE_DIAMOND( 75, "退款扣除金币", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
REFUND_REDUCE_CRYSTAL( 76, "退款扣除水晶", BillTypeEnum.OUT, CurrencyEnum.CRYSTAL),
REFUND_REDUCE_GOLD( 77, "退款扣除钻石", BillTypeEnum.OUT, CurrencyEnum.GOLD),
PURCHASE_HEADWEAR((byte) 78, "购买头饰", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
GIVE_HEADWEAR((byte) 79, "赠送用户头饰", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
PURCHASE_NAMEPLATE((byte) 80, "购买铭牌", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
GIVE_NAMEPLATE((byte) 81, "赠送用户铭牌", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
PURCHASE_INFO_CARD((byte) 82, "购买资料卡", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
GIVE_INFO_CARD((byte) 83, "赠送用户资料卡", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
PURCHASE_CHAT_BUBBLE((byte) 84, "购买聊天气泡", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
GIVE_CHAT_BUBBLE((byte) 85, "赠送用户聊天气泡", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
PURCHASE_HEADWEAR( 78, "购买头饰", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
GIVE_HEADWEAR( 79, "赠送用户头饰", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
PURCHASE_NAMEPLATE( 80, "购买铭牌", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
GIVE_NAMEPLATE( 81, "赠送用户铭牌", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
PURCHASE_INFO_CARD( 82, "购买资料卡", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
GIVE_INFO_CARD( 83, "赠送用户资料卡", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
PURCHASE_CHAT_BUBBLE( 84, "购买聊天气泡", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
GIVE_CHAT_BUBBLE( 85, "赠送用户聊天气泡", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
SHIP_ANTICS_PACK((byte) 86, "航海冒险礼包支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
SHIP_ANTICS_PACK( 86, "航海冒险礼包支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
ACTIVITY_LUCKY_SEA_DRAW((byte) 87, "星级厨房抽奖", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
ACTIVITY_LUCKY_SEA_DIAMOND_IN((byte) 88, "星级厨房奖励", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
ACTIVITY_LUCKY_SEA_DRAW( 87, "星级厨房抽奖", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
ACTIVITY_LUCKY_SEA_DIAMOND_IN( 88, "星级厨房奖励", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
SEND_DIAMOND_IN((byte) 89, "转赠金币收入", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
SEND_DIAMOND_OUT((byte) 90, "转赠金币支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
RECEIVE_USER_GIFT((byte) 91, "转赠礼物收入", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
CLAN_GOLD_SETTLEMENT_OUT((byte) 92, "公会钻石结算支出", BillTypeEnum.OUT, CurrencyEnum.GOLD),
CLAN_GOLD_SETTLEMENT_IN((byte) 93, "公会钻石结算收入", BillTypeEnum.IN, CurrencyEnum.GOLD),
JOIN_CLAN_CLEAR_GOLD_OUT((byte) 94, "加入公会钻石清零", BillTypeEnum.OUT, CurrencyEnum.GOLD),
ACTIVITY_NEW_YEAR_FIREWORK_DRAW((byte) 95, "新年烟花抽奖", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
SEND_DIAMOND_IN( 89, "转赠金币收入", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
SEND_DIAMOND_OUT( 90, "转赠金币支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
RECEIVE_USER_GIFT( 91, "转赠礼物收入", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
CLAN_GOLD_SETTLEMENT_OUT( 92, "公会钻石结算支出", BillTypeEnum.OUT, CurrencyEnum.GOLD),
CLAN_GOLD_SETTLEMENT_IN( 93, "公会钻石结算收入", BillTypeEnum.IN, CurrencyEnum.GOLD),
JOIN_CLAN_CLEAR_GOLD_OUT( 94, "加入公会钻石清零", BillTypeEnum.OUT, CurrencyEnum.GOLD),
ACTIVITY_NEW_YEAR_FIREWORK_DRAW( 95, "新年烟花抽奖", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
SEEK_ELFIN_REWARD_DIAMOND((byte) 96, "幸运塔罗中奖奖励", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
SEEK_ELFIN_REWARD_DIAMOND( 96, "幸运塔罗中奖奖励", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
ACTIVITY_VALENTINE_CP_BUY_KEEPSAKE((byte) 97, "情人节CP购买信物", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
ACTIVITY_SEIZE_TREASURE_PACK((byte) 98, "精灵碎片购买", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
FIND_LOVE_DRAW((byte) 99, "寻爱之旅抽奖", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
ACTIVITY_VALENTINE_CP_BUY_KEEPSAKE( 97, "情人节CP购买信物", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
ACTIVITY_SEIZE_TREASURE_PACK( 98, "精灵碎片购买", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
FIND_LOVE_DRAW( 99, "寻爱之旅抽奖", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
CLEAR_USER_GOLD((byte) 100, "官方清除钻石", BillTypeEnum.OUT, CurrencyEnum.GOLD),
CLEAR_USER_GOLD( 100, "官方清除钻石", BillTypeEnum.OUT, CurrencyEnum.GOLD),
OPEN_VIP_WITH_DIAMOND((byte) 101, "金币开通贵族", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
OPEN_VIP_WITH_DIAMOND( 101, "金币开通贵族", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
MID_AUTUMN_JACKPOT_ALLOT_DIAMOND_IN((byte) 102, "2023中秋活动奖池瓜分", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
MID_AUTUMN_JACKPOT_ALLOT_DIAMOND_IN( 102, "2023中秋活动奖池瓜分", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
INVITE_FISSION_BEINVITE_REAWARD((byte) 103, "邀请裂变活动被邀请奖励", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
INVITE_FISSION_INVITE_REAWARD((byte) 104, "邀请裂变活动直接邀请奖励", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
INVITE_FISSION_RECHARGE_INVITE_REAWARD((byte) 105, "邀请裂变活动直接邀请储值返点", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
INVITE_FISSION_RECHARGE_INDIRECT_REAWARD((byte) 106, "邀请裂变活动间接邀请储值返点", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
INVITE_FISSION_BEINVITE_REAWARD( 103, "邀请裂变活动被邀请奖励", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
INVITE_FISSION_INVITE_REAWARD( 104, "邀请裂变活动直接邀请奖励", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
INVITE_FISSION_RECHARGE_INVITE_REAWARD( 105, "邀请裂变活动直接邀请储值返点", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
INVITE_FISSION_RECHARGE_INDIRECT_REAWARD( 106, "邀请裂变活动间接邀请储值返点", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
SUPER_LUCKY_GIFT_INCOME_ALLOT((byte) 107, "超级幸运礼物价值分成", BillTypeEnum.IN, CurrencyEnum.GOLD),
SUPER_LUCKY_GIFT_DIAMOND((byte) 108, "超级幸运礼物金币奖返点", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
SUPER_LUCKY_GIFT_INCOME_ALLOT( 107, "超级幸运礼物价值分成", BillTypeEnum.IN, CurrencyEnum.GOLD),
SUPER_LUCKY_GIFT_DIAMOND( 108, "超级幸运礼物金币奖返点", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
VIP_RETURN_PROFIT((byte) 109, "VIP等級獎勵", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
VIP_RETURN_PROFIT( 109, "VIP等級獎勵", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
MINI_GAME_IN((byte) 110, "小遊戲收入", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
MINI_GAME_IN( 110, "小遊戲收入", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
MINI_GAME_OUT((byte) 111, "小遊戲支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
MINI_GAME_OUT( 111, "小遊戲支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
PUBLIC_CHAT_TOP_OUT((byte) 112, "購買頭條消耗", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
PUBLIC_CHAT_TOP_OUT( 112, "購買頭條消耗", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
MINI_GAME_MATCH_ENTER_OUT((byte) 113, "LUDO匹配消耗", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
MINI_GAME_MATCH_ENTER_OUT( 113, "LUDO匹配消耗", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
MINI_GAME_MATCH_WINNER_IN((byte) 114, "LUDO匹配收入", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
MINI_GAME_MATCH_WINNER_IN( 114, "LUDO匹配收入", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
MINI_GAME_MATCH_REFUND_IN((byte) 115, "LUDO匹配退还", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
MINI_GAME_MATCH_REFUND_IN( 115, "LUDO匹配退还", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
GAME_PARTNER_GOLD_IN((byte) 116, "游戏开黑收入", BillTypeEnum.IN, CurrencyEnum.GOLD),
GAME_PARTNER_GOLD_IN( 116, "游戏开黑收入", BillTypeEnum.IN, CurrencyEnum.GOLD),
GAME_PARTNER_DIAMOND_OUT((byte) 117, "游戏开黑支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
GAME_PARTNER_DIAMOND_OUT( 117, "游戏开黑支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
GUILD_DIAMOND_WITHDRAW_USD_IN((byte) 118, "公会钻石提现收入", BillTypeEnum.IN, CurrencyEnum.GUILD_USD),
GUILD_DIAMOND_WITHDRAW_USD_IN( 118, "公会钻石提现收入", BillTypeEnum.IN, CurrencyEnum.GUILD_USD),
GUILD_DIAMOND_WITHDRAW_USD_OUT((byte) 119, "公会钻石提现支出", BillTypeEnum.OUT, CurrencyEnum.GOLD),
GUILD_DIAMOND_WITHDRAW_USD_OUT( 119, "公会钻石提现支出", BillTypeEnum.OUT, CurrencyEnum.GOLD),
GUILD_USD_EXCHANGE_GOLD_IN((byte) 120, "公会usd兑换金币收入", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
GUILD_USD_EXCHANGE_GOLD_OUT((byte) 121, "公会usd兑换金币支出", BillTypeEnum.OUT, CurrencyEnum.GUILD_USD),
GUILD_USD_EXCHANGE_GOLD_IN( 120, "公会usd兑换金币收入", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
GUILD_USD_EXCHANGE_GOLD_OUT( 121, "公会usd兑换金币支出", BillTypeEnum.OUT, CurrencyEnum.GUILD_USD),
GUILD_USD_TO_RECHARGE_USER_IN((byte) 122, "公会usd兑换给代储收入", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
GUILD_USD_TO_RECHARGE_USER_OUT((byte) 123, "公会usd兑换给代储支出", BillTypeEnum.OUT, CurrencyEnum.GUILD_USD),
GUILD_USD_TO_RECHARGE_USER_IN( 122, "公会usd兑换给代储收入", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
GUILD_USD_TO_RECHARGE_USER_OUT( 123, "公会usd兑换给代储支出", BillTypeEnum.OUT, CurrencyEnum.GUILD_USD),
GUILD_USD_TO_GUILD_OWNER_IN((byte) 124, "公会usd兑换给会长收入", BillTypeEnum.IN, CurrencyEnum.GUILD_USD),
GUILD_USD_TO_GUILD_OWNER_OUT((byte) 125, "公会usd兑换给会长支出", BillTypeEnum.OUT, CurrencyEnum.GUILD_USD),
GUILD_USD_TO_GUILD_OWNER_IN( 124, "公会usd兑换给会长收入", BillTypeEnum.IN, CurrencyEnum.GUILD_USD),
GUILD_USD_TO_GUILD_OWNER_OUT( 125, "公会usd兑换给会长支出", BillTypeEnum.OUT, CurrencyEnum.GUILD_USD),
CANCEL_CP((byte) 126, "解除cp", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
CANCEL_CP( 126, "解除cp", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
FAMILY_DIAMOND_SETTLEMENT((byte) 127, "家族钻石结算", BillTypeEnum.OUT, CurrencyEnum.GOLD),
FAMILY_DIAMOND_SETTLEMENT( 127, "家族钻石结算", BillTypeEnum.OUT, CurrencyEnum.GOLD),
GUILD_USD_TO_PLATFORM_IN((byte) 128, "公会usd提现驳回", BillTypeEnum.IN, CurrencyEnum.GUILD_USD),
GUILD_USD_TO_PLATFORM_OUT((byte) 129, "公会usd提现支出", BillTypeEnum.OUT, CurrencyEnum.GUILD_USD),
GUILD_USD_TO_PLATFORM_IN( 128, "公会usd提现驳回", BillTypeEnum.IN, CurrencyEnum.GUILD_USD),
GUILD_USD_TO_PLATFORM_OUT( 129, "公会usd提现支出", BillTypeEnum.OUT, CurrencyEnum.GUILD_USD),
GUILD_SETTLEMENT_USD_IN( 130, "公会周期结算会长usd收入", BillTypeEnum.IN, CurrencyEnum.GUILD_USD),
SS_GUILD_MONTH_MEMBER_DIAMOND( 131, "SS公会活动奖励", BillTypeEnum.IN, CurrencyEnum.GOLD),
GUILD_SETTLEMENT_USD_IN((byte) 130, "公会周期结算会长usd收入", BillTypeEnum.IN, CurrencyEnum.GUILD_USD),
SS_GUILD_MONTH_MEMBER_DIAMOND((byte) 131, "SS公会活动奖励", BillTypeEnum.IN, CurrencyEnum.GOLD),
;
BillObjTypeEnum(byte value, String desc, BillTypeEnum type, CurrencyEnum currency) {
BillObjTypeEnum(int value, String desc, BillTypeEnum type, CurrencyEnum currency) {
this.value = value;
this.desc = desc;
this.type = type;
this.currency = currency;
}
private final byte value;
private final int value;
private final String desc;
private final BillTypeEnum type;
private final CurrencyEnum currency;

2
accompany-base/accompany-sharding/accompany-sharding-sdk/src/main/java/com/accompany/sharding/model/BillRecord.java
View File

@@ -29,7 +29,7 @@ public class BillRecord{
private String objId;
private Byte objType;
private Integer objType;
private Integer giftId;

12
accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/OfficalSendTypeEnum.java
View File

@@ -12,16 +12,16 @@ import java.util.Optional;
*/
public enum OfficalSendTypeEnum {
OFFICAL_GOLD(Constant.BillType.interSendGold, "官方赠送钻石"),
OFFICAL_DIAMOND(Constant.BillType.interSendDiamond, "官方赠送金币"),
OFFICAL_GOLD(Constant.BillType.interSendGold.byteValue(), "官方赠送钻石"),
OFFICAL_DIAMOND(Constant.BillType.interSendDiamond.byteValue(), "官方赠送金币"),
ACTIVITY_GOLD(Constant.BillType.actReward, "活动奖励钻石"),
ACTIVITY_GOLD(Constant.BillType.actReward.byteValue(), "活动奖励钻石"),
COMPANY_ACCOUNT_DIAMOND(Constant.BillType.chargeByCompanyAccount, "公款充值金币"),
COMPANY_ACCOUNT_DIAMOND(Constant.BillType.chargeByCompanyAccount.byteValue(), "公款充值金币"),
CLEAR_USER_GOLD(Constant.BillType.clearUserGold, "后台清除钻石"),
CLEAR_USER_GOLD(Constant.BillType.clearUserGold.byteValue(), "后台清除钻石"),
OFFICAL_REDUCE_DIAMONDS(Constant.BillType.officalDiamondReduce,"官方金币消除")
OFFICAL_REDUCE_DIAMONDS(Constant.BillType.officalDiamondReduce.byteValue(),"官方金币消除")
;
private byte value;

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

@@ -25,7 +25,7 @@ public class BillSearchVo {
private BigDecimal amount;
private BigDecimal actualAmount;
private String showStr;
private Byte objType;
private Integer objType;
private Long receiveUid;
private Date createTime;

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

@@ -352,7 +352,7 @@ public class GiftEarnAllotService {
associateTransferRecord.setAssociateUid(recvUid);
associateTransferRecord.setTargetUid(sendUid);
associateTransferRecord.setAmount(recvAmount);
associateTransferRecord.setType(inEnum.getValue());
associateTransferRecord.setType((byte) inEnum.getValue());
associateTransferRecord.setBillId(billId);
clanAssociateTransferRecordService.save(associateTransferRecord);
log.info("【处理礼物mq】 收礼用户为族长关联号转家族族长uid({})关联uid({})流转金额({})", clanAccountAssociate.getClanElderUid(), recvUid, recvAmount);
@@ -415,7 +415,7 @@ public class GiftEarnAllotService {
associateTransferRecord.setAssociateUid(hallOwnerUid);
associateTransferRecord.setTargetUid(sendUid);
associateTransferRecord.setAmount(hallOwnerAmount);
associateTransferRecord.setType(BillObjTypeEnum.ROOM_PERCENTAGE_INCOME.getValue());
associateTransferRecord.setType((byte) BillObjTypeEnum.ROOM_PERCENTAGE_INCOME.getValue());
associateTransferRecord.setBillId(billId);
clanAssociateTransferRecordService.save(associateTransferRecord);
log.info("[处理礼物mq] 会长为族长关联号转家族族长uid({})关联uid({})流转金额({})", clanAccountAssociate.getClanElderUid(), hallOwnerUid, hallOwnerAmount);
@@ -457,7 +457,7 @@ public class GiftEarnAllotService {
associateTransferRecord.setAssociateUid(roomOwnerUid);
associateTransferRecord.setTargetUid(sendUid);
associateTransferRecord.setAmount(roomOwnerAmount);
associateTransferRecord.setType(BillObjTypeEnum.ROOM_PERCENTAGE_INCOME.getValue());
associateTransferRecord.setType((byte) BillObjTypeEnum.ROOM_PERCENTAGE_INCOME.getValue());
associateTransferRecord.setBillId(billId);
clanAssociateTransferRecordService.save(associateTransferRecord);
log.info("[处理礼物mq] 房主为族长关联号转家族族长uid({})关联uid({})流转金额({})", clanAccountAssociate.getClanElderUid(), roomOwnerUid, roomOwnerAmount);

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

@@ -77,7 +77,7 @@ public class BillRecordService extends ServiceImpl<BillRecordMapper, BillRecord>
/**
* 需要将金额取绝对值的账单业务类型
*/
private List<Byte> NEED_ABS_OBJ_TPYES = Arrays.asList(BillObjTypeEnum.ACTIVITY_PACKET.getValue(),
private List<Integer> NEED_ABS_OBJ_TPYES = Arrays.asList(BillObjTypeEnum.ACTIVITY_PACKET.getValue(),
BillObjTypeEnum.CALL_BATTLE.getValue(), BillObjTypeEnum.SHIP_ANTICS_PACK.getValue());
/**
@@ -192,7 +192,7 @@ public class BillRecordService extends ServiceImpl<BillRecordMapper, BillRecord>
public List<LinkedHashMap<String, Object>> getBillSearchVosAndGroupByDate(Long uid, Byte type, Long date, Integer pageNo, Integer pageSize) {
if (BillSearchTypeEnum.ASSOCIATE_IN.getValue() == type)
return associateAccountBillRecord(uid, date, pageNo, pageSize);
List<Byte> objTypes = Lists.newArrayList();
List<Integer> objTypes = Lists.newArrayList();
BillSearchTypeEnum searchType = BillSearchTypeEnum.get(type);
switch (searchType) {
case GOLD_IN:
@@ -354,7 +354,7 @@ public class BillRecordService extends ServiceImpl<BillRecordMapper, BillRecord>
return result;
}
private List<BillRecord> getBillRecords(Long uid, List<Byte> objTypes, Long date, Integer pageNo, Integer pageSize) {
private List<BillRecord> getBillRecords(Long uid, List<Integer> objTypes, Long date, Integer pageNo, Integer pageSize) {
Date nextDate = DateTimeUtil.getNextDay(new Date(date), 1);
Date start = DateUtils.addMonths(nextDate, -3);
QueryWrapper<BillRecord> wrapper = new QueryWrapper<>();
@@ -367,7 +367,7 @@ public class BillRecordService extends ServiceImpl<BillRecordMapper, BillRecord>
return list;
}
private Map<String, Object> getBillRecordsDailySum(Long uid, List<Byte> objTypes, Long date) {
private Map<String, Object> getBillRecordsDailySum(Long uid, List<Integer> objTypes, Long date) {
Date nextDate = DateTimeUtil.getNextDay(new Date(date), 1);
Date start = DateUtils.addDays(nextDate, -1);
QueryWrapper<BillRecord> wrapper = new QueryWrapper<>();
@@ -444,7 +444,7 @@ public class BillRecordService extends ServiceImpl<BillRecordMapper, BillRecord>
return searchVos;
}
private String getShowStrByObjType(byte objType, BigDecimal rmbAmount) {
private String getShowStrByObjType(int objType, BigDecimal rmbAmount) {
if (objType == BillObjTypeEnum.CHARGE.getValue()) {
return "-" + rmbAmount + "美元";
}
@@ -649,16 +649,4 @@ public class BillRecordService extends ServiceImpl<BillRecordMapper, BillRecord>
DateTimeUtil.convertStrToDate(start), DateTimeUtil.convertStrToDate(end));
}
public List<BillRecord> listBillRecordByGiftRecrod(Date dateStart, Date dateEndLater, List<Long> giftRecordIds) {
List<Byte> objTypes = new ArrayList<>();
objTypes.add(BillObjTypeEnum.GIFT_PERSON_INCOME.getValue());
objTypes.add(BillObjTypeEnum.GIFT_ROOM_INCOME.getValue());
objTypes.add(BillObjTypeEnum.ROOM_PERCENTAGE_INCOME.getValue());
List<String> objIds = giftRecordIds.stream().map(Object::toString).collect(Collectors.toList());
QueryWrapper<BillRecord> queryWrapper = Wrappers.query();
queryWrapper.lambda().select(BillRecord::getUid, BillRecord::getObjId, BillRecord::getObjType, BillRecord::getAmount)
.between(BillRecord::getCreateTime, dateStart, dateEndLater)
.in(BillRecord::getObjId, objIds).in(BillRecord::getObjType, objTypes);
return list(queryWrapper);
}
}