From d1dccd08a249b830a95eeeb04af25f87d5c056be Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期二, 03 九月 2019 11:13:04 +0800 Subject: [PATCH] 金币明细bug --- fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java | 1045 +++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 631 insertions(+), 414 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java index f659571..f7a7430 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java @@ -3,10 +3,12 @@ import java.io.PrintWriter; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Date; import java.util.List; import javax.annotation.Resource; +import org.json.simple.JSONArray; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -14,19 +16,26 @@ import org.yeshi.utils.JsonUtil; import org.yeshi.utils.taobao.TbImgUtil; +import com.yeshi.fanli.dto.jd.JDCouponInfo; import com.yeshi.fanli.dto.pdd.PDDGoodsDetail; +import com.yeshi.fanli.dto.pdd.PDDGoodsResult; +import com.yeshi.fanli.dto.pdd.PDDPromotionUrl; +import com.yeshi.fanli.dto.pdd.PDDSearchFilter; import com.yeshi.fanli.entity.accept.AcceptData; import com.yeshi.fanli.entity.bus.user.ShamUser; +import com.yeshi.fanli.entity.bus.user.UserInfo; import com.yeshi.fanli.entity.bus.user.UserMoneyExtra; import com.yeshi.fanli.entity.goods.CollectionGoodsV2; import com.yeshi.fanli.entity.jd.JDGoods; import com.yeshi.fanli.entity.system.BusinessSystem; import com.yeshi.fanli.entity.system.SystemClientParams; import com.yeshi.fanli.entity.taobao.ClientTBPid; +import com.yeshi.fanli.entity.taobao.TLJBuyGoods; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; import com.yeshi.fanli.entity.taobao.TaoBaoShop; import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig; import com.yeshi.fanli.entity.taobao.TaoKeAppInfo; +import com.yeshi.fanli.exception.taobao.TaoKeApiException; import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException; import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException; import com.yeshi.fanli.log.LogHelper; @@ -37,6 +46,8 @@ import com.yeshi.fanli.service.inter.goods.ScanHistoryV2Service; import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService; import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService; +import com.yeshi.fanli.service.inter.integral.IntegralGetService; +import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService; import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService; import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService; import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService; @@ -48,26 +59,35 @@ import com.yeshi.fanli.service.inter.user.TBPidService; import com.yeshi.fanli.service.inter.user.UserGoodsStorageService; import com.yeshi.fanli.service.inter.user.UserInfoExtraService; +import com.yeshi.fanli.service.inter.user.UserInfoService; import com.yeshi.fanli.service.inter.user.UserMoneyExtraService; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.RedisManager; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.TaoBaoConstant; import com.yeshi.fanli.util.ThreadUtil; +import com.yeshi.fanli.util.TimeUtil; +import com.yeshi.fanli.util.cache.JDGoodsCacheUtil; +import com.yeshi.fanli.util.cache.PinDuoDuoCacheUtil; import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil; import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory; import com.yeshi.fanli.util.factory.goods.ShopInfoVOFactory; import com.yeshi.fanli.util.jd.JDApiUtil; +import com.yeshi.fanli.util.jd.JDUtil; import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil; +import com.yeshi.fanli.util.pinduoduo.PinDuoDuoUtil; import com.yeshi.fanli.util.taobao.TaoBaoUtil; import com.yeshi.fanli.util.taobao.TaoKeApiUtil; import com.yeshi.fanli.util.taobao.TaoLiJinUtil; +import com.yeshi.fanli.vo.goods.CouponInfoVO; import com.yeshi.fanli.vo.goods.GoodsDetailExtraVO; import com.yeshi.fanli.vo.goods.GoodsDetailVO; import com.yeshi.fanli.vo.goods.MoneyInfoVO; import com.yeshi.fanli.vo.goods.OtherInfo; -import com.yeshi.fanli.vo.goods.ShareInfoVO; +import com.yeshi.fanli.vo.goods.ShareVO; +import com.yeshi.fanli.vo.goods.ShopInfoVO; import com.yeshi.fanli.vo.msg.ClientTextStyleVO; +import com.yeshi.fanli.vo.tlj.ReduceHongBao; import com.yeshi.fanli.vo.tlj.SpreadHongBao; import net.sf.json.JSONObject; @@ -139,42 +159,21 @@ @Resource private ScanHistoryV2Service scanHistoryV2Service; - /** - * 鑾峰彇鍟嗗搧璇︽儏 - * - * @param acceptData - * @param id - * @param source - * @param uid - * @param from - * @param out - */ - @RequestMapping(value = "getDetail", method = RequestMethod.POST) - public void getDetail(AcceptData acceptData, Long id, Integer goodsType, Long uid, String from, PrintWriter out) { - if (id == null || goodsType == null) { - out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧id鍜屽晢鍝佸钩鍙颁笉鑳戒负绌�")); - return; - } + @Resource + private TLJBuyGoodsService tljBuyGoodsService; - // 娣樺疂鍟嗗搧 - if (Constant.SOURCE_TYPE_TAOBAO == goodsType) { - getTaoBaoGoodsDetial(acceptData, id, uid, from, out); - return; - } + @Resource + private UserInfoService userInfoService; - // 浜笢鍟嗗搧 - if (Constant.SOURCE_TYPE_JD == goodsType) { - getJDGoodsDetial(acceptData, id, uid, from, out); - return; - } + @Resource + private JDGoodsCacheUtil jdGoodsCacheUtil; - // 鎷煎澶氬晢鍝� - if (Constant.SOURCE_TYPE_PDD == goodsType) { - getPDDGoodsDetial(acceptData, id, uid, from, out); - return; - } - } + @Resource + private PinDuoDuoCacheUtil pinDuoDuoCacheUtil; + @Resource + private IntegralGetService integralGetService; + /** * 娣樺疂鍟嗗搧璇︽儏 * @@ -184,8 +183,13 @@ * @param from * @param out */ - public void getTaoBaoGoodsDetial(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) { - // 绯荤粺楠岃瘉 + @RequestMapping(value = "getDetailTB", method = RequestMethod.POST) + public void getDetialTB(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) { + if (id == null) { + out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧id涓嶈兘涓虹┖")); + return; + } + BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); if (system == null) { @@ -193,19 +197,35 @@ return; } - // 鑾峰彇娣樺鍙傛暟 + GoodsDetailExtraVO extraVO = new GoodsDetailExtraVO(); + extraVO.setIsNative(false); + + // IOS鏄惁姝e湪涓婄嚎 + if ("ios".equalsIgnoreCase(acceptData.getPlatform())) { + String version = acceptData.getVersion(); + extraVO.setIosOnling(configService.iosOnLining(Integer.parseInt(version))); + } + long startTime = java.lang.System.currentTimeMillis(); + + // 鑾峰彇娣樺鍙傛暟 ClientTBPid clientTBPid = null; + + // 鐢ㄦ埛鏈櫥褰� if (acceptData.getPlatform().equalsIgnoreCase("android")) { clientTBPid = tbPidService.getAndroidDefault(); } else { clientTBPid = tbPidService.getIOSDefault(); } + LogHelper.test("鑾峰彇PID鑰楁椂锛�" + (java.lang.System.currentTimeMillis() - startTime)); - TaoBaoGoodsBrief goods = null; + final List<TaoBaoGoodsBrief> goodsList = new ArrayList<>(); // 鏄惁鍦ㄦ湇鍔$杩涜杞摼 boolean convertInServer = configService.isConvertTaoBaoLinkInServer(); + + TaoBaoGoodsBrief goods = null; + if (!convertInServer) { try { goods = taoBaoGoodsCacheUtil.getCommonTaoBaoGoodsInfo(id); @@ -216,7 +236,6 @@ app.setPid(TaoBaoConstant.TAOBAO_COMMON_PID); app.setAdzoneId(TaoBaoConstant.TAOBAO_COMMON_PID.split("_")[3]); goods = TaoKeApiUtil.searchGoodsDetail(id, app); - final TaoBaoGoodsBrief finalGoods = goods; if (goods != null) { ThreadUtil.run(new Runnable() { @@ -234,10 +253,11 @@ taoBaoGoodsUpdateService.offlineTaoBaoGoods(id); } }); + } } else { - String clientPid = clientTBPid.getPid(); + final String clientPid = clientTBPid.getPid(); String appId = clientPid.split("_")[2]; TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(appId); TaoKeAppInfo app = new TaoKeAppInfo(); @@ -269,266 +289,6 @@ } - if (goods == null) { - out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧涓嶅瓨鍦�")); - return; - } - goods.setState(0); - - final TaoBaoGoodsBrief newGoods = goods; - ThreadUtil.run(new Runnable() { - public void run() { - try { - LogHelper.test("鏇存柊鍟嗗搧璇︽儏:" + newGoods.getAuctionId()); - taoBaoGoodsUpdateService.updateTaoBaoGoods(newGoods); - } catch (TaobaoGoodsUpdateException e) { - - } - } - }); - - // 鏇挎崲鐧藉簳鍥� - if (!StringUtil.isNullOrEmpty(goods.getPictUrlWhite())) { - goods.setPictUrl(goods.getPictUrlWhite()); - } - - // 鍥剧墖锛涘垪琛ㄥ鐞� - List<String> imgList = goods.getImgList(); - if (imgList == null) { - goods.setImgList(new ArrayList<>()); - } - imgList.add(0, goods.getPictUrl()); - - // 鍥剧墖澶у皬闄愬埗 - List<String> finalImgList = new ArrayList<>(); - for (String img : imgList) { - finalImgList.add(TbImgUtil.getTBSizeImg(img, 600)); - } - - // 澶ф窐瀹㈠晢鍝佽繃婊� - try { - goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods); - } catch (Exception e) { - LogHelper.errorDetailInfo(e); - } - - BigDecimal fanLiRate = hongBaoManageService.getFanLiRate(); - BigDecimal shareRate = hongBaoManageService.getShareRate(); - GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertTaoBao(newGoods, null, fanLiRate, shareRate); - - // 搴楅摵淇℃伅 - TaoBaoShop shop = taoBaoShopService.getTaoBaoShop(goods.getAuctionId(), goods.getSellerId()); - if (shop != null) { - goodsDetail.setShopInfo(ShopInfoVOFactory.convertTaoBaoShop(shop)); - } - - // 鍒镐俊鎭� - if (goodsDetail.isHasCoupon()) { -// CouponInfoVO coupon = goodsDetail.getCouponInfo(); -// String token = ""; -// if (!StringUtil.isNullOrEmpty(goods.getCouponLink())) { -// token = redisManager.getCommonTaoToken(id); -// if (StringUtil.isNullOrEmpty(token)) { -// token = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), goods.getCouponLink()); -// redisManager.saveCommonTaoToken(goods.getAuctionId(), token); -// } -// } -// coupon.setToken(token); -// goodsInfo.setCouponInfo(coupon); - - if (!StringUtil.isNullOrEmpty(from)) { - if ("miandan".equals(from)) { // 鍏嶅崟鍟嗗搧 - MoneyInfoVO moneyInfo = goodsDetail.getMoneyInfo(); - moneyInfo.setFanliMoney("楼" + goodsDetail.getCouponPrice()); - goodsDetail.setMoneyInfo(moneyInfo); - } - } - } - - JSONObject object = new JSONObject(); - object.put("code", 0); - object.put("data", JsonUtil.getApiCommonGson().toJson(goodsDetail)); - out.print(object.toString()); - } - - /** - * 浜笢鍟嗗搧璇︽儏 - * - * @param acceptData - * @param id - * @param uid - * @param from - * @param out - */ - public void getJDGoodsDetial(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) { - // 绯荤粺楠岃瘉 - BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), - acceptData.getPackages()); - if (system == null) { - out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�")); - return; - } - - JDGoods jdGoods = JDApiUtil.queryGoodsDetail(id); - if (jdGoods == null) { - jdGoods = JDApiUtil.getGoodsDetail(id); - } - - if (jdGoods == null) { - out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧涓嶅瓨鍦�")); - return; - } - - BigDecimal fanLiRate = hongBaoManageService.getFanLiRate(); - BigDecimal shareRate = hongBaoManageService.getShareRate(); - GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertJDGoods(jdGoods, null, fanLiRate, shareRate); - - JSONObject object = new JSONObject(); - object.put("code", 0); - object.put("data", JsonUtil.getApiCommonGson().toJson(goodsDetail)); - out.print(object.toString()); - } - - /** - * 浜笢鍟嗗搧璇︽儏 - * - * @param acceptData - * @param id - * @param uid - * @param from - * @param out - */ - public void getPDDGoodsDetial(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) { - // 绯荤粺楠岃瘉 - BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), - acceptData.getPackages()); - if (system == null) { - out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�")); - return; - } - - PDDGoodsDetail pddGoods = PinDuoDuoApiUtil.getGoodsDetail(id); - if (pddGoods == null) { - out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧涓嶅瓨鍦�")); - return; - } - - BigDecimal fanLiRate = hongBaoManageService.getFanLiRate(); - BigDecimal shareRate = hongBaoManageService.getShareRate(); - GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertPDDGoods(pddGoods, null, fanLiRate, shareRate); - - JSONObject object = new JSONObject(); - object.put("code", 0); - object.put("data", JsonUtil.getApiCommonGson().toJson(goodsDetail)); - out.print(object.toString()); - } - - /** - * 鑾峰彇鍟嗗搧璇︽儏 - * - * @param acceptData - * @param id - * @param source - * @param uid - * @param from - * @param out - */ - @RequestMapping(value = "getExtraDetail", method = RequestMethod.POST) - public void getExtraDetail(AcceptData acceptData, Long id, Integer goodsType, Long uid, String from, - PrintWriter out) { - if (id == null || goodsType == null) { - out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧id鍜屽晢鍝佸钩鍙颁笉鑳戒负绌�")); - return; - } - - // 娣樺疂鍟嗗搧 - if (Constant.SOURCE_TYPE_TAOBAO == goodsType) { - getTaoBaoExtraDetial(acceptData, id, uid, from, out); - return; - } - - // 浜笢鍟嗗搧 - if (Constant.SOURCE_TYPE_JD == goodsType) { - getJDExtraDetial(acceptData, id, uid, from, out); - return; - } - - // 鎷煎澶氬晢鍝� - if (Constant.SOURCE_TYPE_PDD == goodsType) { - getPDDExtraDetial(acceptData, id, uid, from, out); - return; - } - } - - /** - * 娣樺疂鍟嗗搧棰濆閰嶇疆淇℃伅 - * - * @param acceptData - * @param id - * @param uid - * @param from - * @param out - */ - public void getTaoBaoExtraDetial(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) { - BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), - acceptData.getPackages()); - if (system == null) { - out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�")); - return; - } - - GoodsDetailExtraVO extraVO = new GoodsDetailExtraVO(); - // IOS鏄惁姝e湪涓婄嚎 - if ("ios".equalsIgnoreCase(acceptData.getPlatform())) { - String version = acceptData.getVersion(); - extraVO.setIosOnling(configService.iosOnLining(Integer.parseInt(version))); - } - - long startTime = java.lang.System.currentTimeMillis(); - // 鑾峰彇娣樺鍙傛暟 - ClientTBPid clientTBPid = null; - - // 鐢ㄦ埛鏈櫥褰� - if (acceptData.getPlatform().equalsIgnoreCase("android")) { - clientTBPid = tbPidService.getAndroidDefault(); - } else { - clientTBPid = tbPidService.getIOSDefault(); - } - extraVO.setTbPidInfo(clientTBPid); - - LogHelper.test("鑾峰彇PID鑰楁椂锛�" + (java.lang.System.currentTimeMillis() - startTime)); - List<TaoBaoGoodsBrief> goodsList = new ArrayList<>(); - - TaoBaoGoodsBrief goods = null; - try { - goods = taoBaoGoodsCacheUtil.getCommonTaoBaoGoodsInfo(id); - if (goods == null) { - TaoKeAppInfo app = new TaoKeAppInfo(); - app.setAppKey(TaoBaoConstant.TAOBAO_COMMON_APPKEY); - app.setAppSecret(TaoBaoConstant.TAOBAO_COMMON_APPSECRET); - app.setPid(TaoBaoConstant.TAOBAO_COMMON_PID); - app.setAdzoneId(TaoBaoConstant.TAOBAO_COMMON_PID.split("_")[3]); - goods = TaoKeApiUtil.searchGoodsDetail(id, app); - final TaoBaoGoodsBrief finalGoods = goods; - if (goods != null) { - ThreadUtil.run(new Runnable() { - @Override - public void run() { - taoBaoGoodsCacheUtil.saveCommonTaoBaoGoodsInfo(finalGoods); - } - }); - } - } - } catch (TaobaoGoodsDownException e) { - // 鍟嗗搧涓嬫灦 - ThreadUtil.run(new Runnable() { - public void run() { - taoBaoGoodsUpdateService.offlineTaoBaoGoods(id); - } - }); - - } - if (goods != null) { goodsList.add(goods); final TaoBaoGoodsBrief newGoods = goods; @@ -555,6 +315,19 @@ return; } + if (tb.getImgList() == null) { + tb.setImgList(new ArrayList<>()); + } + + tb.getImgList().add(0, tb.getPictUrl()); + + List<String> finalImgList = new ArrayList<>(); + for (String img : tb.getImgList()) { + finalImgList.add(TbImgUtil.getTBSizeImg(img, 600)); + } + if (!StringUtil.isNullOrEmpty(tb.getPictUrlWhite())) + finalImgList.add(0, tb.getPictUrlWhite()); + // 澶ф窐瀹㈠晢鍝佽繃婊� try { goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods); @@ -562,31 +335,51 @@ LogHelper.errorDetailInfo(e); } - extraVO.setDetailUrl("http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id); + BigDecimal fanLiRate = hongBaoManageService.getFanLiRate(); + BigDecimal shareRate = hongBaoManageService.getShareRate(); + GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate, shareRate); // 搴楅摵淇℃伅 - TaoBaoShop shop = taoBaoShopService.getTaoBaoShop(goods.getAuctionId(), goods.getSellerId()); + TaoBaoShop shop = taoBaoShopService.getTaoBaoShop(id, goods.getSellerId()); if (shop != null) { String shopLink = shop.getShopLink(); if (StringUtil.isNullOrEmpty(shopLink)) { shop.setShopLink(TaoBaoUtil.getShopLink(shop.getId())); } - extraVO.setShopInfo(ShopInfoVOFactory.convertTaoBaoShop(shop)); + goodsDetail.setShopInfo(ShopInfoVOFactory.convertTaoBaoShop(shop)); } - BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb); + // 鏈夊埜澶勭悊 + if (goodsDetail.isHasCoupon()) { + if (!StringUtil.isNullOrEmpty(from)) { + if ("miandan".equals(from)) { // 鍏嶅崟鍟嗗搧 + MoneyInfoVO moneyInfo = goodsDetail.getMoneyInfo(); + moneyInfo.setFanliMoney("楼" + goodsDetail.getCouponPrice()); + goodsDetail.setMoneyInfo(moneyInfo); + } + } + } + + extraVO.setTbPidInfo(clientTBPid); + extraVO.setDetailUrl("http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id); + // 鍒嗕韩璧氫汉鎻愮ず + MoneyInfoVO moneyInfo = goodsDetail.getMoneyInfo(); List<ShamUser> listShareUser = new ArrayList<ShamUser>(); - if (tb.getBiz30day() >= 1000) { - listShareUser = shamUserService.listRandShareUser(10, shareMoney, 1, 5); + if (moneyInfo != null) { + String shareMoney = moneyInfo.getShareMoney(); + if (goods.getBiz30day() >= 1000) { + listShareUser = shamUserService.listRandShareUser(10, new BigDecimal(shareMoney.replaceAll("楼", "")), 1, + 5); + } } extraVO.setListShareUser(listShareUser); // 棰嗗埜浜哄垪琛� List<ShamUser> listCouponUser = new ArrayList<ShamUser>(); - if (!StringUtil.isNullOrEmpty(tb.getCouponInfo()) && tb.getCouponAmount() != null - && tb.getCouponAmount().compareTo(new BigDecimal(0)) > 0) { - if (tb.getBiz30day() >= 1000) { + if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && goods.getCouponAmount() != null + && goods.getCouponAmount().compareTo(new BigDecimal(0)) > 0) { + if (goods.getBiz30day() >= 1000) { listCouponUser = shamUserService.listRandCouponUser(5, 1, 300); } } @@ -605,12 +398,11 @@ SystemClientParams params = systemClientParamsService.getSystemClientParamsBySystemAndKey(system, "goods_detail_jump_taobao"); if ("1".equalsIgnoreCase((params.getValue() + "").trim())) { - extraVO.setNative(true); + extraVO.setIsNative(true); } - // 鍟嗗搧閾炬帴 - String h5Url = String.format("http://%s%s?id=%s&appType=flq", configService.getH5Host(), - Constant.systemCommonConfig.getShareGoodsPagePath(), tb.getAuctionId() + ""); + String h5Url = String.format("http://%s%s?uid=%s&id=%s&appType=flq", configService.getH5Host(), + Constant.systemCommonConfig.getShareGoodsPagePath(), "", id + ""); try { extraVO.setH5Url(HttpUtil.getShortLink(h5Url)); } catch (Exception e) { @@ -618,14 +410,14 @@ } String helpLink = null; - // 鏄惁鏈夎繑鍒� boolean fanliValid = true; + boolean shareValid = true; + int moneyType = 1; - /* 鎺ㄥ箍绾㈠寘 */ + // 鎺ㄥ箍绾㈠寘 if (from != null && from.equals("taolijin")) { - // 璁$畻鎺ㄥ箍绾㈠寘 - String warningRate = configTaoLiJinService.getValueByKey("warning_value"); + String warningRate = configTaoLiJinService.getValueByKey("warning_value", new Date()); BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods); // 鎺ㄥ箍绾㈠寘 涓嶈兘灏忎簬1 @@ -634,8 +426,8 @@ return; } - // 鏄惁涓烘柊鐢ㄦ埛 - boolean isNewUser = userInfoExtraService.isNewUser(uid); + // 鍙栨秷鏂扮敤鎴疯嚜璐� + boolean isNewUser = false;// userInfoExtraService.isNewUser(uid); if (isNewUser) { // 鍒ゅ畾涓鸿�佺敤鎴凤細 鏂颁汉鍙浣跨敤浜嗘柊浜虹孩鍖咃紝涔熷氨鏄偅1鍧楅挶锛岄偅涔堬紝浠栫湅鍒扮殑鍒嗕韩鐖嗘涓殑鍟嗗搧-灏卞彧鑳藉垎浜�� long countRecord = userTaoLiJinRecordService.countRecordByUid(uid); @@ -644,8 +436,14 @@ } } - if (!isNewUser) { + SpreadHongBao spreadHongBao = new SpreadHongBao(); + if (isNewUser) { + spreadHongBao.setMoney("1"); + } else { + moneyType = 2; fanliValid = false; + spreadHongBao.setMoney(spreadMoney.toString()); + ClientTextStyleVO textStyleVO1 = new ClientTextStyleVO(); textStyleVO1.setContent("鍒嗕韩"); textStyleVO1.setColor("#666666"); @@ -667,17 +465,25 @@ extraVO.setTip(listText); } - SpreadHongBao spreadHongBao = new SpreadHongBao(); - if (isNewUser) { - spreadHongBao.setMoney("楼1"); - } else { - spreadHongBao.setMoney("楼" + spreadMoney.toString()); - } spreadHongBao.setName("鎺ㄥ箍绾㈠寘 "); spreadHongBao.setTip("褰撴棩棰嗗彇锛屽綋鏃ュ唴浣跨敤锛岃繃鏈熷け鏁�"); OtherInfo otherInfo = new OtherInfo(); otherInfo.setSpreadHongBao(spreadHongBao); - extraVO.setOtherInfo(otherInfo); + goodsDetail.setOtherInfo(otherInfo); + + // 1.6.5鍚庢敼涓虹鍒╀环 + if (com.yeshi.fanli.util.VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) { + if (goodsDetail.getCouponPrice() != null + && goodsDetail.getCouponPrice().compareTo(new BigDecimal(0)) > 0) + goodsDetail.setCouponPrice(goodsDetail.getCouponPrice().subtract(spreadMoney)); + else + goodsDetail.setZkPrice(goodsDetail.getZkPrice().subtract(spreadMoney)); + } + + goodsDetail.getMoneyInfo().setFanliMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, + hongBaoManageService.getTLJShareRate(System.currentTimeMillis()))); + goodsDetail.getMoneyInfo().setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, + hongBaoManageService.getTLJShareRate(System.currentTimeMillis()))); // 鐢ㄦ埛娣樼ぜ閲� UserMoneyExtra userMoneyExtra = userMoneyExtraService.selectByPrimaryKey(uid); @@ -686,26 +492,67 @@ } else { extraVO.setUserTLJ(userMoneyExtra.getTlj().setScale(2).toString()); } - helpLink = configTaoLiJinService.getValueByKey("share_goods_help_link"); + helpLink = configTaoLiJinService.getValueByKey("share_goods_help_link", new Date()); + + } else if (from != null && from.equals("taolijin_buy")) { + // 鏌ヨ鍒嗕韩搴� + TLJBuyGoods buyGoods = tljBuyGoodsService.selectByAuctionIdAndDay(id, + TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd")); + if (buyGoods == null) { + out.print(JsonUtil.loadFalseResult(2, "鑷喘绔嬪噺绾㈠寘杩囨湡")); + return; + } + + moneyType = 2; + fanliValid = true; + shareValid = false; + helpLink = configService.get("zigoulijian_nofanli_help"); + + BigDecimal tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE); + + ReduceHongBao reduceHongBao = new ReduceHongBao(); + reduceHongBao.setLeft(buyGoods.getLeftHongBaoCount()); + reduceHongBao.setMoney(tljHongBao.toString()); + reduceHongBao.setName("浠樻绔嬪噺 "); + reduceHongBao.setTip("褰撴棩棰嗗彇锛屽綋鏃ュ唴浣跨敤锛岃繃鏈熷け鏁�"); + reduceHongBao.setTotal(buyGoods.getTotalHongBaoCount()); + + OtherInfo otherInfo = new OtherInfo(); + otherInfo.setReduceHongBao(reduceHongBao); + goodsDetail.setOtherInfo(otherInfo); + + // 1.6.5鍚庢敼涓虹鍒╀环 + if (com.yeshi.fanli.util.VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) { + if (goodsDetail.getCouponPrice() != null + && goodsDetail.getCouponPrice().compareTo(new BigDecimal(0)) > 0) + goodsDetail.setCouponPrice(goodsDetail.getCouponPrice().subtract(tljHongBao)); + else + goodsDetail.setZkPrice(goodsDetail.getZkPrice().subtract(tljHongBao)); + } + + } + extraVO.setFanliValid(fanliValid); + extraVO.setShareValid(shareValid); + + MoneyInfoVO goodsMoney = goodsDetail.getMoneyInfo(); + if (goodsMoney != null) { + goodsMoney.setMoneyType(moneyType); } - extraVO.setFanliValid(fanliValid); - extraVO.setShareValid(true); - + // 鍒嗕韩璺緞 if (StringUtil.isNullOrEmpty(helpLink)) { helpLink = configService.get("no_rebate_help_link"); } + // 鍒嗕韩璺緞 - String shareUrl = String.format("%s?id=" + tb.getAuctionId(), Constant.systemCommonConfig.getAppShareInfoUrl()); - ShareInfoVO shareInfoVO = new ShareInfoVO(); - shareInfoVO.setUrl(shareUrl); + ShareVO shareInfoVO = new ShareVO(); shareInfoVO.setHelpLink(helpLink); - extraVO.setShareInfo(shareInfoVO); + extraVO.setShare(shareInfoVO); JSONObject object = new JSONObject(); - object.put("code", 0); - object.put("data", JsonUtil.getApiCommonGson().toJson(extraVO)); - out.print(object.toString()); + object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO)); + object.put("goods", JsonUtil.getApiCommonGson().toJson(goodsDetail)); + out.print(JsonUtil.loadTrueResult(object.toString())); final TaoBaoGoodsBrief goodsInfo = tb; ThreadUtil.run(new Runnable() { @@ -721,7 +568,7 @@ } /** - * 浜笢鍟嗗搧棰濆閰嶇疆淇℃伅 + * 浜笢鍟嗗搧璇︽儏 * * @param acceptData * @param id @@ -729,7 +576,9 @@ * @param from * @param out */ - public void getJDExtraDetial(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) { + @RequestMapping(value = "getDetailJD", method = RequestMethod.POST) + public void getDetialJD(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) { + // 绯荤粺楠岃瘉 BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); if (system == null) { @@ -737,28 +586,53 @@ return; } + JDGoods jdGoods = JDApiUtil.queryGoodsDetail(id); // 楂樼骇鎺ュ彛 + if (jdGoods == null) { + jdGoods = JDUtil.getGoodsDetail(id); // 鐖彇缃戦〉 + // jdGoods = JDApiUtil.getGoodsDetail(id); // 鏅�氭帴鍙� + } + + if (jdGoods == null) { + out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧涓嶅瓨鍦�")); + return; + } + + List<String> imageList = jdGoods.getImageList(); + if (imageList == null) { + imageList = new ArrayList<String>(); + imageList.add(jdGoods.getPicUrl()); + } + + // 淇濆瓨缂撳瓨 + jdGoodsCacheUtil.saveGoodsInfo(jdGoods); + + BigDecimal fanLiRate = hongBaoManageService.getFanLiRate(); + BigDecimal shareRate = hongBaoManageService.getShareRate(); + GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertJDGoods(jdGoods, fanLiRate, shareRate); + + CouponInfoVO couponInfo = goodsDetail.getCouponInfo(); + if (couponInfo != null) { + // 鍒搁摼鎺ュ鐞� + String materialId = "https://item.jd.com/" + id + ".html"; + String url = JDApiUtil.convertLink(materialId, couponInfo.getLink(), JDApiUtil.POSITION_COUPON + "", null); + couponInfo.setLink(url); + } + + ShopInfoVO shopInfo = goodsDetail.getShopInfo(); + if (shopInfo != null) { + if (shopInfo.getId() == null || shopInfo.getScoreGoods() == null || shopInfo.getScoreLogistics() == null + || shopInfo.getScoreSeller() == null) { + goodsDetail.setShopInfo(null); + } + } + GoodsDetailExtraVO extraVO = new GoodsDetailExtraVO(); + extraVO.setIsNative(false); // IOS鏄惁姝e湪涓婄嚎 if ("ios".equalsIgnoreCase(acceptData.getPlatform())) { String version = acceptData.getVersion(); extraVO.setIosOnling(configService.iosOnLining(Integer.parseInt(version))); } - - - JDGoods jdGoods = JDApiUtil.queryGoodsDetail(id); - if (jdGoods == null) { - jdGoods = JDApiUtil.getGoodsDetail(id); - } - - if (jdGoods == null) { - out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧涓嶅瓨鍦�")); - return; - } - - - BigDecimal fanLiRate = hongBaoManageService.getFanLiRate(); - BigDecimal shareRate = hongBaoManageService.getShareRate(); - GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertJDGoods(jdGoods, null, fanLiRate, shareRate); Long inOrderCount30Days = jdGoods.getInOrderCount30Days(); List<ShamUser> listShareUser = new ArrayList<ShamUser>(); @@ -795,18 +669,18 @@ } // 鍥炬枃璇︽儏 - extraVO.setDetailUrl("https://in.m.jd.com/product/jieshao/video/"+ id +".html"); - + extraVO.setDetailUrl("https://in.m.jd.com/product/jieshao/video/" + id + ".html"); + // 娴嬭瘯 SystemClientParams params = systemClientParamsService.getSystemClientParamsBySystemAndKey(system, "goods_detail_jump_taobao"); if ("1".equalsIgnoreCase((params.getValue() + "").trim())) { - extraVO.setNative(true); + extraVO.setIsNative(true); } // 鍟嗗搧閾炬帴 - String h5Url = String.format("http://%s%s?id=%s&appType=flq&goodsType=%s", configService.getH5Host(), - Constant.systemCommonConfig.getShareGoodsPagePath(), jdGoods.getSkuId() + "", Constant.SOURCE_TYPE_JD); + String h5Url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(), + Constant.systemCommonConfig.getShareGoodsPagePathJD(), "", id + ""); try { extraVO.setH5Url(HttpUtil.getShortLink(h5Url)); } catch (Exception e) { @@ -820,18 +694,14 @@ helpLink = configService.get("no_rebate_help_link"); } - // 鍒嗕韩璺緞 - String shareUrl = String.format("%s?id=" + jdGoods.getSkuId(), - Constant.systemCommonConfig.getAppShareInfoUrl()); - ShareInfoVO shareInfoVO = new ShareInfoVO(); - shareInfoVO.setUrl(shareUrl); + ShareVO shareInfoVO = new ShareVO(); shareInfoVO.setHelpLink(helpLink); - extraVO.setShareInfo(shareInfoVO); + extraVO.setShare(shareInfoVO); JSONObject object = new JSONObject(); - object.put("code", 0); - object.put("data", JsonUtil.getApiCommonGson().toJson(extraVO)); - out.print(object.toString()); + object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO)); + object.put("goods", JsonUtil.getApiCommonGson().toJson(goodsDetail)); + out.print(JsonUtil.loadTrueResult(object.toString())); final JDGoods goods = jdGoods; ThreadUtil.run(new Runnable() { @@ -839,7 +709,6 @@ // 娣诲姞娴忚璁板綍 try { scanHistoryV2Service.addJDScanHistory(uid, acceptData.getDevice(), goods); - ; } catch (Exception e) { e.printStackTrace(); } @@ -848,7 +717,7 @@ } /** - * 浜笢鍟嗗搧棰濆閰嶇疆淇℃伅 + * 鎷煎澶氬晢鍝佽鎯� * * @param acceptData * @param id @@ -856,19 +725,14 @@ * @param from * @param out */ - public void getPDDExtraDetial(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) { + @RequestMapping(value = "getDetailPDD", method = RequestMethod.POST) + public void getDetialPDD(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) { + // 绯荤粺楠岃瘉 BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); if (system == null) { out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�")); return; - } - - GoodsDetailExtraVO extraVO = new GoodsDetailExtraVO(); - // IOS鏄惁姝e湪涓婄嚎 - if ("ios".equalsIgnoreCase(acceptData.getPlatform())) { - String version = acceptData.getVersion(); - extraVO.setIosOnling(configService.iosOnLining(Integer.parseInt(version))); } PDDGoodsDetail pddGoods = PinDuoDuoApiUtil.getGoodsDetail(id); @@ -879,28 +743,66 @@ BigDecimal fanLiRate = hongBaoManageService.getFanLiRate(); BigDecimal shareRate = hongBaoManageService.getShareRate(); - GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertPDDGoods(pddGoods, null, fanLiRate, shareRate); + GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertPDDGoods(pddGoods, fanLiRate, shareRate); + CouponInfoVO couponInfo = goodsDetail.getCouponInfo(); + PDDPromotionUrl convertUrl = null; + if (couponInfo != null) { + convertUrl = PinDuoDuoApiUtil.convert(id, PinDuoDuoApiUtil.PID_COUPON + "", null); + if (convertUrl != null) + couponInfo.setLink(convertUrl.getUrl()); + } - //搴楅摵淇℃伅 - extraVO.setShopInfo(ShopInfoVOFactory.convertPDDShop(pddGoods)); - - Long inOrderCount30Days = pddGoods.getSoldQuantity(); - List<ShamUser> listShareUser = new ArrayList<ShamUser>(); - MoneyInfoVO moneyInfo = goodsDetail.getMoneyInfo(); - if (moneyInfo != null) { - String shareMoney = moneyInfo.getShareMoney().replaceAll("楼", ""); - if (Integer.parseInt(inOrderCount30Days.toString()) >= 50000) { - listShareUser = shamUserService.listRandShareUser(10, new BigDecimal(shareMoney), 1, 5); + ShopInfoVO shopInfo = goodsDetail.getShopInfo(); + if (shopInfo != null) { + if (shopInfo.getId() == null || shopInfo.getScoreGoods() == null || shopInfo.getScoreLogistics() == null + || shopInfo.getScoreSeller() == null) { + goodsDetail.setShopInfo(null); } } - extraVO.setListShareUser(listShareUser); - // 棰嗗埜浜哄垪琛� - List<ShamUser> listCouponUser = new ArrayList<ShamUser>(); - if (goodsDetail.isHasCoupon() && Integer.parseInt(inOrderCount30Days.toString()) >= 50000) { - listCouponUser = shamUserService.listRandCouponUser(5, 1, 300); + GoodsDetailExtraVO extraVO = new GoodsDetailExtraVO(); + extraVO.setIsNative(false); + // IOS鏄惁姝e湪涓婄嚎 + if ("ios".equalsIgnoreCase(acceptData.getPlatform())) { + String version = acceptData.getVersion(); + extraVO.setIosOnling(configService.iosOnLining(Integer.parseInt(version))); } - extraVO.setListCouponUser(listCouponUser); + + // 鍥炬枃璇︽儏 + extraVO.setDetailUrl("http://apph5.yeshitv.com/apppage/goods_img_pdd.html?id=" + id); + + String salesTip = pddGoods.getSalesTip(); + if (!StringUtil.isNullOrEmpty(salesTip)) { + int indexOf = salesTip.indexOf("+"); + if (indexOf > 0) { + salesTip = salesTip.substring(0, indexOf); + } + + int totalSales = 0; + if (salesTip.contains("涓�")) { + salesTip = salesTip.substring(0, salesTip.indexOf("涓�")); + totalSales = (int) (Float.parseFloat(salesTip) * 10000); + } else { + totalSales = Integer.parseInt(salesTip); + } + + List<ShamUser> listShareUser = new ArrayList<ShamUser>(); + MoneyInfoVO moneyInfo = goodsDetail.getMoneyInfo(); + if (moneyInfo != null) { + String shareMoney = moneyInfo.getShareMoney().replaceAll("楼", ""); + if (totalSales >= 50000) { + listShareUser = shamUserService.listRandShareUser(10, new BigDecimal(shareMoney), 1, 5); + } + } + extraVO.setListShareUser(listShareUser); + + // 棰嗗埜浜哄垪琛� + List<ShamUser> listCouponUser = new ArrayList<ShamUser>(); + if (goodsDetail.isHasCoupon() && totalSales >= 50000) { + listCouponUser = shamUserService.listRandCouponUser(5, 1, 300); + } + extraVO.setListCouponUser(listCouponUser); + } if (uid != null) { // 鏄惁鍔犲叆鏀惰棌 @@ -911,16 +813,11 @@ extraVO.setStorage(userGoodsStorageService.isExistStorage(uid, id, Constant.SOURCE_TYPE_PDD)); } - // 娴嬭瘯 - SystemClientParams params = systemClientParamsService.getSystemClientParamsBySystemAndKey(system, - "goods_detail_jump_taobao"); - if ("1".equalsIgnoreCase((params.getValue() + "").trim())) { - extraVO.setNative(true); - } + extraVO.setIsNative(true); - // 鍟嗗搧閾炬帴 - String h5Url = String.format("http://%s%s?id=%s&appType=flq&goodsType=%s", configService.getH5Host(), - Constant.systemCommonConfig.getShareGoodsPagePath(), id + "", Constant.SOURCE_TYPE_PDD); + // 鍒嗕韩璺緞 + String h5Url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(), + Constant.systemCommonConfig.getShareGoodsPagePathPDD(), "", id + ""); try { extraVO.setH5Url(HttpUtil.getShortLink(h5Url)); } catch (Exception e) { @@ -934,28 +831,348 @@ if (StringUtil.isNullOrEmpty(helpLink)) { helpLink = configService.get("no_rebate_help_link"); } - // 鍒嗕韩璺緞 - String shareUrl = String.format("%s?id=" + id, Constant.systemCommonConfig.getAppShareInfoUrl()); - ShareInfoVO shareInfoVO = new ShareInfoVO(); - shareInfoVO.setUrl(shareUrl); + + ShareVO shareInfoVO = new ShareVO(); shareInfoVO.setHelpLink(helpLink); - extraVO.setShareInfo(shareInfoVO); + extraVO.setShare(shareInfoVO); + + if (convertUrl != null) { + extraVO.setCouponJumpLink(convertUrl.getUrl()); + extraVO.setNativeCouponJumpLink(PinDuoDuoUtil.getAndroidNativeURI(convertUrl.getUrl())); + } JSONObject object = new JSONObject(); - object.put("code", 0); - object.put("data", JsonUtil.getApiCommonGson().toJson(extraVO)); - out.print(object.toString()); + object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO)); + object.put("goods", JsonUtil.getApiCommonGson().toJson(goodsDetail)); + out.print(JsonUtil.loadTrueResult(object.toString())); ThreadUtil.run(new Runnable() { public void run() { // 娣诲姞娴忚璁板綍 try { scanHistoryV2Service.addPDDScanHistory(uid, acceptData.getDevice(), pddGoods); - ; } catch (Exception e) { e.printStackTrace(); } } }); } + + /** + * 鍟嗗搧璇︽儏鎺ㄨ崘锛堢寽浣犲枩娆� + 鎺ㄨ崘锛� + * + * @param acceptData + * @param id + * @param out + */ + @RequestMapping(value = "getRecommendGoods", method = RequestMethod.POST) + public void getRecommendGoods(AcceptData acceptData, long id, Integer goodsType, PrintWriter out) { + if (goodsType == null) { + goodsType = Constant.SOURCE_TYPE_TAOBAO; + } + + try { + + // 浜笢 + if (goodsType == Constant.SOURCE_TYPE_JD) { + JSONObject data = new JSONObject(); + data.put("listGuess", JsonUtil.getApiCommonGson().toJson(new ArrayList<GoodsDetailVO>())); + + List<JDGoods> list = JDUtil.getRecommendGoodsById(id); + if (list == null) { + list = new ArrayList<JDGoods>(); + } else if (list.size() > 10) { + list = list.subList(0, 10); + } + + BigDecimal fanLiRate = hongBaoManageService.getFanLiRate(); + BigDecimal shareRate = hongBaoManageService.getShareRate(); + List<GoodsDetailVO> listDetailVO = new ArrayList<GoodsDetailVO>(); + + for (JDGoods goods : list) { + listDetailVO.add(GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate)); + } + + // 鍙栧伓鏁颁釜鏁版嵁 + if (listDetailVO.size() % 2 != 0) { + listDetailVO.remove(listDetailVO.size() - 1); + } + + data.put("listQuality", JsonUtil.getApiCommonGson().toJson(listDetailVO)); + out.print(JsonUtil.loadTrueResult(data)); + return; + } + + // 鎷煎澶� + if (goodsType == Constant.SOURCE_TYPE_PDD) { + JSONObject data = new JSONObject(); + data.put("listGuess", JsonUtil.getApiCommonGson().toJson(new ArrayList<GoodsDetailVO>())); + + List<GoodsDetailVO> listDetailVO = new ArrayList<GoodsDetailVO>(); + + List<Long> goodsIdList = PinDuoDuoUtil.getRecommendGoodsId(id); + if (goodsIdList != null && goodsIdList.size() > 0) { + PDDSearchFilter pddfilter = new PDDSearchFilter(); + pddfilter.setPage(1); + pddfilter.setPageSize(Constant.PAGE_SIZE); + Long[] strings = new Long[goodsIdList.size()]; + pddfilter.setGoodsIdList(goodsIdList.toArray(strings)); + + PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter); + if (result != null) { + List<PDDGoodsDetail> goodsList = result.getGoodsList(); + if (goodsList != null && goodsList.size() > 0) { + + if (goodsList.size() > 10) { + goodsList = goodsList.subList(0, 10); + } + + BigDecimal fanLiRate = hongBaoManageService.getFanLiRate(); + BigDecimal shareRate = hongBaoManageService.getShareRate(); + for (PDDGoodsDetail goods : goodsList) { + listDetailVO.add(GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate, shareRate)); + } + } + } + } + + // 鍙栧伓鏁颁釜鏁版嵁 + if (listDetailVO.size() % 2 != 0) { + listDetailVO.remove(listDetailVO.size() - 1); + } + + data.put("listQuality", JsonUtil.getApiCommonGson().toJson(listDetailVO)); + out.print(JsonUtil.loadTrueResult(data)); + return; + } + + List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.getRelationGoodsRecommend(id, 10); + // 鍒濆鍖� + if (goodsList == null) { + goodsList = new ArrayList<TaoBaoGoodsBrief>(); + } + + List<GoodsDetailVO> listExtra = new ArrayList<GoodsDetailVO>(); + TaoKeAppInfo app = new TaoKeAppInfo(); + app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY); + app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET); + app.setAdzoneId(TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT.split("_")[3]); + app.setPid(TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT); + + List<Long> ids = new ArrayList<>(); + for (TaoBaoGoodsBrief goods : goodsList) + ids.add(goods.getAuctionId()); + + try { + goodsList = TaoKeApiUtil.getBatchGoodsInfo(ids); + } catch (TaoKeApiException e1) { + } catch (TaobaoGoodsDownException e1) { + } + + if (goodsList != null && goodsList.size() > 0) { + + BigDecimal fanLiRate = hongBaoManageService.getFanLiRate(); + BigDecimal shareRate = hongBaoManageService.getShareRate(); + + goodsList.parallelStream().forEach(goods -> { + if (goods != null) { + // 鑾峰彇璇︽儏 + TaoBaoGoodsBrief taoBaoGoodsBrief = null; + try { + taoBaoGoodsBrief = taoBaoGoodsCacheUtil.getCommonTaoBaoGoodsInfo(goods.getAuctionId()); + } catch (Exception e) { + e.printStackTrace(); + } + + if (taoBaoGoodsBrief == null) { + TaoBaoGoodsBrief newGoods = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app); + goods.setCouponInfo(newGoods.getCouponInfo()); + goods.setCouponLink(newGoods.getCouponLink()); + goods.setTkRate(newGoods.getTkRate()); + taoBaoGoodsBrief = goods; + } + + if (taoBaoGoodsBrief != null) { + listExtra.add( + GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate, shareRate)); + } + } + }); + } + + List<GoodsDetailVO> listQuality = new ArrayList<GoodsDetailVO>(); + // 鍙栧伓鏁颁釜鏁版嵁 + if (listExtra.size() % 2 != 0) { + listExtra.remove(listExtra.size() - 1); + } + + if (listQuality.size() % 2 != 0) { + listQuality.remove(listQuality.size() - 1); + } + + JSONObject data = new JSONObject(); + data.put("listQuality", JsonUtil.getApiCommonGson().toJson(listExtra)); + data.put("listGuess", JsonUtil.getApiCommonGson().toJson(listQuality)); + out.print(JsonUtil.loadTrueResult(data)); + } catch (Exception e) { + LogHelper.errorDetailInfo(e); + JSONObject data = new JSONObject(); + data.put("listQuality", new JSONArray()); + data.put("listGuess", new JSONArray()); + out.print(JsonUtil.loadTrueResult(data)); + } + } + + /** + * 浜笢璐拱閾炬帴 + * + * @param acceptData + * @param uid + * @param id + * @param source + * @param request + * @param out + */ + @RequestMapping(value = "getJDLink") + public void getJDLink(AcceptData acceptData, Long uid, Long id, String source, PrintWriter out) { + if (uid == null || uid <= 0) { + out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛ID涓嶈兘涓虹┖")); + return; + } + + if (id == null || id <= 0) { + out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧ID涓嶈兘涓虹┖")); + return; + } + + UserInfo user = userInfoService.getUserByIdWithMybatis(uid); + if (user != null && user.getState() != UserInfo.STATE_NORMAL) { + out.print(JsonUtil.loadFalseResult(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC)); + return; + } + + JDGoods goods = jdGoodsCacheUtil.getGoodsInfo(id); + if (goods == null) { + out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧宸蹭笅鏋�")); + return; + } + + String couponUrl = null; + String materialId = "https://item.jd.com/" + id + ".html"; + JDCouponInfo couponInfo = goods.getCouponInfo(); + if (couponInfo != null) { + couponUrl = couponInfo.getLink(); + } + String jumpLink = JDApiUtil.convertLink(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "", uid + ""); + + JSONObject data = new JSONObject(); + data.put("native", true); + data.put("jumpLink", jumpLink); + out.print(JsonUtil.loadTrueResult(data)); + + // 鑾峰緱閲戝竵 + integralGetService.addCouponRebate(uid); + } + + /** + * 鎷煎澶氳喘涔伴摼鎺� + * + * @param acceptData + * @param uid + * @param id + * @param source + * @param request + * @param out + */ + @RequestMapping(value = "getPDDLink") + public void getPDDLink(AcceptData acceptData, Long uid, Long id, String source, PrintWriter out) { + if (uid == null || uid <= 0) { + out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛ID涓嶈兘涓虹┖")); + return; + } + + if (id == null || id <= 0) { + out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧ID涓嶈兘涓虹┖")); + return; + } + + UserInfo user = userInfoService.getUserByIdWithMybatis(uid); + if (user != null && user.getState() != UserInfo.STATE_NORMAL) { + out.print(JsonUtil.loadFalseResult(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC)); + return; + } + + PDDGoodsDetail goods = pinDuoDuoCacheUtil.getGoodsInfo(id); + if (goods == null) { + out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧宸蹭笅鏋�")); + return; + } + + PDDPromotionUrl convertUrl = PinDuoDuoApiUtil.convert(id, PinDuoDuoApiUtil.PID_FANLI + "", uid + ""); + JSONObject data = new JSONObject(); + data.put("native", true); + data.put("jumpLink", convertUrl.getUrl()); + data.put("nativeJumpLink", PinDuoDuoUtil.getAndroidNativeURI(convertUrl.getUrl())); + out.print(JsonUtil.loadTrueResult(data)); + + // 鑾峰緱閲戝竵 + integralGetService.addCouponRebate(uid); + } + + /** + * 鏄惁鍦ㄥ弬涓庢帹骞� + * + * @param goodsId + * -鍟嗗搧ID + * @param goodsType + * -TB/JD + * @param out + */ + @RequestMapping(value = "isGoodsExtend") + public void isGoodsExtend(AcceptData acceptData, String goodsId, Integer goodsType, PrintWriter out) { + if (StringUtil.isNullOrEmpty(goodsId)) { + out.print(JsonUtil.loadFalseResult(1, "鏈弬涓庢帹骞�")); + return; + } + if (goodsType == null) { + out.print(JsonUtil.loadFalseResult(2, "缂哄皯goodsType")); + return; + } + JSONObject data = new JSONObject(); + if (goodsType == Constant.SOURCE_TYPE_TAOBAO) { + TaoBaoGoodsBrief goods = null; + try { + goods = TaoKeApiUtil.getSimpleGoodsInfo(Long.parseLong(goodsId)); + } catch (NumberFormatException e) { + e.printStackTrace(); + } catch (TaobaoGoodsDownException e) { + e.printStackTrace(); + } + + if (goods == null) { + data.put("extend", false); + data.put("url", "https://h5.m.taobao.com/awp/core/detail.htm?id=" + goodsId); + } else { + data.put("extend", true); + } + + } else if (goodsType == Constant.SOURCE_TYPE_JD) { + JDGoods goods = JDApiUtil.getGoodsDetail(Long.parseLong(goodsId)); + if (goods == null) { + data.put("extend", false); + data.put("url", String.format("https://item.m.jd.com/product/%s.html", goodsId)); + } else { + data.put("extend", true); + } + } else if (goodsType == Constant.SOURCE_TYPE_PDD) { + PDDGoodsDetail goods = PinDuoDuoApiUtil.getGoodsDetail(Long.parseLong(goodsId)); + if (goods == null) { + data.put("extend", false); + data.put("url", String.format("https://mobile.yangkeduo.com/goods.html?goods_id=%s", goodsId)); + } else { + data.put("extend", true); + } + } + out.print(JsonUtil.loadTrueResult(data)); + } } -- Gitblit v1.8.0