game_用户活动fixed_bug
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package com.accompany.core.enumeration;
|
||||
|
||||
import com.accompany.common.constant.Constant;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@@ -7,17 +8,18 @@ import lombok.Getter;
|
||||
@AllArgsConstructor
|
||||
public enum PartitionEnum {
|
||||
|
||||
ENGLISH(1, "Asia/Manila", "英语区", "en"),
|
||||
ARAB(2, "Asia/Riyadh", "阿语区", "ar"),
|
||||
CHINESE(4, "Asia/Hong_Kong", "中文区", "zh"),
|
||||
TURKEY(8, "Europe/Istanbul", "土耳其区", "tr"),
|
||||
ENGLISH2(16, "Asia/Manila", "英语2区", "en"),
|
||||
ENGLISH(1, "Asia/Manila", "英语区", "en", Constant.ClanMode.FAMILY),
|
||||
ARAB(2, "Asia/Riyadh", "阿语区", "ar", Constant.ClanMode.GUILD),
|
||||
CHINESE(4, "Asia/Hong_Kong", "中文区", "zh", Constant.ClanMode.CLAN_HALL),
|
||||
TURKEY(8, "Europe/Istanbul", "土耳其区", "tr", Constant.ClanMode.GUILD),
|
||||
ENGLISH2(16, "Asia/Manila", "英语2区", "en", Constant.ClanMode.GUILD),
|
||||
;
|
||||
|
||||
private final int id;
|
||||
private final String zoneId;
|
||||
private final String desc;
|
||||
private final String lang;
|
||||
private final String clanMode;
|
||||
|
||||
public static PartitionEnum getByPartitionId(int partitionId) {
|
||||
for (PartitionEnum partitionEnum : PartitionEnum.values()) {
|
||||
|
||||
@@ -30,4 +30,5 @@ public class UserEventVO extends UserEvent {
|
||||
private String nick;
|
||||
private Long erbanNo;
|
||||
private Byte gender;
|
||||
private String avatar;
|
||||
}
|
||||
|
||||
@@ -120,9 +120,11 @@ public class JoyGameService {
|
||||
switch (joySubmitBodyVo.getType()) {
|
||||
case Constant.GameGoldType.ADD:
|
||||
joyGameRecord.setPay(joySubmitBodyVo.getCoins());
|
||||
joyGameRecord.setBet(0);
|
||||
break;
|
||||
case Constant.GameGoldType.REDUCT:
|
||||
joyGameRecord.setBet(joySubmitBodyVo.getCoins());
|
||||
joyGameRecord.setPay(0);
|
||||
break;
|
||||
default:
|
||||
log.info("JoyGameService.submitFlow,not, add-reduct,token:{},data:{}", token, data);
|
||||
|
||||
@@ -490,7 +490,7 @@ public class GiftEarnAllotService {
|
||||
return JSON.parseObject(configStr, GiftEarnAllotFamilyConfigDto.class);
|
||||
}
|
||||
|
||||
private GiftEarnAllotFamilyConfigDto getEarnAllotFamilyConfig(Integer partitionId) {
|
||||
public GiftEarnAllotFamilyConfigDto getEarnAllotFamilyConfig(Integer partitionId) {
|
||||
GiftEarnAllotFamilyConfigDto config = getEarnAllotFamilyConfig();
|
||||
return config.getPartitionConfigMap().getOrDefault(partitionId, config);
|
||||
}
|
||||
|
||||
@@ -1,35 +1,71 @@
|
||||
package com.accompany.business.service.gift;
|
||||
|
||||
import com.accompany.business.dto.GiftEarnAllotFamilyConfigDto;
|
||||
import com.accompany.business.model.Gift;
|
||||
import com.accompany.common.constant.Constant;
|
||||
import com.accompany.common.constant.GiftTypeEnum;
|
||||
import com.accompany.common.status.BusiStatus;
|
||||
import com.accompany.core.enumeration.PartitionEnum;
|
||||
import com.accompany.core.exception.ServiceException;
|
||||
import com.accompany.core.model.PartitionInfo;
|
||||
import com.accompany.core.model.Users;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@Service
|
||||
public class GiftRateService {
|
||||
|
||||
// /**
|
||||
// * 金币流水比例
|
||||
// * {partitionId:{giftType:rate}}
|
||||
// */
|
||||
// private Map<String, Map<String, Double>> goldFlow() {
|
||||
@Autowired
|
||||
private GiftEarnAllotService giftEarnAllotService;
|
||||
|
||||
/**
|
||||
* 金币流水比例
|
||||
* {partitionId:{giftType:rate}}
|
||||
*/
|
||||
private BigDecimal goldFlow() {
|
||||
BigDecimal result = new BigDecimal(0);
|
||||
// PartitionEnum partitionEnum = PartitionEnum.getByPartitionId(partitionId);
|
||||
// if (partitionEnum == null) {
|
||||
// return result;
|
||||
// }
|
||||
// if (GiftTypeEnum.LUCKY_BAG) {
|
||||
// }
|
||||
//
|
||||
// }
|
||||
// if (Constant.ClanMode.CLAN_HALL.equals(partitionEnum.getClanMode())){
|
||||
// } else if (Constant.ClanMode.FAMILY.equals(partitionEnum.getClanMode())) {
|
||||
// GiftEarnAllotFamilyConfigDto configDto = giftEarnAllotService.getEarnAllotFamilyConfig(partitionId);
|
||||
// resultMap.put(String.valueOf(GiftTypeEnum.COMMON.getType()), BigDecimal.valueOf(null != roomUid? configDto.getInRoomRate(): configDto.getOutRoomRate()));
|
||||
// } else if (Constant.ClanMode.GUILD.equals(partitionEnum.getClanMode())) {
|
||||
// }
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 钻石流水比例
|
||||
* @return
|
||||
* {giftType:rate}
|
||||
*/
|
||||
private BigDecimal diamondFlow(Integer partitionId, Long roomUid, Integer giftType) {
|
||||
BigDecimal result = new BigDecimal(0);
|
||||
// PartitionEnum partitionEnum = PartitionEnum.getByPartitionId(partitionId);
|
||||
// if (partitionEnum == null) {
|
||||
// return result;
|
||||
// }
|
||||
// if (GiftTypeEnum.LUCKY_BAG) {
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 钻石流水比例
|
||||
// * @return
|
||||
// * {giftType:rate}
|
||||
// */
|
||||
// private Map<String, Double> diamondFlow(Integer partirionId) {
|
||||
// Map<String, Double> flowMap = new HashMap<>();
|
||||
// flowMap.put(Constant.GiftType)
|
||||
// }
|
||||
// if (Constant.ClanMode.CLAN_HALL.equals(partitionEnum.getClanMode())){
|
||||
// } else if (Constant.ClanMode.FAMILY.equals(partitionEnum.getClanMode())) {
|
||||
// GiftEarnAllotFamilyConfigDto configDto = giftEarnAllotService.getEarnAllotFamilyConfig(partitionId);
|
||||
// resultMap.put(String.valueOf(GiftTypeEnum.COMMON.getType()), BigDecimal.valueOf(null != roomUid? configDto.getInRoomRate(): configDto.getOutRoomRate()));
|
||||
// } else if (Constant.ClanMode.GUILD.equals(partitionEnum.getClanMode())) {
|
||||
// }
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,6 +21,7 @@ import com.accompany.business.service.userevent.UserEventService;
|
||||
import com.accompany.business.service.userevent.UserEventSubService;
|
||||
import com.accompany.business.util.VipUtil;
|
||||
import com.accompany.common.config.SystemConfig;
|
||||
import com.accompany.common.constant.Constant;
|
||||
import com.accompany.common.device.DeviceInfo;
|
||||
import com.accompany.common.result.BusiResult;
|
||||
import com.accompany.common.status.BusiStatus;
|
||||
@@ -208,6 +209,7 @@ public class UserEventServiceImpl extends ServiceImpl<UserEventMapper, UserEvent
|
||||
userEventVO.setErbanNo(users1.getErbanNo());
|
||||
userEventVO.setNick(users1.getNick());
|
||||
userEventVO.setGender(users1.getGender());
|
||||
userEventVO.setAvatar(users1.getAvatar());
|
||||
PartitionEnum partitionEnum = PartitionEnum.getByPartitionId(users.getPartitionId());
|
||||
userEventVO.setEventStartTimeStr(DateTimeUtil.convertWithZoneId(userEventVO.getEventStartTime(), partitionEnum.getZoneId()).format(DateTimeUtil.datetimeFormatter));
|
||||
userEventVO.setEventEndTimeStr(DateTimeUtil.convertWithZoneId(userEventVO.getEventEndTime(), partitionEnum.getZoneId()).format(DateTimeUtil.datetimeFormatter));
|
||||
@@ -506,7 +508,11 @@ public class UserEventServiceImpl extends ServiceImpl<UserEventMapper, UserEvent
|
||||
Users users = usersService.getUsersByUid(uid);
|
||||
PartitionEnum partitionEnum = PartitionEnum.getByPartitionId(users.getPartitionId());
|
||||
Map<String, String> linkMap = JSONObject.parseObject(link, Map.class);
|
||||
link = String.format("%s/ev/%s?lang=%s", linkMap.get(deviceInfo.getOs().toLowerCase()), eventId, partitionEnum.getLang());
|
||||
String s = linkMap.get(deviceInfo.getOs().toLowerCase());
|
||||
if (StringUtils.isEmpty(s)) {
|
||||
linkMap.get(Constant.OsType.ANDROID);
|
||||
}
|
||||
link = String.format("%s/ev/%s?lang=%s", s, eventId, partitionEnum.getLang());
|
||||
String message = I18NMessageSourceUtil.getMessage(I18nAlertEnum.USER_EVENT_SHARE_TEXT, new Object[]{link}, uid);
|
||||
return BusiResult.success(message);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user