fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java
@@ -370,7 +370,7 @@ } else { JSONObject json = JSONObject.fromObject(versions); String versionsIOS = json.getString("IOS"); String versionsIOS = json.optString("IOS"); if (versionsIOS != null && versionsIOS.trim().length() > 0) { listIOS = Arrays.asList(versionsIOS.split(",")); } fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConvertLinkController.java
@@ -275,8 +275,8 @@ redisManager.removeCommonString(key); JSONObject data = new JSONObject(); data.put("data", result); data.put("tip", "1.转好的链接/口令有效期，请在有效期内推广分享；\r\n" + "2.已经转好的链接/口令请不要修改，以免无法追踪到订单；\r\n" + "3.请确保转换链接合法合规，一切违法的链/口令产生的法律后果自行承担与本App无关。"); data.put("tip", "1.转好的链接/口令有有效期，请在有效期内推广分享；\r\n" + "2.已经转好的链接/口令请不要修改，以免无法追踪到订单；\r\n" + "3.请确保转换链接合法合规，一切违法的链接/口令产生的法律后果自行承担与本App无关。"); out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data))); } } fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserMsgController.java
@@ -47,6 +47,7 @@ import com.yeshi.fanli.service.inter.order.msg.MsgOrderDetailService; import com.yeshi.fanli.service.inter.user.invite.MsgInviteDetailService; import com.yeshi.fanli.service.inter.user.msg.MsgAccountDetailService; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.JumpDetailUtil; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.TimeUtil; @@ -150,10 +151,11 @@ } JumpDetailV2 wxmpJumDetail = JumpDetailUtil.getWXMPJumDetail(zhuShouMsg.getJumpDetail()); if (Constant.IS_TEST) read = false; commonMsgList.add(new UserCommonMsgVO(zhuShouMsg.getIcon(), zhuShouMsg.getTitle(), zhuShouMsg.getUpdateTime(), UserCommonMsgVO.TYPE_ZHUSHOU, zhuShouMsg.getContent(), read, wxmpJumDetail, zhuShouMsg.getParams(), 0)); } } @@ -366,7 +368,7 @@ UserMsgUnReadNum num = userMsgReadStateService.getReadStateByUid(uid); int totalCount = num.getTypeAccount() + num.getTypeInvite() + num.getTypeMoney() + num.getTypeOrder() + num.getTypeScore() + num.getTypeSystem() + num.getTypeOther(); data.put("totalCount", totalCount>=100?"99+":totalCount+""); data.put("totalCount", totalCount >= 100 ? "99+" : totalCount + ""); } out.print(JsonUtil.loadTrueResult(data)); fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java
@@ -1,5 +1,6 @@ package com.yeshi.fanli.entity.bus.user; import java.io.Serializable; import java.math.BigDecimal; import javax.persistence.Column; @@ -17,7 +18,10 @@ * */ @Table("yeshi_ec_user") public class UserInfo { public class UserInfo implements Serializable{ /** * */ public static int STATE_NORMAL = 0;// 正常状态 public static int STATE_DELETE = 1;// 删除状态 public static int STATE_FORBIDDEN = 2;// 封禁状态 fanli/src/main/java/com/yeshi/fanli/exception/goods/ConvertLinkExceptionException.java
New file @@ -0,0 +1,16 @@ package com.yeshi.fanli.exception.goods; import com.yeshi.fanli.exception.BaseException; public class ConvertLinkExceptionException extends BaseException { private static final long serialVersionUID = 1L; public ConvertLinkExceptionException(int code, String msg) { super(code, msg); } public ConvertLinkExceptionException() { super(); } } fanli/src/main/java/com/yeshi/fanli/service/manger/goods/ConvertLinkManager.java
@@ -43,15 +43,8 @@ /** * * @Title: convertJDLinkFromText * @Description:转链文本中的京东短链 * @param text * @param uid * @param share * @return * @throws Exception * String 返回类型 * @throws * @Title: convertJDLinkFromText @Description:转链文本中的京东短链 @param text @param * uid @param share @return @throws Exception String 返回类型 @throws */ public String convertJDLinkFromText(String text, Long uid, boolean share) throws Exception { @@ -90,21 +83,14 @@ /** * * @Title: convertTBLinkFromText * @Description: 转链文本中的淘口令 * @param text * @param uid * @param share * @return * @throws Exception * String 返回类型 * @throws * @Title: convertTBLinkFromText @Description: 转链文本中的淘口令 @param text @param * uid @param share @return @throws Exception String 返回类型 @throws */ private String convertTBLinkFromText(String text, Long uid, boolean share) throws Exception { StringBuilder builder = new StringBuilder(text); String newText = builder.toString(); List<String> tokenList = TaoBaoUtil.getTokenListFromText(newText); List<String> tokenList = TaoBaoUtil.getTokenListFromTextWithKuoHao(newText); if (tokenList != null && tokenList.size() > 0) { String relationId = null; @@ -179,7 +165,7 @@ if (StringUtil.isNullOrEmpty(newToken)) { throw new Exception("口令转链失败"); } tokenMap.put(token, newToken); tokenMap.put(token, TaoBaoUtil.filterTaoToken(newToken)); } for (String token : tokenSet) { @@ -193,12 +179,8 @@ /** * * @Title: convertLinkFromText * @Description: 从文本转链 * @param text * @return * String 返回类型 * @throws * @Title: convertLinkFromText @Description: 从文本转链 @param text @return * String 返回类型 @throws */ public String convertLinkFromText(String text, Long uid, boolean share) throws Exception { String newText = convertJDLinkFromText(text, uid, share); @@ -207,16 +189,8 @@ } /** * 创建口令 * @Title: createTaoBaoToken * @Description: * @param uid 用户ID * @param picturl * @param title * @param link * @return * String 返回类型 * @throws * 创建口令 @Title: createTaoBaoToken @Description: @param uid 用户ID @param * picturl @param title @param link @return String 返回类型 @throws */ public String createTaoBaoToken(Long uid, String picturl, String title, String link) {
