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

多语言-个人中心

Browse Source
This commit is contained in:
khalil
2024-04-12 18:37:38 +08:00
parent 7d487713b7
commit 21de510fe9
5 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,8 +67,6 @@ public enum BillObjTypeEnum {
ACTIVITY_PACKET((byte) 27, "活动礼包支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
FOLLOW_PUB_DIAMOND((byte) 28, "关注公众号送钻石", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
ACTIVITY_GOLD((byte) 29, "活动赠送金币", BillTypeEnum.IN, CurrencyEnum.GOLD),
BUY_BOX_KEY((byte) 30, "购买玩法门票支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
@@ -77,10 +75,6 @@ public enum BillObjTypeEnum {
GIVE_CAR_GOODS((byte) 32, "座驾赠送", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
DRAW((byte) 33, "抽奖得钻石", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
DRAW_DIAMOND((byte) 34, "瓜分钻石", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
INTER_SEND_DIAMOND((byte) 35, "官方送钻石", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
SEND_GOLD_IN((byte) 36, "转赠金币收入", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
@@ -97,18 +91,10 @@ public enum BillObjTypeEnum {
REDPACKET_SERVER_GET((byte) 44, "收到全服红包", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
ACTIVITY_DIAMOND_OUT((byte) 45, "活动支出钻石", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
GAME_MATCH_QUOTA_OUT((byte) 50, "比赛报名", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
GAME_MATCH_CLOSE_BACK((byte) 51, "未满人数比赛关闭退回钻石", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
TARO_CHARGE((byte) 59, "塔罗充值", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
ACTIVITY_FORTUNE_ALLO_ALLOCATION_GOLD((byte) 60, "集福气活动瓜分钻石", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
BUY_GAME_TICKET((byte) 61, "赛事门票", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
FRIST_CHARGE_REWARD((byte) 62, "首充激励奖励钻石", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
RADISH_SHOVEL((byte) 64, "幸运糖果树(线性)礼包支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
CALL_BATTLE((byte) 66, "守护星球礼包支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
CALL_BATTLE_REWARD((byte) 67, "守护星球奖励钻石", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
@@ -116,14 +102,6 @@ public enum BillObjTypeEnum {
HALL_OWNER_SINGLE_ROOM_EARN((byte) 69, "会长个播房流水分成", BillTypeEnum.IN, CurrencyEnum.CRYSTAL),
CP_PROPS_PAY((byte) 70, "CP邀请支出", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
CP_INVITE_DENY_REFUND((byte) 71, "CP邀请退还", BillTypeEnum.IN, CurrencyEnum.DIAMOND),
CP_INVITE_ACCEPT_INCOME((byte) 72, "接受CP邀请收入", BillTypeEnum.IN, CurrencyEnum.CRYSTAL),
HALL_OWNER_CP_INVITE_EARN((byte) 73, "工会成员组CP会长分成", BillTypeEnum.IN, CurrencyEnum.CRYSTAL),
SEEK_ELFIN_PAYMENT((byte) 74, "幸运塔罗支付", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),
REFUND_REDUCE_DIAMOND((byte) 75, "退款扣除钻石", BillTypeEnum.OUT, CurrencyEnum.DIAMOND),

26
accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/personalcenter/PersonalCenterVo.java Normal file
View File

@@ -0,0 +1,26 @@
package com.accompany.business.vo.personalcenter;
import com.accompany.common.annotation.ReplaceAppDomain;
import com.accompany.core.annotation.I18n;
import lombok.Data;
@Data
public class PersonalCenterVo {
private Integer centerId;
@I18n(className = "PersonalCenter")
private String centerName;
private String centerPic;
private Integer centerSeq;
private String centerBadge;
@ReplaceAppDomain
private String centerUrl;
private Integer skipType;
}

12
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/personalcenter/PersonalCenterService.java
View File

@@ -8,6 +8,7 @@ import com.accompany.business.service.clan.ClanService;
import com.accompany.business.service.hall.HallService;
import com.accompany.business.service.hall.HallSuperManageService;
import com.accompany.business.service.user.UsersService;
import com.accompany.business.vo.personalcenter.PersonalCenterVo;
import com.accompany.common.constant.AppEnum;
import com.accompany.common.constant.Constant;
import com.accompany.common.device.DeviceInfo;
@@ -15,10 +16,12 @@ import com.accompany.common.utils.AppVersionUtil;
import com.accompany.core.model.Users;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -38,6 +41,15 @@ public class PersonalCenterService {
@Autowired
private HallSuperManageService hallSuperManageService;
public List<PersonalCenterVo> listPersonalCenterList(Long uid, DeviceInfo deviceInfo) {
return getPersonalCenterList(uid, deviceInfo).stream().map(po->{
PersonalCenterVo vo = new PersonalCenterVo();
BeanUtils.copyProperties(po, vo);
return vo;
}).collect(Collectors.toList());
}
public List<PersonalCenter> getPersonalCenterList(Long uid, DeviceInfo deviceInfo) {
QueryWrapper<PersonalCenter> wrapper = new QueryWrapper<>();
wrapper.lambda().eq(PersonalCenter :: getCenterStatus, Constant.GlobalDelVal.not_del)

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

@@ -217,8 +217,6 @@ public class BillRecordService extends ServiceImpl<BillRecordMapper,BillRecord>
case PERCENTAGE_IN:
objTypes.add(BillObjTypeEnum.ROOM_PERCENTAGE_INCOME.getValue());
objTypes.add(BillObjTypeEnum.HALL_OWNER_SINGLE_ROOM_EARN.getValue());
objTypes.add(BillObjTypeEnum.CP_INVITE_ACCEPT_INCOME.getValue());
objTypes.add(BillObjTypeEnum.HALL_OWNER_CP_INVITE_EARN.getValue());
objTypes.add(BillObjTypeEnum.OFFICIAL_GOLD_ADD.getValue());
objTypes.add(BillObjTypeEnum.SUPER_LUCKY_GIFT_INCOME_ALLOT.getValue());
break;
@@ -252,9 +250,7 @@ public class BillRecordService extends ServiceImpl<BillRecordMapper,BillRecord>
objTypes.add(BillObjTypeEnum.REDPACKET_SERVER_GET.getValue());
objTypes.add(BillObjTypeEnum.ACTIVITY_DIAMOND.getValue());
objTypes.add(BillObjTypeEnum.TARO_CHARGE.getValue());
objTypes.add(BillObjTypeEnum.ACTIVITY_FORTUNE_ALLO_ALLOCATION_GOLD.getValue());
objTypes.add(BillObjTypeEnum.CALL_BATTLE_REWARD.getValue());
objTypes.add(BillObjTypeEnum.CP_INVITE_DENY_REFUND.getValue());
objTypes.add(BillObjTypeEnum.SEND_DIAMOND_IN.getValue());
objTypes.add(BillObjTypeEnum.ACTIVITY_LUCKY_SEA_DIAMOND_IN.getValue());
objTypes.add(BillObjTypeEnum.SEEK_ELFIN_REWARD_DIAMOND.getValue());
@@ -274,9 +270,7 @@ public class BillRecordService extends ServiceImpl<BillRecordMapper,BillRecord>
objTypes.add(BillObjTypeEnum.REDPACKET_ROOM.getValue());
objTypes.add(BillObjTypeEnum.REDPACKET_SERVER.getValue());
objTypes.add(BillObjTypeEnum.ACTIVITY_DIAMOND_OUT.getValue());
objTypes.add(BillObjTypeEnum.BUY_GAME_TICKET.getValue());
objTypes.add(BillObjTypeEnum.CALL_BATTLE.getValue());
objTypes.add(BillObjTypeEnum.CP_PROPS_PAY.getValue());
objTypes.add(BillObjTypeEnum.SEEK_ELFIN_PAYMENT.getValue());
objTypes.add(BillObjTypeEnum.PURCHASE_CAR_GOODS.getValue());
objTypes.add(BillObjTypeEnum.GIVE_CAR_GOODS.getValue());

8
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/personalcenter/PersonalCenterController.java
View File

@@ -1,8 +1,8 @@
package com.accompany.business.controller.personalcenter;
import com.accompany.business.common.BaseController;
import com.accompany.business.model.personalcenter.PersonalCenter;
import com.accompany.business.service.personalcenter.PersonalCenterService;
import com.accompany.business.vo.personalcenter.PersonalCenterVo;
import com.accompany.common.device.DeviceInfo;
import com.accompany.core.vo.BaseResponseVO;
import io.swagger.annotations.Api;
@@ -27,11 +27,11 @@ public class PersonalCenterController extends BaseController {
@ApiOperation("个人中心列表")
@GetMapping("/list")
public BaseResponseVO<List<PersonalCenter>> getPersonalCenterList(HttpServletRequest request) {
public BaseResponseVO<List<PersonalCenterVo>> getPersonalCenterList(HttpServletRequest request) {
Long uid = getUid(request);
DeviceInfo deviceInfo = getDeviceInfo(request);
List<PersonalCenter> list = personalCenterService.getPersonalCenterList(uid, deviceInfo);
return new BaseResponseVO(list);
List<PersonalCenterVo> list = personalCenterService.listPersonalCenterList(uid, deviceInfo);
return new BaseResponseVO<>(list);
}
}