diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/UserPurseVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/UserPurseVo.java index bd3900081..d1b516a92 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/UserPurseVo.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/UserPurseVo.java @@ -14,6 +14,9 @@ public class UserPurseVo { private Double golds; + private Double guildUsd; + private Double guildCrystal; + private Boolean firstCharge; private Date updateTime; diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/UsersVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/UsersVo.java index 5ae8e6169..dce057779 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/UsersVo.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/UsersVo.java @@ -13,4 +13,5 @@ public class UsersVo extends Users { private double diamondsNum; private double guildUsdNum; + private double guildCrystalNum; } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/TestPurseMapper.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/TestPurseMapper.java deleted file mode 100644 index 48bf9ed74..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/TestPurseMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.accompany.admin.mapper; - -import com.accompany.admin.model.TestPurse; -import com.accompany.admin.model.TestPurseExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface TestPurseMapper { - int countByExample(TestPurseExample example); - - int deleteByExample(TestPurseExample example); - - int deleteByPrimaryKey(Integer id); - - int insert(TestPurse record); - - int insertSelective(TestPurse record); - - List selectByExample(TestPurseExample example); - - TestPurse selectByPrimaryKey(Integer id); - - int updateByExampleSelective(@Param("record") TestPurse record, @Param("example") TestPurseExample example); - - int updateByExample(@Param("record") TestPurse record, @Param("example") TestPurseExample example); - - int updateByPrimaryKeySelective(TestPurse record); - - int updateByPrimaryKey(TestPurse record); -} \ No newline at end of file diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/UserCheckAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/UserCheckAdminService.java index 52fad38f7..403e2a670 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/UserCheckAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/UserCheckAdminService.java @@ -286,6 +286,8 @@ public class UserCheckAdminService { throw new AdminServiceException("用户钻石余额不为0，不能改变分区"); } else if (userPurse.getGuildUsd() > 0d){ throw new AdminServiceException("用户金币公会薪资不为0，不能改变分区"); + } else if (userPurse.getGuildCrystal() > 0d) { + throw new AdminServiceException("用户金币公会紫晶不为0，不能改变分区"); } FamilyClanDecorateVo clanVo = familyClanService.getFamilyClanDecorateVo(users.getUid(), users.getUid()); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGoldRecordService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGoldRecordService.java index 7f81822a8..c4ad6e27f 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGoldRecordService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGoldRecordService.java @@ -156,6 +156,12 @@ public class OfficialGoldRecordService extends BaseService { case OFFICAL_PLUS_GUILD_USD: adjustUsd(ernos, type.getValue(), num, adminId, remark, busType, Boolean.TRUE); break; + case OFFICAL_PLUS_GUILD_CRYSTAL: + adjustGuildCrystal(ernos, type.getValue(), num, adminId, remark, busType, Boolean.TRUE); + break; + case OFFICAL_MINUS_GUILD_CRYSTAL: + adjustGuildCrystal(ernos, type.getValue(), num, adminId, remark, busType, Boolean.FALSE); + break; default: throw new AdminServiceException(BusiStatus.REQUEST_PARAM_ERROR); } @@ -380,7 +386,7 @@ public class OfficialGoldRecordService extends BaseService { GuildMember guildMember = guildMemberMap.get(uid); // 增加官方赠送活动记录 - addGoldRecord(recordId, users, type, Constant.WalletCurrencyType.usd, num, optId, remark, busType, null); + addGoldRecord(recordId, users, type, Constant.WalletCurrencyType.guildUsd, num, optId, remark, busType, null); if (isPlus) { // 增加账户usd数量 @@ -404,15 +410,79 @@ public class OfficialGoldRecordService extends BaseService { } } + /** + * 官方调整薪资（增加或减少） + * @param ernos 用户耳伴号列表，多个用换行分隔 + * @param type 操作类型 + * @param num 调整数量 + * @param optId 操作人ID + * @param remark 备注 + * @param busType 业务类型 + * @param isPlus 是否为增加操作 true:增加 false:减少 + * @throws Exception + */ + @Transactional(rollbackFor = Exception.class) + public void adjustGuildCrystal(String ernos, byte type, BigDecimal num, int optId, String remark, Integer busType, boolean isPlus) { + String lockval = null; + try { + lockval = this.jedisLockService.lock(RedisKey.lock_official_gold_send.getKey(), 3000); + if (StringUtils.isEmpty(lockval)) { + throw new AdminServiceException(BusiStatus.SERVERBUSY); + } + + List erbanNos = Arrays.asList(ernos.trim().split("\n")); + + Map usersMap = new HashMap<>(); + + for (String erbanNoStr : erbanNos) { + Long erbanNo = Long.parseLong(erbanNoStr.trim()); + if (usersMap.containsKey(erbanNo)) { + continue; + } + Users u = usersService.getUserByErbanNo(erbanNo); + if (u == null) { + throw new AdminServiceException(BusiStatus.USERNOTEXISTS); + } + Long uid = u.getUid(); + + usersMap.put(uid, u); + } + + // 分隔耳伴号，多个耳伴号用换行分隔 + for (Users users : usersMap.values()) { + Long recordId = DefaultIdentifierGenerator.getInstance().nextId(null); + Long uid = users.getUid(); + + // 增加官方赠送活动记录 + addGoldRecord(recordId, users, type, Constant.WalletCurrencyType.guildCrystal, num, optId, remark, busType, null); + + if (isPlus) { + // 增加账户usd数量 + userPurseService.addGuildCrystal(uid, num.doubleValue(), BillObjTypeEnum.OFFICIAL_PLUS_GUILD_CRYSTAL); + logger.info("plusUsd success, erpan_no: {}, type: {}, num: {}, recordId: {}", users.getErbanNo(), type, num, recordId); + } else { + // 减少账户usd数量 + userPurseService.subGuildCrystal(uid, num.doubleValue(), BillObjTypeEnum.OFFICIAL_MIUNS_GUILD_CRYSTAL); + logger.info("minusUsd success, erpan_no: {}, type: {}, num: {}, recordId: {}", users.getErbanNo(), type, num, recordId); + } + + } + } finally { + this.jedisLockService.unlock(RedisKey.lock_official_gold_send.getKey(), lockval); + } + } + public long addGoldRecord(Long recordId, Users user, byte type, byte currencyType, BigDecimal num, int optId, String remark, Integer busType, BigDecimal actualAmount) { Long uid = user.getUid(); BigDecimal diamondNum = null; BigDecimal goldNum = null; BigDecimal currentGoldNum = null; - if (Constant.OfficialType.interSendGold.byteValue() == type - || Constant.OfficialType.clearUserGold.byteValue() == type + if (Constant.OfficialType.interSendGold == type + || Constant.OfficialType.clearUserGold == type || Constant.OfficialType.plusGuildUsd == type - || Constant.OfficialType.miunsGuildUsd == type) { + || Constant.OfficialType.miunsGuildUsd == type + || Constant.OfficialType.plusGuildCrystal == type + || Constant.OfficialType.miunsGuildCrystal == type) { diamondNum = num; } else { goldNum = num; @@ -424,8 +494,10 @@ public class OfficialGoldRecordService extends BaseService { currentGoldNum = BigDecimal.valueOf(userPurse.getCrystals()).add(num); } else if (currencyType == Constant.WalletCurrencyType.diamonds){ currentGoldNum = BigDecimal.valueOf(userPurse.getDiamonds()).add(num); - } else if (currencyType == Constant.WalletCurrencyType.usd){ + } else if (currencyType == Constant.WalletCurrencyType.guildUsd){ currentGoldNum = BigDecimal.valueOf(userPurse.getGuildUsd()).add(num); + } else if (currencyType == Constant.WalletCurrencyType.guildCrystal){ + currentGoldNum = BigDecimal.valueOf(userPurse.getGuildCrystal()).add(num); } } return addOfficialGoldRecord(recordId, uid, diamondNum, goldNum, currentGoldNum, type, currencyType, busType, optId, remark, actualAmount); @@ -733,7 +805,7 @@ public class OfficialGoldRecordService extends BaseService { } } else if (Constant.WalletCurrencyType.diamonds.equals(officalSendTypeEnum.getCurrencyType())) { vo.setOperationNum(BigDecimal.valueOf(record.getGoldNum())); - } else if (Constant.WalletCurrencyType.usd.equals(officalSendTypeEnum.getCurrencyType())) { + } else if (Constant.WalletCurrencyType.guildUsd.equals(officalSendTypeEnum.getCurrencyType())) { vo.setOperationNum(BigDecimal.valueOf(record.getDiamondNum())); } else { vo.setOperationNum(BigDecimal.valueOf(record.getGoldNum())); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserPurseAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserPurseAdminService.java index 52ecf7282..70854f66f 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserPurseAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserPurseAdminService.java @@ -1,11 +1,8 @@ package com.accompany.admin.service.user; -import com.accompany.admin.mapper.TestPurseMapper; import com.accompany.admin.mapper.UserPurseAdminMapperExpand; import com.accompany.admin.service.base.BaseService; import com.accompany.admin.vo.UserPurseVo; -import com.accompany.business.mybatismapper.UserPurseMapper; -import com.accompany.core.service.common.JedisService; import com.google.common.collect.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -18,15 +15,8 @@ import java.util.List; @Service public class UserPurseAdminService extends BaseService { - @Autowired - private TestPurseMapper testPurseMapper; - @Autowired - private UserPurseMapper userPurseMapper; - @Autowired UserPurseAdminMapperExpand userPurseAdminMapperExpand; - @Autowired - JedisService jedisService; public List getUserPurseList(String erbanNoList){ List oldList = Arrays.asList(erbanNoList.split(",")); diff --git a/accompany-admin/accompany-admin-service/src/main/resources/mapper/TestPurseMapper.xml b/accompany-admin/accompany-admin-service/src/main/resources/mapper/TestPurseMapper.xml deleted file mode 100644 index b3a53f83e..000000000 --- a/accompany-admin/accompany-admin-service/src/main/resources/mapper/TestPurseMapper.xml +++ /dev/null @@ -1,354 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, uid, erban_no, nick, mysql_gold, cache_gold, mysql_charge_gold, cache_charge_gold, - mysql_noble_gold, cache_noble_gold, mysql_diamond, cache_diamond, create_time, version - - - - - delete from test_purse - where id = #{id,jdbcType=INTEGER} - - - delete from test_purse - - - - - - insert into test_purse (id, uid, erban_no, - nick, mysql_gold, cache_gold, - mysql_charge_gold, cache_charge_gold, mysql_noble_gold, - cache_noble_gold, mysql_diamond, cache_diamond, - create_time, version) - values (#{id,jdbcType=INTEGER}, #{uid,jdbcType=BIGINT}, #{erbanNo,jdbcType=BIGINT}, - #{nick,jdbcType=VARCHAR}, #{mysqlGold,jdbcType=BIGINT}, #{cacheGold,jdbcType=BIGINT}, - #{mysqlChargeGold,jdbcType=BIGINT}, #{cacheChargeGold,jdbcType=BIGINT}, #{mysqlNobleGold,jdbcType=BIGINT}, - #{cacheNobleGold,jdbcType=BIGINT}, #{mysqlDiamond,jdbcType=DOUBLE}, #{cacheDiamond,jdbcType=DOUBLE}, - #{createTime,jdbcType=TIMESTAMP}, #{version,jdbcType=BIGINT}) - - - insert into test_purse - - - id, - - - uid, - - - erban_no, - - - nick, - - - mysql_gold, - - - cache_gold, - - - mysql_charge_gold, - - - cache_charge_gold, - - - mysql_noble_gold, - - - cache_noble_gold, - - - mysql_diamond, - - - cache_diamond, - - - create_time, - - - version, - - - - - #{id,jdbcType=INTEGER}, - - - #{uid,jdbcType=BIGINT}, - - - #{erbanNo,jdbcType=BIGINT}, - - - #{nick,jdbcType=VARCHAR}, - - - #{mysqlGold,jdbcType=BIGINT}, - - - #{cacheGold,jdbcType=BIGINT}, - - - #{mysqlChargeGold,jdbcType=BIGINT}, - - - #{cacheChargeGold,jdbcType=BIGINT}, - - - #{mysqlNobleGold,jdbcType=BIGINT}, - - - #{cacheNobleGold,jdbcType=BIGINT}, - - - #{mysqlDiamond,jdbcType=DOUBLE}, - - - #{cacheDiamond,jdbcType=DOUBLE}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{version,jdbcType=BIGINT}, - - - - - - update test_purse - - - id = #{record.id,jdbcType=INTEGER}, - - - uid = #{record.uid,jdbcType=BIGINT}, - - - erban_no = #{record.erbanNo,jdbcType=BIGINT}, - - - nick = #{record.nick,jdbcType=VARCHAR}, - - - mysql_gold = #{record.mysqlGold,jdbcType=BIGINT}, - - - cache_gold = #{record.cacheGold,jdbcType=BIGINT}, - - - mysql_charge_gold = #{record.mysqlChargeGold,jdbcType=BIGINT}, - - - cache_charge_gold = #{record.cacheChargeGold,jdbcType=BIGINT}, - - - mysql_noble_gold = #{record.mysqlNobleGold,jdbcType=BIGINT}, - - - cache_noble_gold = #{record.cacheNobleGold,jdbcType=BIGINT}, - - - mysql_diamond = #{record.mysqlDiamond,jdbcType=DOUBLE}, - - - cache_diamond = #{record.cacheDiamond,jdbcType=DOUBLE}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - version = #{record.version,jdbcType=BIGINT}, - - - - - - - - update test_purse - set id = #{record.id,jdbcType=INTEGER}, - uid = #{record.uid,jdbcType=BIGINT}, - erban_no = #{record.erbanNo,jdbcType=BIGINT}, - nick = #{record.nick,jdbcType=VARCHAR}, - mysql_gold = #{record.mysqlGold,jdbcType=BIGINT}, - cache_gold = #{record.cacheGold,jdbcType=BIGINT}, - mysql_charge_gold = #{record.mysqlChargeGold,jdbcType=BIGINT}, - cache_charge_gold = #{record.cacheChargeGold,jdbcType=BIGINT}, - mysql_noble_gold = #{record.mysqlNobleGold,jdbcType=BIGINT}, - cache_noble_gold = #{record.cacheNobleGold,jdbcType=BIGINT}, - mysql_diamond = #{record.mysqlDiamond,jdbcType=DOUBLE}, - cache_diamond = #{record.cacheDiamond,jdbcType=DOUBLE}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - version = #{record.version,jdbcType=BIGINT} - - - - - - update test_purse - - - uid = #{uid,jdbcType=BIGINT}, - - - erban_no = #{erbanNo,jdbcType=BIGINT}, - - - nick = #{nick,jdbcType=VARCHAR}, - - - mysql_gold = #{mysqlGold,jdbcType=BIGINT}, - - - cache_gold = #{cacheGold,jdbcType=BIGINT}, - - - mysql_charge_gold = #{mysqlChargeGold,jdbcType=BIGINT}, - - - cache_charge_gold = #{cacheChargeGold,jdbcType=BIGINT}, - - - mysql_noble_gold = #{mysqlNobleGold,jdbcType=BIGINT}, - - - cache_noble_gold = #{cacheNobleGold,jdbcType=BIGINT}, - - - mysql_diamond = #{mysqlDiamond,jdbcType=DOUBLE}, - - - cache_diamond = #{cacheDiamond,jdbcType=DOUBLE}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - version = #{version,jdbcType=BIGINT}, - - - where id = #{id,jdbcType=INTEGER} - - - update test_purse - set uid = #{uid,jdbcType=BIGINT}, - erban_no = #{erbanNo,jdbcType=BIGINT}, - nick = #{nick,jdbcType=VARCHAR}, - mysql_gold = #{mysqlGold,jdbcType=BIGINT}, - cache_gold = #{cacheGold,jdbcType=BIGINT}, - mysql_charge_gold = #{mysqlChargeGold,jdbcType=BIGINT}, - cache_charge_gold = #{cacheChargeGold,jdbcType=BIGINT}, - mysql_noble_gold = #{mysqlNobleGold,jdbcType=BIGINT}, - cache_noble_gold = #{cacheNobleGold,jdbcType=BIGINT}, - mysql_diamond = #{mysqlDiamond,jdbcType=DOUBLE}, - cache_diamond = #{cacheDiamond,jdbcType=DOUBLE}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - version = #{version,jdbcType=BIGINT} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/accompany-admin/accompany-admin-service/src/main/resources/mapper/UserPurseAdminMapperExpand.xml b/accompany-admin/accompany-admin-service/src/main/resources/mapper/UserPurseAdminMapperExpand.xml index 9fa8c3738..b6827b003 100644 --- a/accompany-admin/accompany-admin-service/src/main/resources/mapper/UserPurseAdminMapperExpand.xml +++ b/accompany-admin/accompany-admin-service/src/main/resources/mapper/UserPurseAdminMapperExpand.xml @@ -6,7 +6,9 @@ /* SHARDINGSPHERE_HINT: WRITE_ROUTE_ONLY=true */ - select b.erban_no,b.nick,b.avatar,golds as gold_num, diamonds as diamonds_num, crystals as radish_num, guild_usd from + select b.erban_no,b.nick,b.avatar,golds as gold_num, diamonds as diamonds_num, crystals as radish_num, guild_usd, guild_crystal from user_purse as a join users as b on a.uid=b.uid where b.erban_no in diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java index 5e77af977..14e0f5636 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java @@ -46,6 +46,8 @@ public class Constant { public static Byte interSendGold = 62; // 官方直接送钻石 public static Byte miunsGuildUsd = 63; // 官方直接消除薪资 public static Byte plusGuildUsd = 64; // 官方直接赠送薪资 + public static Byte miunsGuildCrystal = 65; // 官方直接消除薪资 + public static Byte plusGuildCrystal = 66; // 官方直接赠送薪资 } public static class AppVersion { @@ -2533,7 +2535,8 @@ public class Constant { public static final Byte gold = 0; // 金币 现为钻石 public static final Byte radish = 1; // 水晶 public static final Byte diamonds = 2; //钻石 现为金币 - public static final Byte usd = 4; + public static final Byte guildUsd = 4; + public static final Byte guildCrystal = 6; } public static class PrizePoolType { 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 3fd762b94..db2994dbc 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 @@ -244,9 +244,10 @@ public enum BillObjTypeEnum { USER_EVENT_REFUND_BANNER(163, "用户活动审核失败退款", BillTypeEnum.OUT, CurrencyEnum.DIAMOND, BillDomainTypeEnum.USER_EVENT), FIRST_CHARGE_REWARD_BILL(164, "首充奖励", BillTypeEnum.IN, CurrencyEnum.DIAMOND, BillDomainTypeEnum.FIRST_CHARGE), - PLUS_GUILD_USD( 165, "官方增加公会薪资", BillTypeEnum.IN, CurrencyEnum.GUILD_USD, BillDomainTypeEnum.GUILD_USD), + PLUS_GUILD_USD( 165, "官方增加公会薪资", BillTypeEnum.IN, CurrencyEnum.GUILD_USD, BillDomainTypeEnum.GUILD_USD), MIUNS_GUILD_USD( 166, "官方扣除公会薪资", BillTypeEnum.OUT, CurrencyEnum.GUILD_USD, BillDomainTypeEnum.GUILD_USD), + MINI_GAME_LUDO_TICKET_OUT( 167, "LUDO门票消耗", BillTypeEnum.OUT, CurrencyEnum.GOLD, BillDomainTypeEnum.LUDO_MINI_GAME), MINI_GAME_LUDO_TICKET_IN( 168, "LUDO门票退回", BillTypeEnum.IN, CurrencyEnum.GOLD, BillDomainTypeEnum.LUDO_MINI_GAME), @@ -277,6 +278,9 @@ public enum BillObjTypeEnum { EXCHANGE_GUILD_CRYSTAL_TO_DIAMOND_PAY( 184, "公会紫晶兑换金币支出", BillTypeEnum.OUT, CurrencyEnum.GUILD_CRYSTAL, BillDomainTypeEnum.EXCHANGE), EXCHANGE_GUILD_CRYSTAL_TO_DIAMOND_INCOME( 185, "公会紫晶兑换金币收入", BillTypeEnum.IN, CurrencyEnum.DIAMOND, BillDomainTypeEnum.EXCHANGE), + + OFFICIAL_PLUS_GUILD_CRYSTAL( 186, "官方增加公会紫晶", BillTypeEnum.IN, CurrencyEnum.GUILD_CRYSTAL, BillDomainTypeEnum.GUILD_POLICY2), + OFFICIAL_MIUNS_GUILD_CRYSTAL( 187, "官方扣除公会紫晶", BillTypeEnum.OUT, CurrencyEnum.GUILD_CRYSTAL, BillDomainTypeEnum.GUILD_POLICY2), ; BillObjTypeEnum(int value, String desc, BillTypeEnum type, CurrencyEnum currency, BillDomainTypeEnum domain) { diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/OfficalSendTypeEnum.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/OfficalSendTypeEnum.java index 2154a9227..08a93498c 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/OfficalSendTypeEnum.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/OfficalSendTypeEnum.java @@ -22,9 +22,11 @@ public enum OfficalSendTypeEnum { OFFICAL_REDUCE_DIAMONDS(Constant.OfficialType.officalDiamondReduce,"官方金币消除", (byte)2), - OFFICAL_MINUS_GUILD_USD(Constant.OfficialType.miunsGuildUsd, "消除薪资", Constant.WalletCurrencyType.usd), + OFFICAL_MINUS_GUILD_USD(Constant.OfficialType.miunsGuildUsd, "消除薪资", Constant.WalletCurrencyType.guildUsd), + OFFICAL_PLUS_GUILD_USD(Constant.OfficialType.plusGuildUsd,"赠送薪资", Constant.WalletCurrencyType.guildUsd), - OFFICAL_PLUS_GUILD_USD(Constant.OfficialType.plusGuildUsd,"赠送薪资", Constant.WalletCurrencyType.usd), + OFFICAL_MINUS_GUILD_CRYSTAL(Constant.OfficialType.miunsGuildCrystal, "消除公会紫晶", Constant.WalletCurrencyType.guildCrystal), + OFFICAL_PLUS_GUILD_CRYSTAL(Constant.OfficialType.plusGuildCrystal,"赠送公会紫晶", Constant.WalletCurrencyType.guildCrystal), ; private byte value; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/UserPurseService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/UserPurseService.java index 11578e505..dd3a90afc 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/UserPurseService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/UserPurseService.java @@ -748,8 +748,8 @@ public class UserPurseService extends ServiceImpl { return userPurse; }); - billRecordService.insertGeneralBillRecord(uid, BillObjTypeEnum.EXCHANGE_CRYSTAL_TO_DIAMOND_PAY, guildCrystalNumD, after); - billRecordService.insertGeneralBillRecord(uid, BillObjTypeEnum.EXCHANGE_CRYSTAL_TO_DIAMOND_INCOME, diamondD, after); + billRecordService.insertGeneralBillRecord(uid, BillObjTypeEnum.EXCHANGE_GUILD_CRYSTAL_TO_DIAMOND_PAY, guildCrystalNumD, after); + billRecordService.insertGeneralBillRecord(uid, BillObjTypeEnum.EXCHANGE_GUILD_CRYSTAL_TO_DIAMOND_INCOME, diamondD, after); return after; }