fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
@@ -1191,7 +1191,7 @@ // 获取浏览记录 @RequestMapping(value = "getscanhistory", method = RequestMethod.POST) public void getScanHistory(AcceptData acceptData, String uid, int page, Integer goodsType, PrintWriter out) { public void getScanHistory(AcceptData acceptData, String uid, int page, PrintWriter out) { if (page < 0) { out.print(JsonUtil.loadFalseResult(1, "page不小于0")); @@ -1205,9 +1205,9 @@ return; } List<ScanHistoryV2> list = scanHistoryV2Service.getScanHistoryByDeviceOrUid( StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), page, 20, goodsType); StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), page, 20, Constant.SOURCE_TYPE_TAOBAO); long count = scanHistoryV2Service.getCountByDeviceOrUid( StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), goodsType); StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), Constant.SOURCE_TYPE_TAOBAO);
@@ -106,6 +106,11 @@ return; } // 默认淘宝 if (goodsType == null) { goodsType = Constant.SOURCE_TYPE_TAOBAO; } List<SuperHotSearch> superHotSearchList = superHotSearchSerivce .getSuperHotSearchBySystemIdCache(system.getId(), goodsType); if (superHotSearchList == null || superHotSearchList.size() == 0) { fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserGoodsStorageController.java
@@ -57,9 +57,12 @@ out.print(JsonUtil.loadFalseResult("用户未登录")); return; } if (goodsType == null) { goodsType = Constant.SOURCE_TYPE_TAOBAO; } try { goodsType = 2; UserGoodsStorage userGoodsStorage = userGoodsStorageService.getByUidAndAuctionId(uid, auctionId, goodsType); boolean storageState = false; if (userGoodsStorage != null) { @@ -103,6 +106,9 @@ return; } if (goodsType == null) { goodsType = Constant.SOURCE_TYPE_TAOBAO; } userGoodsStorageService.save(uid, set, goodsType); out.print(JsonUtil.loadTrueResult("添加成功"));
@@ -12,6 +12,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.yeshi.utils.JsonUtil; import com.google.gson.Gson; @@ -93,6 +94,41 @@ @Resource private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService; /** * 搜索候选词 * * @param acceptData * @param kw * @param out */ @RequestMapping(value = "suggestSearch", method = RequestMethod.POST) public void getSugguestSearch(AcceptData acceptData, String kw, Integer goodsType, PrintWriter out) { if (goodsType == null) { out.print(JsonUtil.loadFalseResult("平台类型不能为空")); return; } List<String> list = null; if (goodsType == Constant.SOURCE_TYPE_TAOBAO) { list = TaoBaoUtil.getSuguestSearch(kw); } else if (goodsType == Constant.SOURCE_TYPE_JD) { } else if (goodsType == Constant.SOURCE_TYPE_PDD) { } if (list == null || list.size() == 0) { out.print(JsonUtil.loadFalseResult("暂无建议内容")); return; } JSONArray array = new JSONArray(); for (String words : list) { array.add(words); } out.print(JsonUtil.loadTrueResult(array)); } /** * 搜索-新版 @@ -554,8 +590,8 @@ jdfilter.setSortName(JDSearchFilter.SORTNAME_COMMISSION_SHARE); break; default: // 默认：销量 desc //jdfilter.setSort(JDSearchFilter.SORT_DESC); //jdfilter.setSortName(JDSearchFilter.SORTNAME_ORDER_COUNT_30DAYS); // jdfilter.setSort(JDSearchFilter.SORT_DESC); // jdfilter.setSortName(JDSearchFilter.SORTNAME_ORDER_COUNT_30DAYS); break; }
@@ -72,6 +72,7 @@ import com.yeshi.fanli.util.taobao.TaoKeApiUtil; import com.yeshi.fanli.util.taobao.TaoLiJinUtil; import com.yeshi.fanli.vo.goods.GoodsDetailVO; import com.yeshi.fanli.vo.goods.ShareInfoVO; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -211,16 +212,18 @@ out.print(JsonUtil.loadFalseResult(3, "淘宝未授权，请前往\"我的\"绑定淘宝账号")); return; } // 淘礼金创建分享 if (source != null && "taolijin".equals(source)) { createTaoLijin(uid, goodsId, totalNum, relationId, request, out); return; } try { ShareInfoVO shareInfo = new ShareInfoVO(); TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, goodsId, relationId); JSONObject data = new JSONObject(); String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq", configService.getH5Host(), Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY), goodsId + ""); @@ -230,10 +233,10 @@ url = shortLink; } data.put("clickUrl", url); data.put("token", taoBaoLink.getTaoToken()); data.put("rule", configService.get("share_single_goods_rule")); data.put("pictUrl", TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500)); shareInfo.setClickUrl(url); shareInfo.setToken(taoBaoLink.getTaoToken()); shareInfo.setRule(configService.get("share_single_goods_rule")); shareInfo.setPictUrl(TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500)); String shareText = ""; // 无券 @@ -261,28 +264,34 @@ shareText = shareText.replace("{店铺类型}", shopType) .replace("{月销量}", TaoBaoUtil.getSaleCount(taoBaoLink.getGoods().getBiz30day())) .replace("{领券短链}", shortLink).replace("{淘口令}", taoBaoLink.getTaoToken()); data.put("shareText", shareText); String descText = shareText.replace(taoBaoLink.getGoods().getTitle(), "").trim(); if (descText.startsWith("\\r\\n")) descText = descText.substring(0); data.put("descText", descText); // shareInfo.setShareText(shareText); // String descText = shareText.replace(taoBaoLink.getGoods().getTitle(), "").trim(); // if (descText.startsWith("\\r\\n")) // descText = descText.substring(0); // data.put("descText", descText); // 提示图文内容 String imgs = configService.get("goods_share_notify_imgs"); JSONArray array = JSONArray.fromObject(imgs); int p = (int) (array.size() * Math.random()); if (p < array.size()) data.put("notifyPicture", array.optString(p)); data.put("notifyDesc", configService.get("goods_share_notify")); if (p < array.size()) { shareInfo.setNotifyPicture(array.optString(p)); } shareInfo.setNotifyDesc(configService.get("goods_share_notify")); // 添加分享记录 // 分享金额 BigDecimal rate = hongBaoManageService.getShareRate(); BigDecimal shareMoney = TaoBaoUtil.getShareGoodsHongBaoInfo(taoBaoLink.getGoods(), rate); data.put("shareMoney", "¥" + shareMoney.toString()); shareInfo.setShareMoney("¥" + shareMoney.toString()); // 分享id try { ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, goodsId, Constant.SOURCE_TYPE_TAOBAO); data.put("shareId", shareRecord.getRedisKey()); shareInfo.setShareId(shareRecord.getRedisKey()); } catch (Exception e) { try { LogHelper.errorDetailInfo(e); @@ -290,7 +299,8 @@ e1.printStackTrace(); } } out.print(JsonUtil.loadTrueResult(data)); out.print(JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(shareInfo))); final TaoBaoLink taobaoLink = taoBaoLink; // 异步操作 fanli/src/main/java/com/yeshi/fanli/vo/goods/ShareInfoVO.java
@@ -10,19 +10,134 @@ */ public class ShareInfoVO { // 分享id @Expose private String shareId; // 商品图片 @Expose private String pictUrl; // 二维码链接、分享链接 @Expose private String clickUrl; // 淘口令 @Expose private String token; // 分享文字 @Expose private String shareText; // 特别提醒 @Expose private String descText; private String notifyDesc; // 提示图片 @Expose private String notifyPicture; // 分享规则链接（帮助中心） @Expose private String rule; // 淘礼金红包 @Expose private String shareMoney; // 淘礼金ID @Expose private String tljId; // 淘礼金余额 @Expose private String surplusMoney; public String getShareId() { return shareId; } public void setShareId(String shareId) { this.shareId = shareId; } public String getPictUrl() { return pictUrl; } public void setPictUrl(String pictUrl) { this.pictUrl = pictUrl; } public String getClickUrl() { return clickUrl; } public void setClickUrl(String clickUrl) { this.clickUrl = clickUrl; } public String getToken() { return token; } public void setToken(String token) { this.token = token; } public String getShareText() { return shareText; } public void setShareText(String shareText) { this.shareText = shareText; } public String getNotifyDesc() { return notifyDesc; } public void setNotifyDesc(String notifyDesc) { this.notifyDesc = notifyDesc; } public String getNotifyPicture() { return notifyPicture; } public void setNotifyPicture(String notifyPicture) { this.notifyPicture = notifyPicture; } public String getRule() { return rule; } public void setRule(String rule) { this.rule = rule; } public String getShareMoney() { return shareMoney; } public void setShareMoney(String shareMoney) { this.shareMoney = shareMoney; } public String getTljId() { return tljId; } public void setTljId(String tljId) { this.tljId = tljId; } public String getSurplusMoney() { return surplusMoney; } public void setSurplusMoney(String surplusMoney) { this.surplusMoney = surplusMoney; } }
