fanli/libs/osp-sdk-1.0.jarBinary files differ
fanli/libs/vop-sdk-1.0.jarBinary files differ
fanli/pom.xml
@@ -134,6 +134,24 @@ <scope>system</scope> <systemPath>${basedir}/libs/vpush-server-sdk-2.0.jar</systemPath> </dependency> <!-- 唯品会 --> <dependency> <groupId>vop-sdk</groupId> <artifactId>vop-sdk</artifactId> <version>1.0</version> <scope>system</scope> <systemPath>${basedir}/libs/vop-sdk-1.0.jar</systemPath> </dependency> <dependency> <groupId>osp-sdk</groupId> <artifactId>osp-sdk</artifactId> <version>1.0</version> <scope>system</scope> <systemPath>${basedir}/libs/osp-sdk-1.0.jar</systemPath> </dependency> </dependencies> fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
@@ -204,13 +204,13 @@ } data.put("clickUrl", url); data.put("token", taoBaoLink.getTaoToken()); data.put("token",TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken())); data.put("rule", configService.get("share_single_goods_rule")); data.put("pictUrl", TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500)); String shareText = ""; // 无券 String shopType = taoBaoLink.getGoods().getUserType() == 0 ? "淘宝价" : "天猫价"; String shopType = taoBaoLink.getGoods().getUserType() == 0 ? TaoBaoConstant.SHARE_PRICE_TAOBAO : TaoBaoConstant.SHARE_PRICE_TM; if (StringUtil.isNullOrEmpty(taoBaoLink.getGoods().getCouponInfo())) { String text = shareGoodsTextTemplateService.getCommonTemplate(uid); @@ -233,7 +233,7 @@ shareText = shareText.replace("{店铺类型}", shopType) .replace("{月销量}", TaoBaoUtil.getSaleCount(taoBaoLink.getGoods().getBiz30day())) .replace("{领券短链}", shortLink).replace("{淘口令}", taoBaoLink.getTaoToken()); .replace("{领券短链}", shortLink).replace("{淘口令}", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken())); data.put("shareText", shareText); String descText = shareText.replace(taoBaoLink.getGoods().getTitle(), "").trim(); if (descText.startsWith("\\r\\n")) @@ -275,7 +275,7 @@ history.setHongbao(shareMoney); history.setCreateTime(new Date()); history.setGoodsType(UserShareGoodsHistory.TYPE_TAOBAO); history.setTkCode(taobaoLink.getTaoToken()); history.setTkCode(TaoBaoUtil.filterTaoToken(taobaoLink.getTaoToken())); history.setLink(taobaoLink.getClickUrl()); history.setQuanLink(taobaoLink.getCouponLink()); history.setGoodsId(taobaoLink.getGoods().getAuctionId()); @@ -367,14 +367,14 @@ taoBaoLink.setTaoToken(quanToken); } } data.put("token", taoBaoLink.getTaoToken()); data.put("token", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken())); data.put("rule", "http://apph5.yeshitv.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0"); data.put("pictUrl", TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500)); // 无券 String shopType = taoBaoLink.getGoods().getUserType() == 0 ? "淘宝价" : "天猫价"; String shopType = taoBaoLink.getGoods().getUserType() == 0 ? TaoBaoConstant.SHARE_PRICE_TAOBAO : TaoBaoConstant.SHARE_PRICE_TM; String shareText = ""; if (StringUtil.isNullOrEmpty(taoBaoLink.getGoods().getCouponInfo())) { @@ -399,7 +399,7 @@ shareText = shareText.replace("{店铺类型}", shopType) .replace("{月销量}", TaoBaoUtil.getSaleCount(taoBaoLink.getGoods().getBiz30day())) .replace("{领券短链}", shortLink).replace("{淘口令}", taoBaoLink.getTaoToken()); .replace("{领券短链}", shortLink).replace("{淘口令}", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken())); data.put("shareText", shareText); String descText = shareText.replace(taoBaoLink.getGoods().getTitle(), "").trim(); if (descText.startsWith("\\r\\n")) @@ -441,7 +441,7 @@ history.setHongbao(shareMoney); history.setCreateTime(new Date()); history.setGoodsType(UserShareGoodsHistory.TYPE_TAOBAO); history.setTkCode(taobaoLink.getTaoToken()); history.setTkCode(TaoBaoUtil.filterTaoToken(taobaoLink.getTaoToken())); history.setLink(taobaoLink.getClickUrl()); history.setQuanLink(taobaoLink.getCouponLink()); history.setGoodsId(taobaoLink.getGoods().getAuctionId()); @@ -1034,7 +1034,7 @@ relationId = extraInfo.getRelationId(); } TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, auctionId, relationId); data.put("token", taoBaoLink.getTaoToken()); data.put("token", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken())); } } else if (cid == 4) { // 邀请分享 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
@@ -248,13 +248,13 @@ } shareInfo.setClickUrl(url); shareInfo.setToken(taoBaoLink.getTaoToken()); shareInfo.setToken(TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken())); shareInfo.setRule(configService.get("share_single_goods_rule")); shareInfo.setPictUrl(TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500)); String shareText = ""; // 无券 String shopType = taoBaoLink.getGoods().getUserType() == 0 ? "淘宝价" : "天猫价"; String shopType = taoBaoLink.getGoods().getUserType() == 0 ? TaoBaoConstant.SHARE_PRICE_TAOBAO : TaoBaoConstant.SHARE_PRICE_TM; if (StringUtil.isNullOrEmpty(taoBaoLink.getGoods().getCouponInfo())) { String text = shareGoodsTextTemplateService.getCommonTemplate(uid); @@ -277,7 +277,7 @@ shareText = shareText.replace("{店铺类型}", shopType) .replace("{月销量}", TaoBaoUtil.getSaleCount(taoBaoLink.getGoods().getBiz30day())) .replace("{领券短链}", shortLink).replace("{淘口令}", taoBaoLink.getTaoToken()); .replace("{领券短链}", shortLink).replace("{淘口令}", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken())); shareInfo.setShareText(shareText); @@ -327,7 +327,7 @@ history.setHongbao(shareMoney); history.setCreateTime(new Date()); history.setGoodsType(UserShareGoodsHistory.TYPE_TAOBAO); history.setTkCode(taobaoLink.getTaoToken()); history.setTkCode(TaoBaoUtil.filterTaoToken(taobaoLink.getTaoToken())); history.setLink(taobaoLink.getClickUrl()); history.setQuanLink(taobaoLink.getCouponLink()); history.setGoodsId(taobaoLink.getGoods().getAuctionId()); @@ -432,12 +432,12 @@ taoBaoLink.setTaoToken(quanToken); } } shareInfo.setToken(taoBaoLink.getTaoToken()); shareInfo.setToken(TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken())); shareInfo.setRule(configService.get("share_single_goods_rule")); shareInfo.setPictUrl(TbImgUtil.getTBSizeImg(goods.getPictUrl(), 500)); // 无券 String shopType = goods.getUserType() == 0 ? "淘宝价" : "天猫价"; String shopType = goods.getUserType() == 0 ? TaoBaoConstant.SHARE_PRICE_TAOBAO :TaoBaoConstant.SHARE_PRICE_TM; String shareText = ""; if (StringUtil.isNullOrEmpty(goods.getCouponInfo())) { @@ -461,7 +461,7 @@ shareText = shareText.replace("{店铺类型}", shopType) .replace("{月销量}", TaoBaoUtil.getSaleCount(goods.getBiz30day())).replace("{领券短链}", shortLink) .replace("{淘口令}", taoBaoLink.getTaoToken()); .replace("{淘口令}", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken())); shareInfo.setShareText(shareText); String descText = shareText.replace(goods.getTitle(), "").trim(); @@ -507,7 +507,7 @@ history.setHongbao(shareMoney); history.setCreateTime(new Date()); history.setGoodsType(UserShareGoodsHistory.TYPE_TAOBAO); history.setTkCode(taobaoLink.getTaoToken()); history.setTkCode(TaoBaoUtil.filterTaoToken(taobaoLink.getTaoToken())); history.setLink(taobaoLink.getClickUrl()); history.setQuanLink(taobaoLink.getCouponLink()); history.setGoodsId(finalGoods.getAuctionId()); fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java
@@ -213,7 +213,7 @@ data.put("quanPrice", afterCouponPrice); data.put("zkPrice", goods.getZkPrice()); data.put("shareContent", "长按复制本段文字，打开【手机淘宝】即可领取【特别优惠券】购买下单，"); data.put("token", link.getTaoToken()); data.put("token", TaoBaoUtil.filterTaoToken(link.getTaoToken())); data.put("reservePrice", goods.getReservePrice()); data.put("shopType", goods.getUserType() == 1 ? 2 : 1); if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && !"无".equalsIgnoreCase(goods.getCouponInfo())) { @@ -375,7 +375,7 @@ data.put("quanPrice", afterCouponPrice); data.put("zkPrice", goods.getZkPrice()); data.put("shareContent", "长按复制本段文字，打开【手机淘宝】即可领取【特别优惠券】购买下单，"); data.put("token", link.getTaoToken()); data.put("token", TaoBaoUtil.filterTaoToken(link.getTaoToken())); data.put("reservePrice", goods.getReservePrice()); data.put("shopType", goods.getUserType() == 1 ? 2 : 1); if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && !"无".equalsIgnoreCase(goods.getCouponInfo())) { fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java
@@ -204,10 +204,10 @@ } UserShareGoodsHistory history = new UserShareGoodsHistory(); history.setTkCode(tbLink.getTaoToken()); history.setTkCode(TaoBaoUtil.filterTaoToken(tbLink.getTaoToken())); history.setLink(tbLink.getClickUrl()); history.setQuanLink(tbLink.getCouponLink()); history.setTkCode(tbLink.getTaoToken()); history.setTkCode(TaoBaoUtil.filterTaoToken(tbLink.getTaoToken())); history.setCreateTime(new Date()); history.setGoodsId(goods.getAuctionId()); @@ -366,16 +366,16 @@ UserShareGoodsHistory history = new UserShareGoodsHistory(); history.setId(userShareGoodsHistory.getId()); history.setTkCode(tbLink.getTaoToken()); history.setTkCode(TaoBaoUtil.filterTaoToken(tbLink.getTaoToken())); history.setLink(tbLink.getClickUrl()); history.setQuanLink(tbLink.getCouponLink()); history.setTkCode(tbLink.getTaoToken()); history.setTkCode(TaoBaoUtil.filterTaoToken(tbLink.getTaoToken())); userShareGoodsHistoryMapper.updateByPrimaryKeySelective(history); userShareGoodsHistory.setTkCode(tbLink.getTaoToken()); userShareGoodsHistory.setTkCode(TaoBaoUtil.filterTaoToken(tbLink.getTaoToken())); userShareGoodsHistory.setLink(tbLink.getClickUrl()); userShareGoodsHistory.setQuanLink(tbLink.getCouponLink()); userShareGoodsHistory.setTkCode(tbLink.getTaoToken()); userShareGoodsHistory.setTkCode(TaoBaoUtil.filterTaoToken(tbLink.getTaoToken())); } return userShareGoodsHistory; fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsTextTemplateServiceImpl.java
@@ -21,6 +21,7 @@ import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService; import com.yeshi.fanli.util.MoneyBigDecimalUtil; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.TaoBaoConstant; import com.yeshi.fanli.util.jd.JDUtil; import com.yeshi.fanli.util.pinduoduo.PinDuoDuoUtil; import com.yeshi.fanli.util.taobao.TaoBaoUtil; @@ -314,15 +315,15 @@ .replace("{淘礼金面额}", BigDecimalUtil.getWithNoZera(spreadMoney).toString()) .replace("{优惠券价}", BigDecimalUtil.getWithNoZera(TaoBaoUtil.getAfterUseCouplePrice(goods)).toString()) .replace("{店铺类型}", goods.getUserType() == 1 ? "天猫价" : "淘宝价"); .replace("{店铺类型}", goods.getUserType() == 1 ? TaoBaoConstant.SHARE_PRICE_TM : TaoBaoConstant.SHARE_PRICE_TAOBAO); } if (!hasCoupon) { return template.replace("{标题}", goods.getTitle()) .replace("{商品原价}", BigDecimalUtil.getWithNoZera(goods.getZkPrice()).toString()) .replace("{月销量}", TaoBaoUtil.getSaleCount(goods.getBiz30day())).replace("{领券短链}", shortLink) .replace("{淘口令}", token).replace("{店铺类型}", goods.getUserType() == 1 ? "天猫价" : "淘宝价"); .replace("{淘口令}", token).replace("{店铺类型}", goods.getUserType() == 1 ? TaoBaoConstant.SHARE_PRICE_TM : TaoBaoConstant.SHARE_PRICE_TAOBAO); } else { return template.replace("{标题}", goods.getTitle()) .replace("{商品原价}", BigDecimalUtil.getWithNoZera(goods.getZkPrice()).toString()) @@ -331,7 +332,7 @@ .replace("{优惠券面额}", BigDecimalUtil.getWithNoZera(goods.getCouponAmount()).toString()) .replace("{优惠券价}", BigDecimalUtil.getWithNoZera(TaoBaoUtil.getAfterUseCouplePrice(goods)).toString()) .replace("{店铺类型}", goods.getUserType() == 1 ? "天猫价" : "淘宝价"); .replace("{店铺类型}", goods.getUserType() == 1 ? TaoBaoConstant.SHARE_PRICE_TM : TaoBaoConstant.SHARE_PRICE_TAOBAO); } }
@@ -23,5 +23,8 @@ // 淘礼金会员 public static final String TAOBAO_TLJ_SPECIAL_PID_DEFAULT = "mm_124933865_56750082_19509300170"; public static BigDecimal OWN_BUY_WITHOUT_FANLI_RATE = new BigDecimal(70);// 自购立减的比例 public final static String SHARE_PRICE_TAOBAO="Tao宝价"; public final static String SHARE_PRICE_TM="T猫价"; } fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
@@ -1923,6 +1923,7 @@ /** * 查询天猫商品图片、标题 * * @param auctionId * @return */ @@ -1964,4 +1965,32 @@ return taoBaoGoodsBrief; } /** * 淘口令过滤 * * @param token * @return */ public static String filterTaoToken(String token) { if (StringUtil.isNullOrEmpty(token)) return token; if (token.contains("￥")||token.contains("€")) { String newToken = ""; for (int i = 0; i < token.length(); i++) { if (token.charAt(i) == '￥'||token.charAt(i) == '€') { if (!newToken.contains("(")) newToken += "("; else newToken += ")"; } else newToken += token.charAt(i) + ""; } return newToken; } return token; } } fanli/src/main/webapp/WEB-INF/lib/osp-sdk.jarBinary files differ
fanli/src/main/webapp/WEB-INF/lib/vop-sdk.jarBinary files differ
