v1.0 : 大鹅开黑文案替换
This commit is contained in:
@@ -16,8 +16,8 @@ public enum AppEnum {
|
||||
planet("planet", "hello处cp"),
|
||||
ear("ear", "侧耳"),
|
||||
mj("mj", "马甲包"),
|
||||
yinyou("yinyou", "大鹅开黑"),
|
||||
yinyouEnterprise("yinyouEnterprise", "大鹅开黑企业包"),
|
||||
yinyou("yinyou", "大鹅"),
|
||||
yinyouEnterprise("yinyouEnterprise", "大鹅企业包"),
|
||||
yinbao("yinbao", "魔力"),
|
||||
|
||||
pekoEnterprise("pekoEnterprise", "peko企业包"),
|
||||
|
@@ -383,11 +383,11 @@ public class Constant {
|
||||
public static final String fastpay = "fast_pay";
|
||||
// 微商城微信公众号支付
|
||||
public static final String wx_micro_mall_pub = "wx_micro_mall_pub";
|
||||
// 新公众号:大鹅开黑助手
|
||||
// 新公众号:平台助手
|
||||
public static final String wx_pub2 = "wx_pub2";
|
||||
//幸运塔罗充值
|
||||
public static final String lucky_tarot = "lucky_tarot";
|
||||
// 新公众号:大鹅开黑助手 h5支付
|
||||
// 新公众号:平台助手 h5支付
|
||||
public static final String wx_pub2_h5 = "wx_pub2_h5";
|
||||
}
|
||||
|
||||
@@ -1059,12 +1059,12 @@ public class Constant {
|
||||
public static final String WX_MINIPAY_APPID = "wx_monipay_appid";
|
||||
|
||||
/*
|
||||
* 大鹅开黑微信小程序原始ID
|
||||
* 平台微信小程序原始ID
|
||||
*/
|
||||
public static final String YINYOU_WX_MINIPAY_ID = "yinyou_wx_minipay_id";
|
||||
|
||||
/**
|
||||
* 大鹅开黑微信小程序APPID
|
||||
* 平台微信小程序APPID
|
||||
*/
|
||||
public static final String YINYOU_WX_MINIPAY_APPID = "yinyou_wx_monipay_appid";
|
||||
|
||||
@@ -1671,10 +1671,10 @@ public class Constant {
|
||||
*/
|
||||
public static final String IOS_PAY_REFUND_CONFIG = "ios_pay_refund_config";
|
||||
|
||||
/** 大鹅开黑一周年 START **/
|
||||
/** 平台一周年 START **/
|
||||
public static final String ACT_ONE_YEAR_CP_RANK_CONFIG = "act_one_year_cp_rank_config"; // CP榜单配置
|
||||
public static final String ACT_ONE_YEAR_SWEET_CAKE_DRAW_CONFIG = "act_one_year_sweet_cake_draw_config"; // 甜蜜蛋糕屋抽奖配置
|
||||
/** 大鹅开黑一周年 END **/
|
||||
/** 平台一周年 END **/
|
||||
/**
|
||||
* 每天开魔盒盈利/亏损阈值
|
||||
*/
|
||||
@@ -2405,7 +2405,7 @@ public class Constant {
|
||||
public static final Byte invalid = 0; // 无效
|
||||
}
|
||||
|
||||
public static String DEFAULT_NICK = "大鹅开黑新人";
|
||||
public static String DEFAULT_NICK = "平台新人";
|
||||
public static String DEFAULT_HEAD = "https://image.zhongjialx.com/default_avatar.png";
|
||||
public static String DEFAULT_HEAD_NEW = "https://image.zhongjialx.com/default_avatar.png";
|
||||
public static String DEFAULT_CAR = "https://img.erbanyy.com/default_car.png";
|
||||
@@ -5426,7 +5426,7 @@ public class Constant {
|
||||
|
||||
public static class NewUserStart {
|
||||
public static final String OTHER_CHANNEL_SOURCE = "other";
|
||||
public static final String INDEX_MSG = "欢迎来到大鹅开黑,在这里你可以遇到很多有才有艺的Ta,快来听听看,不信你不心动哦~";
|
||||
public static final String INDEX_MSG = "欢迎来到平台,在这里你可以遇到很多有才有艺的Ta,快来听听看,不信你不心动哦~";
|
||||
|
||||
public static final String SayHelloPool = "";
|
||||
}
|
||||
|
@@ -43,7 +43,7 @@ public enum RedisKey {
|
||||
microv2_list,
|
||||
|
||||
user, // 以UID为KEY存储的用户信息
|
||||
user_erban_no, // 以大鹅开黑号为KEY存储的用户信息
|
||||
user_erban_no, // 以平台号为KEY存储的用户信息
|
||||
user_summary, // 以UID为KEY存储的用户概要信息
|
||||
lock_user_summary, // 用户概要信息锁
|
||||
|
||||
@@ -131,7 +131,7 @@ public enum RedisKey {
|
||||
level_exper, // 等级经验资源列表
|
||||
level_charm, // 等级魅力资源列表
|
||||
user_draw,
|
||||
erban_no, //大鹅开黑号
|
||||
erban_no, //平台号
|
||||
pretty_number,//靓号
|
||||
auti_banner, //审核中的Banner
|
||||
auti_user, //审核中的测试账号
|
||||
@@ -1640,7 +1640,7 @@ public enum RedisKey {
|
||||
* 礼物合成礼物列表
|
||||
*/
|
||||
gift_compound_list,
|
||||
/** 大鹅开黑一周年 START **/
|
||||
/** 平台一周年 START **/
|
||||
activity_one_year_rank, // 一周年榜单列表
|
||||
activity_one_year_rank_cp, // 一周年榜单列表组合信息
|
||||
activity_one_year_user_task, // 一周年用户每日任务
|
||||
@@ -1654,7 +1654,7 @@ public enum RedisKey {
|
||||
activity_one_year_join_user, //一周年进入活动用户
|
||||
activity_one_year_award, //一周年发放奖励缓存
|
||||
activity_one_year_time, //一周年时光页
|
||||
/** 大鹅开黑一周年 END **/
|
||||
/** 平台一周年 END **/
|
||||
/******************************************************* 福袋偏差start ****************************************************/
|
||||
/** 福袋平台偏差 **/
|
||||
lucky_bag_gift_platform_deviate,
|
||||
|
@@ -83,7 +83,7 @@ public enum BusiStatus {
|
||||
REDPACKETNUMNOTENOUGH(2105, "红包金额不足"),
|
||||
RED_PACKET_RATE_NOT_ENOUGH(2106, "分成红包占比不足"),
|
||||
SENDGOLDNOTENOUGH(2107, "转赠金额超过金币余额"),
|
||||
USER_IS_EMPTY(2108, "请输入手机号/大鹅开黑号"),
|
||||
USER_IS_EMPTY(2108, "请输入手机号/平台号"),
|
||||
|
||||
ORDERNOTEXISTS(3404, "密聊不存在"),
|
||||
ORDERFINISHED(3100, "密聊已经结束"),
|
||||
@@ -261,7 +261,7 @@ public enum BusiStatus {
|
||||
PK_ACT_RECORD_IP_REPEAT(9501, "ip地址重复"),
|
||||
ACT_GIFT_NOT_EXITST(9102, "该礼物不是活动规定礼物"),
|
||||
|
||||
SEARCH_NOT_SUPPORT(9502, "暂时只支持大鹅开黑号搜索"),
|
||||
SEARCH_NOT_SUPPORT(9502, "暂时只支持平台号搜索"),
|
||||
|
||||
OPEN_BOX_POOL_NEED_THANKS_PRODUCT(9999, "尚未配置默认奖品"),
|
||||
OPEN_BOX_KEY_NOT_ENOUGH(10000, "门票数量不够"),
|
||||
|
@@ -38,7 +38,7 @@ public class SwaggerAutoConfiguration {
|
||||
.apis(RequestHandlerSelectors.basePackage("com.accompany"))
|
||||
.paths(path -> !StringUtils.contains(path, "/internal/"))
|
||||
.build()
|
||||
.apiInfo(new ApiInfoBuilder().title("大鹅开黑接口").description("大鹅开黑业务接口").build())
|
||||
.apiInfo(new ApiInfoBuilder().title("平台接口").description("平台业务接口").build())
|
||||
.enable(!onlineEnv);
|
||||
}
|
||||
|
||||
|
@@ -18,7 +18,7 @@ public class AccountBlockResult {
|
||||
private Long uid;
|
||||
|
||||
/**
|
||||
* 大鹅开黑号
|
||||
* 平台号
|
||||
*/
|
||||
private Long erbanNo;
|
||||
/**
|
||||
|
@@ -155,7 +155,7 @@ public class AccountService extends ServiceImpl<AccountMapper, Account> {
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据大鹅开黑号列表来查询相应的account表数据,此处主要用于后台管理系统
|
||||
* 根据平台号列表来查询相应的account表数据,此处主要用于后台管理系统
|
||||
*
|
||||
* @return
|
||||
* @Author yuanyi
|
||||
@@ -230,7 +230,7 @@ public class AccountService extends ServiceImpl<AccountMapper, Account> {
|
||||
return updateById(updateAccount);
|
||||
}
|
||||
|
||||
//注册时大鹅开黑号写入redis缓存
|
||||
//注册时平台号写入redis缓存
|
||||
public void writeAche(Account account) {
|
||||
|
||||
try {
|
||||
|
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* Created by liuguofu on 2017/5/10.
|
||||
* 大鹅开黑号生成服务,自动生成不生成靓号,靓号可以由人工修改
|
||||
* 平台号生成服务,自动生成不生成靓号,靓号可以由人工修改
|
||||
*/
|
||||
@Service
|
||||
public class ErBanNoService {
|
||||
@@ -36,7 +36,7 @@ public class ErBanNoService {
|
||||
}else if(num==6){//6次未生成,继续升级位数
|
||||
digit++;
|
||||
}else if(num ==10){
|
||||
throw new Exception("大鹅开黑号生成异常");
|
||||
throw new Exception("平台号生成异常");
|
||||
}
|
||||
}
|
||||
return erbanNo;
|
||||
@@ -65,7 +65,7 @@ public class ErBanNoService {
|
||||
System.out.println("morethan 6="+generalId+"&dumpNumber="+dumpNumber);
|
||||
digit++;
|
||||
}else if(numFilter ==10){
|
||||
throw new Exception("大鹅开黑号生成异常");
|
||||
throw new Exception("平台号生成异常");
|
||||
}
|
||||
}
|
||||
return Long.valueOf(generalId);
|
||||
@@ -110,7 +110,7 @@ public class ErBanNoService {
|
||||
}
|
||||
|
||||
/**
|
||||
* 是否是靓号的原始大鹅开黑号
|
||||
* 是否是靓号的原始平台号
|
||||
* @param erbanNo
|
||||
* @return
|
||||
*/
|
||||
|
@@ -90,7 +90,7 @@ public class UsersBaseService extends BaseService {
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据uid查询大鹅开黑号
|
||||
* 根据uid查询平台号
|
||||
*
|
||||
* @param erbanNos
|
||||
* @return
|
||||
@@ -327,7 +327,7 @@ public class UsersBaseService extends BaseService {
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新用户资料 大鹅开黑号、手机号码、性别不能修改。必须通过单独的接口修改
|
||||
* 更新用户资料 平台号、手机号码、性别不能修改。必须通过单独的接口修改
|
||||
*
|
||||
* @param user
|
||||
*/
|
||||
@@ -366,7 +366,7 @@ public class UsersBaseService extends BaseService {
|
||||
if (result) {
|
||||
Users user = usersMapper.selectByPrimaryKey(uid);
|
||||
if (user != null) {
|
||||
//如果手机号是大鹅开黑号,则更换为靓号
|
||||
//如果手机号是平台号,则更换为靓号
|
||||
if (StringUtils.isBlank(user.getPhone()) || !CommonUtil.checkIsPhone(user.getPhone())) {
|
||||
user.setPhone(String.valueOf(erbanNo));
|
||||
}
|
||||
|
@@ -44,7 +44,7 @@ public class JwtUtils {
|
||||
// String key = PropertyUtil.getProperty("jwtH5Key");
|
||||
String key = WebSecurityConfig.jwtWebKey;
|
||||
|
||||
//生成签发人,这里以大鹅开黑号为签发人
|
||||
//生成签发人,这里以平台号为签发人
|
||||
String subject = uid.toString();
|
||||
|
||||
|
||||
|
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* @date 2021年01月12日
|
||||
* @descrition 大鹅开黑支付宝支付业务处理
|
||||
* @descrition 平台支付宝支付业务处理
|
||||
*/
|
||||
@Service
|
||||
public class YinyouAlipayService extends AbstractAlipayService {
|
||||
|
@@ -118,7 +118,7 @@ public class PayConstant {
|
||||
public final static String H5_PAY_NICK_FIELD = "nick";
|
||||
|
||||
/**
|
||||
* H5中支付大鹅开黑号属性名称
|
||||
* H5中支付平台号属性名称
|
||||
*/
|
||||
public final static String H5_PAY_ERBANNO_FIELD = "erbanNo";
|
||||
|
||||
|
@@ -31,7 +31,7 @@ public class ResponseBO {
|
||||
private String nick;
|
||||
|
||||
/**
|
||||
* 大鹅开黑号
|
||||
* 平台号
|
||||
*/
|
||||
private Long erban_no;
|
||||
}
|
||||
|
@@ -121,7 +121,7 @@ public class AlipayStrategy extends AbstractPayStrategy {
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断是否大鹅开黑app
|
||||
* 判断是否平台app
|
||||
* @param deviceInfo
|
||||
* @return
|
||||
*/
|
||||
|
@@ -70,7 +70,7 @@ public class LuckyTarotPayStrategy extends AbstractPayStrategy{
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断是否大鹅开黑app
|
||||
* 判断是否平台app
|
||||
* @param deviceInfo
|
||||
* @return
|
||||
*/
|
||||
|
@@ -69,7 +69,7 @@ public class WxNativeStrategy extends AbstractPayStrategy {
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断是否大鹅开黑app
|
||||
* 判断是否平台app
|
||||
* @param deviceInfo
|
||||
* @return
|
||||
*/
|
||||
|
@@ -27,9 +27,9 @@ public class ChargeRecordStatisVo extends BaseVo {
|
||||
public BigDecimal wxPubAmount;
|
||||
@FieldComment("微商城公众号")
|
||||
public BigDecimal wxMicroMallPubAmount;
|
||||
@FieldComment("大鹅开黑助手公众号")
|
||||
@FieldComment("平台助手公众号")
|
||||
public BigDecimal wxPub2Amount;
|
||||
@FieldComment("大鹅开黑公众号H5支付")
|
||||
@FieldComment("平台公众号H5支付")
|
||||
public BigDecimal wxPub2H5Amount;
|
||||
@FieldComment("IOS支付")
|
||||
public BigDecimal iosPayAmount;
|
||||
@@ -71,9 +71,9 @@ public class ChargeRecordStatisVo extends BaseVo {
|
||||
public Integer totalCount;
|
||||
@FieldComment("微商城公众号笔数")
|
||||
public Integer wxMicroMallPubCount;
|
||||
@FieldComment("大鹅开黑助手公众号笔数")
|
||||
@FieldComment("平台助手公众号笔数")
|
||||
public Integer wxPub2Count;
|
||||
@FieldComment("大鹅开黑助手公众号H5支付笔数")
|
||||
@FieldComment("平台助手公众号H5支付笔数")
|
||||
public Integer wxPub2H5Count;
|
||||
}
|
||||
|
||||
|
@@ -16,7 +16,7 @@ public class TarotRecordStatisVo {
|
||||
|
||||
/** 用户uid **/
|
||||
private Long uid;
|
||||
/** 用户大鹅开黑号 **/
|
||||
/** 用户平台号 **/
|
||||
private Long erbanNo;
|
||||
/** 用户昵称 **/
|
||||
private String nick;
|
||||
|
Reference in New Issue
Block a user