fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -5,7 +5,6 @@ import java.net.URLEncoder; import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -25,8 +24,6 @@ import org.yeshi.utils.wx.WXUtil; import com.google.gson.GsonBuilder; import com.taobao.api.ApiException; import com.yeshi.fanli.entity.bus.recommend.RecommendDetails; import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory; import com.yeshi.fanli.entity.bus.user.InviteUser; import com.yeshi.fanli.entity.bus.user.UserInfo; @@ -35,7 +32,6 @@ import com.yeshi.fanli.entity.system.CustomerName; import com.yeshi.fanli.entity.system.SystemClientParams; import com.yeshi.fanli.entity.taobao.PidUser; import com.yeshi.fanli.entity.taobao.RelateGoods; import com.yeshi.fanli.entity.taobao.TaoBaoCoupon; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra; @@ -49,7 +45,6 @@ import com.yeshi.fanli.service.inter.config.SystemClientParamsService; import com.yeshi.fanli.service.inter.config.SystemConfigService; import com.yeshi.fanli.service.inter.goods.GoodsSecondClassService; import com.yeshi.fanli.service.inter.goods.RecommendDetailsService; import com.yeshi.fanli.service.inter.goods.ShareGoodsService; import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService; import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService; @@ -96,10 +91,7 @@ @Resource private TaoBaoCouponService taoBaoCouponService; @Resource private RecommendDetailsService recommendDetailsService; @Resource private ThreeSaleSerivce threeSaleSerivce; @@ -438,32 +430,6 @@ } } @RequestMapping("details") public String getRecommendDetails(long drid, Model model) { RecommendDetails recommendDetails = recommendDetailsService.getRecommendDetails(drid, 0); if (recommendDetails == null) { return ""; } model.addAttribute("recommendDetails", recommendDetails); try { List<RelateGoods> list = TaoKeApiUtil .getRelateGoodsList(Long.parseLong(recommendDetails.getDynamicRecommend().getAuctionId())); String upicUrls = recommendDetails.getDynamicRecommend().getuPicUrl(); String[] imgs = upicUrls.split(","); List<String> tbImg = Arrays.asList(imgs); // List<String> tbImg = // TaoBaoUtil.getTbImg(recommendDetails.getDynamicRecommend().getAuctionId()); model.addAttribute("tbImgs", tbImg); model.addAttribute("relateGoodsList", list); } catch (NumberFormatException e) { e.printStackTrace(); } catch (ApiException e) { e.printStackTrace(); } return "tuijian"; } @RequestMapping("shareGoods") public void shareGoods(String auctionId, PrintWriter out) { fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java
@@ -2,7 +2,6 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -15,27 +14,17 @@ import org.yeshi.utils.JsonUtil; import org.yeshi.utils.taobao.TbImgUtil; import com.taobao.api.ApiException; import com.yeshi.fanli.entity.accept.AcceptData; import com.yeshi.fanli.entity.bus.recommend.DynamicRecommend; import com.yeshi.fanli.entity.bus.recommend.RecommendDetails; import com.yeshi.fanli.entity.bus.recommend.RecommendReply; import com.yeshi.fanli.entity.taobao.RelateGoods; import com.yeshi.fanli.entity.taobao.SearchFilter; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult; import com.yeshi.fanli.service.inter.config.ConfigService; import com.yeshi.fanli.service.inter.goods.RecommendDetailsService; import com.yeshi.fanli.service.inter.goods.RecommendReplyService; import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService; import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService; import com.yeshi.fanli.service.inter.user.DynamicRecommendService; import com.yeshi.fanli.service.inter.user.UserInfoService; import com.yeshi.fanli.util.GsonUtil; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.Utils; import com.yeshi.fanli.util.taobao.TaoBaoUtil; import com.yeshi.fanli.util.taobao.TaoKeApiUtil; import net.sf.json.JSONObject; @@ -45,15 +34,6 @@ @Resource private HongBaoManageService hongBaoManageService; @Resource private DynamicRecommendService dynamicRecommendService; @Resource private RecommendDetailsService recommendDetailsService; @Resource private RecommendReplyService recommendReplyService; @Resource private UserInfoService userInfoService; fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -1628,21 +1628,11 @@ // 获取淘客参数 ClientTBPid clientTBPid = null; if (StringUtil.isNullOrEmpty(uid)) { // 用户未登录 if (acceptData.getPlatform().equalsIgnoreCase("android")) { clientTBPid = tbPidService.getAndroidDefault(); } else { clientTBPid = tbPidService.getIOSDefault(); } // 用户未登录 if (acceptData.getPlatform().equalsIgnoreCase("android")) { clientTBPid = tbPidService.getAndroidDefault(); } else { // 用户已经登录 if (acceptData.getPlatform().equalsIgnoreCase("android")) { clientTBPid = tbPidService.getAndroidDefault(); } else { clientTBPid = tbPidService.getIOSDefault(); } clientTBPid = tbPidService.getIOSDefault(); } LogHelper.test("获取PID耗时：" + (java.lang.System.currentTimeMillis() - startTime)); @@ -2098,8 +2088,8 @@ } JSONObject data = new JSONObject(); data.put("listGuess", JsonUtil.getApiCommonGson().toJson(listExtra)); data.put("listQuality", JsonUtil.getApiCommonGson().toJson(listQuality)); data.put("listQuality", JsonUtil.getApiCommonGson().toJson(listExtra)); data.put("listGuess", JsonUtil.getApiCommonGson().toJson(listQuality)); out.print(JsonUtil.loadTrueResult(data)); } fanli/src/main/java/com/yeshi/fanli/dao/goods/DynamicRecommendDao.java
File was deleted fanli/src/main/java/com/yeshi/fanli/dao/goods/RecommendDetailsDao.java
File was deleted fanli/src/main/java/com/yeshi/fanli/dao/goods/RecommendLikeDao.java
File was deleted fanli/src/main/java/com/yeshi/fanli/dao/goods/RecommendReplyDao.java
File was deleted fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/DynamicRecommend.java
File was deleted fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/RecommendDetails.java
File was deleted fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/RecommendLike.java
File was deleted fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/RecommendReply.java
File was deleted fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendDetailsServiceImpl.java
File was deleted fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendLikeServiceImpl.java
File was deleted fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendReplyServiceImpl.java
File was deleted fanli/src/main/java/com/yeshi/fanli/service/impl/user/DynamicRecommendServiceImpl.java
File was deleted fanli/src/main/java/com/yeshi/fanli/service/inter/goods/RecommendDetailsService.java
File was deleted fanli/src/main/java/com/yeshi/fanli/service/inter/goods/RecommendLikeService.java
File was deleted fanli/src/main/java/com/yeshi/fanli/service/inter/goods/RecommendReplyService.java
File was deleted fanli/src/main/java/com/yeshi/fanli/service/inter/user/DynamicRecommendService.java
File was deleted fanli/src/main/java/com/yeshi/fanli/util/RedisManager.java
@@ -463,8 +463,8 @@ String key = "taobao-common-token-" + auctionId; if (Constant.IS_OUTNET) { if (!StringUtil.isNullOrEmpty(token)) { // 口令缓存24小时 cacheCommonString(key, token, 60 * 60 * 24); // 口令缓存10天 cacheCommonString(key, token, 60 * 60 * 24 * 10); } } }
