From b2fa8ca84fd443ec15947bbc960dac360a5ccffa Mon Sep 17 00:00:00 2001 From: tangzh Date: Tue, 11 Mar 2025 20:30:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zbkj/common/constants/Constants.java | 23 ++++++++----------- .../service/impl/UserCenterServiceImpl.java | 2 +- .../service/service/impl/UserServiceImpl.java | 3 +-- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/food-common/src/main/java/com/zbkj/common/constants/Constants.java b/food-common/src/main/java/com/zbkj/common/constants/Constants.java index f086a28..73cbb74 100644 --- a/food-common/src/main/java/com/zbkj/common/constants/Constants.java +++ b/food-common/src/main/java/com/zbkj/common/constants/Constants.java @@ -220,10 +220,6 @@ public class Constants { //验证码过期时间 public static final String CONFIG_KEY_SMS_CODE_EXPIRE = "sms_code_expire"; - //config配置的formId - public static final int CONFIG_FORM_ID_INDEX = 133; //首页配置 - public static final int CONFIG_FORM_ID_PUBLIC = 65; //公众号配置 - //第三方登录token类型 public static final int THIRD_LOGIN_TOKEN_TYPE_PUBLIC = 1; //公众号 public static final int THIRD_LOGIN_TOKEN_TYPE_PROGRAM = 2; //小程序 @@ -250,6 +246,13 @@ public class Constants { public static final Integer HOME_TYPE_1 = 1; public static final Integer HOME_TYPE_2 = 2; + //config配置的formId + public static final int CONFIG_FORM_ID_INDEX = 133; //首页配置 + public static final int CONFIG_FORM_ID_PUBLIC = 65; //公众号配置 + + // 移动端_首页_精品推荐benner图 + public static final int INDEX_PRODUCT_LIST_BANNER = 52; // 移动端_首页_精品推荐benner图 + //group gid public static final Integer GROUP_DATA_ID_INDEX_BEST_BANNER = 37; //中部推荐banner图 public static final Integer GROUP_DATA_ID_INDEX_BANNER = 48; //首页banner滚动图 @@ -294,22 +297,15 @@ public class Constants { public static final String SEARCH_DATE_YEAR = "year"; //年 public static final String SEARCH_DATE_PRE_YEAR = "preYear"; //上一年 - //分类服务类型 类型，1 产品分类，2 附件分类，3 文章分类， 4 设置分类， 5 菜单分类， 6 配置分类， 7 秒杀配置， 8 活动分类，9 游戏分类 + //分类服务类型 类型，1 产品分类，2 附件分类，4 设置分类， 5 菜单分类，6 配置分类，11 套餐分类 public static final int CATEGORY_TYPE_PRODUCT = 1; //产品 public static final int CATEGORY_TYPE_ATTACHMENT = 2; //附件分类 public static final int CATEGORY_TYPE_ARTICLE = 3; //文章分类 public static final int CATEGORY_TYPE_SET = 4; //设置分类 public static final int CATEGORY_TYPE_MENU = 5; //菜单分类 public static final int CATEGORY_TYPE_CONFIG = 6; //配置分类 - public static final int CATEGORY_TYPE_SKILL = 7; //秒杀配置 - public static final int CATEGORY_TYPE_ACTIVITY = 8; //活动类型 - public static final int CATEGORY_TYPE_GAME = 9; //游戏分类 - // 分类游戏固定编号 - public static final int CATEGORY_TYPE_GAME_ID = 747; // 抽奖游戏 - public static final int CATEGORY_TYPE_TREE_ID = 748; // 茶树游戏 - - //首页Banner图片 + // 首页Banner图片 public static final int INDEX_RECOMMEND_BANNER = 1; //是否精品 推荐Banner图片 public static final int INDEX_HOT_BANNER = 2; //是否热卖 推荐Banner图片 public static final int INDEX_NEW_BANNER = 3; //是否新品 推荐Banner图片 @@ -466,6 +462,7 @@ public class Constants { //微信消息模板 tempKey public static final String WE_CHAT_TEMP_KEY_FIRST = "first"; public static final String WE_CHAT_TEMP_KEY_END = "remark"; + // 公众号模板消息 public static final String WE_CHAT_TEMP_KEY_COMBINATION_SUCCESS = "OPENTM407456411";// 拼团成功 public static final String WE_CHAT_TEMP_KEY_BARGAIN_SUCCESS = "OPENTM410292733";// 砍价成功 diff --git a/food-front/src/main/java/com/zbkj/front/service/impl/UserCenterServiceImpl.java b/food-front/src/main/java/com/zbkj/front/service/impl/UserCenterServiceImpl.java index ec5b374..1a0281f 100644 --- a/food-front/src/main/java/com/zbkj/front/service/impl/UserCenterServiceImpl.java +++ b/food-front/src/main/java/com/zbkj/front/service/impl/UserCenterServiceImpl.java @@ -486,7 +486,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements request.setProvince(""); request.setCity(""); request.setCountry(""); - request.setAvatar(""); + request.setAvatar(systemConfigService.getValueByKey(Constants.USER_DEFAULT_AVATAR_CONFIG_KEY)); request.setHeadimgurl(""); request.setType(type); request.setOpenId(openId); diff --git a/food-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java b/food-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java index 5a33bd0..438aee2 100644 --- a/food-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java +++ b/food-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java @@ -1077,7 +1077,7 @@ public class UserServiceImpl extends ServiceImpl implements UserS user.setAccount(DigestUtils.md5Hex(CrmebUtil.getUuid() + DateUtil.getNowTime())); user.setUserType(thirdUserRequest.getType()); user.setNickname(thirdUserRequest.getNickName()); - String avatar = null; + String avatar = thirdUserRequest.getAvatar(); String loginType = Constants.USER_LOGIN_TYPE_PROGRAM; switch (thirdUserRequest.getType()) { case Constants.USER_LOGIN_TYPE_PUBLIC: @@ -1088,7 +1088,6 @@ public class UserServiceImpl extends ServiceImpl implements UserS case Constants.USER_LOGIN_TYPE_H5: case Constants.USER_LOGIN_TYPE_IOS_WX: case Constants.USER_LOGIN_TYPE_ANDROID_WX: - avatar = thirdUserRequest.getAvatar(); loginType = Constants.USER_LOGIN_TYPE_PROGRAM; break; }