fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java
@@ -258,7 +258,7 @@ } if (StringUtil.isNullOrEmpty(nickName)) nickName = Constant.systemCommonConfig.getDefaultNickName(); nickName = Constant.systemCommonConfig.getDefaultNickName() + inviteId; if (StringUtil.isNullOrEmpty(portrait)) portrait = Constant.systemCommonConfig.getDefaultPortrait(); fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
@@ -697,8 +697,9 @@ user.setRank(0); if (StringUtil.isNullOrEmpty(user.getPortrait())) user.setPortrait(Constant.systemCommonConfig.getDefaultPortrait()); userInfoMapper.insertSelective(user); // 昵称为空时 默认昵称 if (StringUtil.isNullOrEmpty(user.getNickName())) { UserInfo updateUserInfo = new UserInfo(user.getId()); updateUserInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName() + user.getId()); @@ -848,15 +849,20 @@ updateUserInfo.setWxOpenId(weiXinUser.getOpenid()); updateUserInfo.setWxPic(weiXinUser.getHeadimgurl()); updateUserInfo.setWxUnionId(weiXinUser.getUnionid()); updateUserInfo.setNickName(weiXinUser.getNickname()); updateUserInfo.setPortrait(weiXinUser.getHeadimgurl()); if (StringUtil.isNullOrEmpty(weiXinUser.getNickname())) { updateUserInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName()); // 将默认昵称替换成微信昵称 String defaultNickName = Constant.systemCommonConfig.getDefaultNickName(); if (!StringUtil.isNullOrEmpty(weiXinUser.getNickname()) && !StringUtil.isNullOrEmpty(defaultNickName) && (defaultNickName.equals(user.getNickName()) || "返利券".equals(user.getNickName()))) { updateUserInfo.setNickName(weiXinUser.getNickname()); } if (StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl())) { updateUserInfo.setPortrait(Constant.systemCommonConfig.getDefaultPortrait()); // 将默认头像替换成微信头像 String defaultPortrait = Constant.systemCommonConfig.getDefaultPortrait(); if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl()) && !StringUtil.isNullOrEmpty(defaultPortrait) && defaultPortrait.equals(user.getPortrait())) { updateUserInfo.setPortrait(weiXinUser.getHeadimgurl()); } userInfoMapper.updateByPrimaryKeySelective(updateUserInfo); userAccountMsgNotificationService.changeBindingSuccess(uid, MsgAccountDetailFactory.TYPE_WX); @@ -1023,7 +1029,7 @@ } else { userInfo = new UserInfo(); userInfo.setAppId(appId); userInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName()); //userInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName()); userInfo.setPortrait(Constant.systemCommonConfig.getDefaultPortrait()); userInfo.setPhone(phone); userInfo.setLoginType(loginType); @@ -1235,7 +1241,7 @@ // 将默认昵称替换成微信昵称 String defaultNickName = Constant.systemCommonConfig.getDefaultNickName(); if (!StringUtil.isNullOrEmpty(weiXinUser.getNickname()) && !StringUtil.isNullOrEmpty(defaultNickName) && defaultNickName.equals(user.getNickName())) { && (defaultNickName.equals(user.getNickName()) || "返利券".equals(user.getNickName()))) { updateUserInfo.setNickName(weiXinUser.getNickname()); }
@@ -249,7 +249,10 @@ // 结束日期 // 今天在内 减去一天 String endDay = DateUtil.plusDay(expiryDay - 1, new Date()); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); if (endDay != null && endDay.trim().length() > 0) { endDay += " 23:59:59"; } Date endTime = format.parse(endDay); UserSystemCoupon userCoupon = new UserSystemCoupon(); @@ -1378,7 +1381,10 @@ // 结束日期 // 今天在内 减去一天 String endDay = DateUtil.plusDay(systemCoupon.getExpiryDay() - 1, new Date()); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); if (endDay != null && endDay.trim().length() > 0) { endDay += " 23:59:59"; } Date endTime = format.parse(endDay); UserSystemCoupon userCoupon = new UserSystemCoupon(); @@ -1453,7 +1459,10 @@ // 结束日期 今天在内 减去一天 String endDay = DateUtil.plusDay(systemCoupon.getExpiryDay() - 1, new Date()); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); if (endDay != null && endDay.trim().length() > 0) { endDay += " 23:59:59"; } Date endTime = format.parse(endDay); UserSystemCoupon userCoupon = new UserSystemCoupon(); @@ -1590,7 +1599,10 @@ // 计算结束日期：今天在内 减去一天 String endDay = DateUtil.plusDay(expiryDay - 1, new Date()); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); if (endDay != null && endDay.trim().length() > 0) { endDay += " 23:59:59"; } Date endTime = format.parse(endDay); UserSystemCoupon userCoupon = new UserSystemCoupon(); @@ -2025,7 +2037,10 @@ try { Integer expiryDay = systemCoupon.getExpiryDay(); String endDay = DateUtil.plusDay(expiryDay - 1, nowDate); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); if (endDay != null && endDay.trim().length() > 0) { endDay += " 23:59:59"; } Date endTime = format.parse(endDay); UserSystemCoupon userCoupon = new UserSystemCoupon(); fanli/src/main/java/com/yeshi/fanli/util/StringUtil.java
@@ -112,7 +112,7 @@ // �Ƿ��ǿյ��ַ� public static boolean isNullOrEmpty(String text) { if (text == null || text.length() == 0 || text.equalsIgnoreCase("null")) { if (text == null || text.trim().length() == 0 || text.equalsIgnoreCase("null")) { return true; } return false; fanli/src/main/resource/system_config.properties
@@ -17,7 +17,7 @@ wx_open_appsecret=0c79d5869bb0f2d7c13e43f9a18f440d default_nick_name=返利券 default_nick_name=快省_ default_portrait=http://ec-1255749512.file.myqcloud.com/resource/portrait.png #默认的提成订单图片
