From ecf03f89b06226588d9a0e6e7f6c58c42f3a85a3 Mon Sep 17 00:00:00 2001 From: Administrator <Administrator@S0ZHK00LKCA6OYY> Date: 星期五, 09 十一月 2018 12:16:07 +0800 Subject: [PATCH] 添加重要api的错误监控 --- fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 331 ++++++++++++++++++++++++++++--------------------------- 1 files changed, 169 insertions(+), 162 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java index 30c3582..ac93cb1 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java @@ -9,26 +9,11 @@ import java.util.List; import java.util.Map; - - - - - import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; - - - - - import net.sf.json.JSONArray; import net.sf.json.JSONObject; - - - - - import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -36,7 +21,6 @@ import org.yeshi.utils.IPUtil; import org.yeshi.utils.JsonUtil; import org.yeshi.utils.NumberUtil; - import org.yeshi.utils.taobao.TbImgUtil; @@ -97,6 +81,7 @@ import com.yeshi.fanli.service.inter.homemodule.SuperSpecialService; import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService; import com.yeshi.fanli.service.inter.lable.QualityGoodsService; +import com.yeshi.fanli.service.inter.monitor.MonitorService; import com.yeshi.fanli.service.inter.order.OrderService; import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService; import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService; @@ -111,6 +96,7 @@ import com.yeshi.fanli.util.ThreadUtil; import com.yeshi.fanli.util.TimeUtil; import com.yeshi.fanli.util.Utils; +import com.yeshi.fanli.util.factory.MonitorFactory; import com.yeshi.fanli.util.taobao.TaoBaoCouponUtil; import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil; import com.yeshi.fanli.util.taobao.TaoBaoUtil; @@ -206,10 +192,12 @@ @Resource private SuperRecommendBannerV2Service superRecommendBannerV2Service; - + @Resource private ShamUserService shamUserService; - + + @Resource + private MonitorService monitorService; @RequestMapping(value = "getrecommendsection") public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) { @@ -767,7 +755,8 @@ // 鏂扮増鍟嗗搧鍥炬枃璇︽儏 @RequestMapping(value = "getnewgoodsdetail", method = RequestMethod.POST) - public void getNewGoodsDetail(AcceptData acceptData, String id, String uid, PrintWriter out) { + public void getNewGoodsDetail(AcceptData acceptData, String id, String uid, HttpServletRequest request, + PrintWriter out) { if ("0".equalsIgnoreCase(uid)) uid = ""; if (StringUtil.isNullOrEmpty(id)) { @@ -864,12 +853,21 @@ } catch (NumberFormatException e) { e.printStackTrace(); } catch (TaobaoGoodsDownException e) { - e.printStackTrace(); + try { + monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0, 0, "鍟嗗搧涓嬫灦")); + } catch (Exception e1) { + e1.printStackTrace(); + } } } else { try { goods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id)); } catch (TaobaoGoodsDownException e) { + try { + monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0, 0, "鍟嗗搧涓嬫灦")); + } catch (Exception e1) { + e1.printStackTrace(); + } // 鍟嗗搧涓嬫灦 ThreadUtil.run(new Runnable() { public void run() { @@ -1215,7 +1213,7 @@ for (TaoBaoGoodsBrief taoBaoGoodsBrief : recommendGoodsList) { if (taoBaoGoodsBrief == null) continue; - + re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, "")); } out.print(JsonUtil.loadTrueResult(JsonUtil.getApiCommonGson().toJson(re))); @@ -1399,7 +1397,8 @@ * -IOS鐨刬dfa骞垮憡鏍囪瘑淇℃伅 */ @RequestMapping(value = "guessLikeByDevice") - public void guessUserLikeByDevice(AcceptData acceptData, String imei, String idfa, int page, PrintWriter out) { + public void guessUserLikeByDevice(AcceptData acceptData, String imei, String idfa, int page, + HttpServletRequest request, PrintWriter out) { int pageSize = Constant.PAGE_SIZE; JSONArray array = new JSONArray(); Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create(); @@ -1412,7 +1411,6 @@ if (!StringUtil.isNullOrEmpty(imei) || !StringUtil.isNullOrEmpty(idfa)) { long startTime = java.lang.System.currentTimeMillis(); TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(page, 50, imei, idfa); - LogHelper.test("棣栭〉涓轰綘鎺ㄨ崘锛堟窐瀹濓級鍔犺浇鏃堕棿:" + (java.lang.System.currentTimeMillis() - startTime)); if (result != null && result.getTaoBaoGoodsBriefs() != null) { // 绛涢�� @@ -1424,11 +1422,24 @@ && goods.getBiz30day() > 1000) goodsList.add(goods); } + try { + monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0, + (int) (java.lang.System.currentTimeMillis() - startTime), "鎺ㄨ崘鏁伴噺:" + goodsList.size())); + } catch (Exception e) { + e.printStackTrace(); + } Collections.shuffle(goodsList); goodsList = goodsList.size() > 20 ? goodsList.subList(0, 20) : goodsList; for (TaoBaoGoodsBrief goods : goodsList) { array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion, fcRate, ""))); + } + } else { + try { + monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0, + (int) (java.lang.System.currentTimeMillis() - startTime), "鏃犳帹鑽�")); + } catch (Exception e) { + e.printStackTrace(); } } } @@ -1482,9 +1493,8 @@ RecommendBannerV2 recommendBanner = superRecommendBanner.getRecommendBanner(); // 娣樼壒浠锋殏鏃朵慨鏀� if (system.getId() == 7) { - recommendBanner.getJumpDetail().setActivity( - recommendBanner.getJumpDetail().getActivity() - .replace("com.yeshi.ec.rebate.myapplication", "com.yeshi.ec.taospecial")); + recommendBanner.getJumpDetail().setActivity(recommendBanner.getJumpDetail().getActivity() + .replace("com.yeshi.ec.rebate.myapplication", "com.yeshi.ec.taospecial")); } listBanner.add(recommendBanner); @@ -1559,10 +1569,10 @@ out.print(JsonUtil.loadTrueResult(root)); } - - + /** * 鍟嗗搧鍩烘湰璇︽儏 (1.4.0) + * * @param acceptData * @param id * @param uid @@ -1570,25 +1580,25 @@ */ @RequestMapping(value = "getgoodsinfo", method = RequestMethod.POST) public void getGoodsInfo(AcceptData acceptData, String id, String uid, PrintWriter out) { - - if ("0".equalsIgnoreCase(uid)){ + + if ("0".equalsIgnoreCase(uid)) { uid = ""; } - + if (StringUtil.isNullOrEmpty(id)) { out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼爄d")); return; } - + System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages()); if (system == null) { out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�")); return; } - + JSONObject data = new JSONObject(); data.put("invalid", false); - + // IOS鏄惁姝e湪涓婄嚎 if ("ios".equalsIgnoreCase(acceptData.getPlatform())) { String version = acceptData.getVersion(); @@ -1599,8 +1609,7 @@ // 鑾峰彇娣樺鍙傛暟 ClientTBPid clientTBPid = null; - - + if (StringUtil.isNullOrEmpty(uid)) { // 鐢ㄦ埛鏈櫥褰� if (acceptData.getPlatform().equalsIgnoreCase("android")) { @@ -1608,28 +1617,28 @@ } else { clientTBPid = tbPidService.getIOSDefault(); } - + } else { - + // 鐢ㄦ埛宸茬粡鐧诲綍 TBPid tbPid = null; if (acceptData.getPlatform().equalsIgnoreCase("android")) { - - tbPid = tbPidService.getTBPid(Long.parseLong(uid),PidUser.TYPE_FANLI_ANDROID); - + + tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_ANDROID); + if (tbPid == null) { clientTBPid = tbPidService.getAndroidDefault(); } else { String siteId = tbPid.getPid().split("_")[2]; String adzoneId = tbPid.getPid().split("_")[3]; TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId); - clientTBPid = new ClientTBPid(config.getAppKey(),tbPid.getPid(), siteId, adzoneId); + clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId); } } else { - + tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_IOS); - + if (tbPid == null) { clientTBPid = tbPidService.getIOSDefault(); } else { @@ -1641,83 +1650,82 @@ } } - LogHelper.test("鑾峰彇PID鑰楁椂锛�" + (java.lang.System.currentTimeMillis() - startTime)); + LogHelper.test("鑾峰彇PID鑰楁椂锛�" + (java.lang.System.currentTimeMillis() - startTime)); - final String clientPid = clientTBPid.getPid(); final List<TaoBaoGoodsBrief> goodsList = new ArrayList<>(); // 鏄惁鍦ㄦ湇鍔$杩涜杞摼 boolean convertInServer = configService.isConvertTaoBaoLinkInServer(); - + List<String> taskList = new ArrayList<>(); // 鑾峰彇鍟嗗搧鍩烘湰淇℃伅 taskList.add("goods"); - + taskList.stream().parallel().forEach(task -> { if (task.equalsIgnoreCase("goods")) { - JSONObject ticket = new JSONObject(); - TaoBaoGoodsBrief goods = null; - - if (!convertInServer) { - - try { - goods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id)); - } catch (TaobaoGoodsDownException e) { - // 鍟嗗搧涓嬫灦 - ThreadUtil.run(new Runnable() { - public void run() { - taoBaoGoodsUpdateService.deleteTaoBaoGoods(Long.parseLong(id)); - } - }); + JSONObject ticket = new JSONObject(); + TaoBaoGoodsBrief goods = null; - } - - } else { - String appId = clientPid.split("_")[2]; - TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(appId); - TaoKeAppInfo app = new TaoKeAppInfo(); - app.setAdzoneId(clientPid.split("_")[3]); - app.setAppKey(config.getAppKey()); - app.setAppSecret(config.getAppSecret()); - app.setPid(clientPid); - - try { - goods = TaoKeApiUtil.searchGoodsDetail(Long.parseLong(id), app); - if (goods != null) { - ticket.put("clickUrl", goods.getAuctionUrl()); - // 娴嬭瘯浣跨敤 - ticket.put("couponUrl", goods.getCouponLink()); - data.put("ticket", ticket); - } + if (!convertInServer) { - } catch (NumberFormatException e) { - e.printStackTrace(); - } catch (TaobaoGoodsDownException e) { - e.printStackTrace(); - } - - } - - if (goods != null) { - goodsList.add(goods); - final TaoBaoGoodsBrief newGoods = goods; + try { + goods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id)); + } catch (TaobaoGoodsDownException e) { + // 鍟嗗搧涓嬫灦 ThreadUtil.run(new Runnable() { public void run() { - try { - // 鏇存柊鍟嗗搧 - LogHelper.test("鏇存柊鍟嗗搧璇︽儏:" + newGoods.getAuctionId()); - taoBaoGoodsUpdateService.updateTaoBaoGoods(newGoods); - } catch (TaobaoGoodsUpdateException e) { - - } + taoBaoGoodsUpdateService.deleteTaoBaoGoods(Long.parseLong(id)); } }); + } + + } else { + String appId = clientPid.split("_")[2]; + TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(appId); + TaoKeAppInfo app = new TaoKeAppInfo(); + app.setAdzoneId(clientPid.split("_")[3]); + app.setAppKey(config.getAppKey()); + app.setAppSecret(config.getAppSecret()); + app.setPid(clientPid); + + try { + goods = TaoKeApiUtil.searchGoodsDetail(Long.parseLong(id), app); + if (goods != null) { + ticket.put("clickUrl", goods.getAuctionUrl()); + // 娴嬭瘯浣跨敤 + ticket.put("couponUrl", goods.getCouponLink()); + data.put("ticket", ticket); + } + + } catch (NumberFormatException e) { + e.printStackTrace(); + } catch (TaobaoGoodsDownException e) { + e.printStackTrace(); + } + } - }); + + if (goods != null) { + goodsList.add(goods); + final TaoBaoGoodsBrief newGoods = goods; + ThreadUtil.run(new Runnable() { + public void run() { + try { + // 鏇存柊鍟嗗搧 + LogHelper.test("鏇存柊鍟嗗搧璇︽儏:" + newGoods.getAuctionId()); + taoBaoGoodsUpdateService.updateTaoBaoGoods(newGoods); + } catch (TaobaoGoodsUpdateException e) { + + } + } + }); + } + } + }); TaoBaoGoodsBrief tb = null; - if (goodsList.size() > 0){ + if (goodsList.size() > 0) { tb = goodsList.get(0); } @@ -1725,19 +1733,18 @@ out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧涓嶅瓨鍦�")); 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(img); } - - + JSONObject goods = new JSONObject(); goods.put("auctionId", tb.getAuctionId()); goods.put("imgList", finalImgList); @@ -1746,17 +1753,16 @@ goods.put("price", tb.getReservePrice().toString()); goods.put("zkPrice", tb.getZkPrice().toString()); - // 绾㈠寘 String rateStr = hongBaoManageService.get("hongbao_goods_proportion"); String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, new BigDecimal(rateStr)); goods.put("hongBao", hongBao); // 30澶╅攢閲� goods.put("saleCount", TaoBaoUtil.getSaleCount(tb.getBiz30day())); - + // 鍒嗕韩璧� BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb); - data.put("shareMoney","楼" + shareMoney); + data.put("shareMoney", "楼" + shareMoney); // 鍒嗕韩璧氫汉鎻愮ず List<ShamUser> listShareUser = shamUserService.listRandShareUser(10, shareMoney, 1, 5); @@ -1764,57 +1770,60 @@ if (StringUtil.isNullOrEmpty(uid)) { data.put("collected", false); } else { - CollectionGoods collectionGoods = - collectionGoodsService.findByUidAndAuctionId(Long.parseLong(uid), Long.parseLong(id)); + CollectionGoods collectionGoods = collectionGoodsService.findByUidAndAuctionId(Long.parseLong(uid), + Long.parseLong(id)); data.put("collected", collectionGoods != null ? true : false); } // 娴嬭瘯 - SystemClientParams params = - systemClientParamsService.getSystemClientParamsBySystemAndKey(system, "goods_detail_jump_taobao"); + SystemClientParams params = systemClientParamsService.getSystemClientParamsBySystemAndKey(system, + "goods_detail_jump_taobao"); if ("1".equalsIgnoreCase((params.getValue() + "").trim())) { data.put("native", true); } else { data.put("native", false); } - + // 鑾峰彇PID String pid = clientTBPid.getPid(); LogHelper.test(String.format("PID: uid-%s pid-%s", uid + "", pid)); - + // 鏄惁鏈夊埜 - goods.put("coupon", StringUtil.isNullOrEmpty(tb.getCouponInfo()) ? false : true); - + goods.put("coupon", StringUtil.isNullOrEmpty(tb.getCouponInfo()) ? false : true); + // 棰嗗埜浜哄垪琛� List<ShamUser> listCouponUser = null; - + // 鑾峰彇鍒镐俊鎭� if (!StringUtil.isNullOrEmpty(tb.getCouponInfo())) { BigDecimal quanPrice = TaoBaoUtil.getAfterUseCouplePrice(tb); JSONObject couponInfo = new JSONObject(); couponInfo.put("couponPrice", quanPrice.toString()); - + // 鏈嶅姟绔浆閾� - if (convertInServer && !StringUtil.isNullOrEmpty(tb.getCouponLink())) { + if (convertInServer && !StringUtil.isNullOrEmpty(tb.getCouponLink())) { couponInfo.put("couponUrl", tb.getCouponLink()); } else { - couponInfo.put("couponUrl", TaoBaoCouponUtil.getCoupleUrl(tb.getCouponActivityId() + "", pid, tb.getAuctionId() + "")); + couponInfo.put("couponUrl", + TaoBaoCouponUtil.getCoupleUrl(tb.getCouponActivityId() + "", pid, tb.getAuctionId() + "")); } - + couponInfo.put("couponAmount", NumberUtil.subZeroAndDot(tb.getCouponAmount().toString())); - couponInfo.put("couponTime", "浣跨敤鏈熼檺锛�" + tb.getCouponEffectiveStartTime().replace("-", ".") + "-" + tb.getCouponEffectiveEndTime().replace("-", ".")); + couponInfo.put("couponTime", "浣跨敤鏈熼檺锛�" + tb.getCouponEffectiveStartTime().replace("-", ".") + "-" + + tb.getCouponEffectiveEndTime().replace("-", ".")); goods.put("couponInfo", couponInfo); - + // 棰嗗埜浜哄垪琛� listCouponUser = shamUserService.listRandCouponUser(5, 1, 300); } data.put("tbPidInfo", clientTBPid); - String jumpUrl = "https://item.taobao.com/item.htm?id=" + tb.getAuctionId(); - + String jumpUrl = "https://item.taobao.com/item.htm?id=" + tb.getAuctionId(); + if (!StringUtil.isNullOrEmpty(tb.getCouponActivityId())) {// 鏈夊埜锛岃烦杞埜閾炬帴 - jumpUrl = TaoBaoCouponUtil.getCoupleUrl(tb.getCouponActivityId(), clientTBPid.getPid(), "" + tb.getAuctionId()); + jumpUrl = TaoBaoCouponUtil.getCoupleUrl(tb.getCouponActivityId(), clientTBPid.getPid(), + "" + tb.getAuctionId()); } // 璁剧疆璺宠浆閾炬帴 @@ -1825,7 +1834,7 @@ jumpUrl = tb.getAuctionUrl(); } goods.put("jumpUrl", jumpUrl); - + TaoBaoShopInfo tbShopInfo = redisManager.getTBShopInfo(tb.getShopTitle(), tb.getSellerId(), tb.getAuctionId()); if (tbShopInfo != null) { String shopType = tbShopInfo.getShopType(); @@ -1837,10 +1846,10 @@ } // 搴楅摵 goods.put("shopInfo", tbShopInfo); - + // 鍒嗕韩璺緞 String shareUrl = String.format("%s?id=" + tb.getAuctionId(), Constant.systemCommonConfig.getAppShareInfoUrl()); - + data.put("shareUrl", shareUrl); data.put("goods", goods); data.put("shareUsers", listShareUser); @@ -1856,8 +1865,7 @@ ScanHistory sh = TaoBaoUtil.getScanHistory(goodsInfo); sh.setId(0); sh.setDevice(acceptData.getDevice()); - sh.setSystem(systemService.getSystem(acceptData.getPlatform(), - acceptData.getPackages())); + sh.setSystem(systemService.getSystem(acceptData.getPlatform(), acceptData.getPackages())); sh.setCreatetime(new Date()); if (!StringUtil.isNullOrEmpty(tempUid)) { sh.setUid(Long.parseLong(tempUid)); @@ -1871,21 +1879,21 @@ }); } - /** * 鑾峰彇鍥炬枃璇︽儏(1.4.0) + * * @param acceptData * @param id * @param out */ @RequestMapping(value = "getgoodsdetailimgs", method = RequestMethod.POST) - public void getgoodsdetailimgs(AcceptData acceptData, String id, PrintWriter out) { + public void getgoodsdetailimgs(AcceptData acceptData, String id, PrintWriter out) { if (StringUtil.isNullOrEmpty(id)) { out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼爄d")); return; } - + List<String> detailImgs = new ArrayList<>(); JSONArray detailImgsSize = new JSONArray(); @@ -1915,12 +1923,13 @@ JSONObject data = new JSONObject(); data.put("detailImgs", detailImgs); data.put("detailImgsSize", detailImgsSize); - + out.print(JsonUtil.loadTrueResult(data)); } - + /** * 鍟嗗搧璇︽儏鎺ㄨ崘1.4.0 + * * @param acceptData * @param id * @param out @@ -1935,44 +1944,44 @@ } List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.getRelationGoodsRecommend(id, 10); - + // 閲嶆柊鍋氭帹鑽� if (goodsList == null || goodsList.size() == 0) { - + goodsList = new ArrayList<>(); - + TaoBaoGoodsBrief goods = null; - + try { goods = redisManager.getTaoBaoGoodsBrief(id); } catch (TaobaoGoodsDownException e) { e.printStackTrace(); } - - if (goods == null){ + + if (goods == null) { // 浠庢垜浠殑鍟嗗搧搴撴悳绱� CollectionGoods cgoods = collectionGoodsService.findByAuctionId(id); - + // 鍟嗗搧鏈夋湰鍦扮紦瀛� if (cgoods != null) { // 鎸夊悕瀛楁悳绱㈠晢鍝� SearchFilter sf = new SearchFilter(); sf.setKey(cgoods.getTitle().substring(0, cgoods.getTitle().length() / 2)); - + TaoBaoSearchResult result = TaoBaoUtil.search(sf); - + if (result != null && result.getTaoBaoGoodsBriefs() != null - && result.getTaoBaoGoodsBriefs().size() > 0){ - + && result.getTaoBaoGoodsBriefs().size() > 0) { + for (TaoBaoGoodsBrief gds : result.getTaoBaoGoodsBriefs()) { if (goodsList.size() == 10) { break; } goodsList.add(gds); } - + } - + } } @@ -1991,16 +2000,16 @@ } catch (Exception e2) { e2.printStackTrace(); } - + } } Map<String, String> map = hongBaoManageService.convertMap(); String proportion = map.get("hongbao_goods_proportion"); String fcRate = map.get("hongbao_fc_ratio"); - + List<TaoBaoGoodsBriefExtra> listExtra = new ArrayList<TaoBaoGoodsBriefExtra>(); - + goodsList.parallelStream().forEach(goods -> { // 鑾峰彇璇︽儏 TaoBaoGoodsBrief taoBaoGoodsBrief = null; @@ -2009,19 +2018,18 @@ } catch (Exception e) { e.printStackTrace(); } - + if (taoBaoGoodsBrief != null) { listExtra.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, "")); } - + }); - List<TaoBaoGoodsBrief> listQuality = new ArrayList<TaoBaoGoodsBrief>(); - + try { List<QualityFactory> listRecommend = qualityGoodsService.recommendByAuctionId(id); - + if (listRecommend != null && listRecommend.size() > 1) { for (QualityFactory quality : listRecommend) { @@ -2051,21 +2059,20 @@ } catch (Exception e2) { e2.printStackTrace(); } - - + // 鍙栧伓鏁颁釜鏁版嵁 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("listGuess", JsonUtil.getApiCommonGson().toJson(listExtra)); data.put("listQuality", JsonUtil.getApiCommonGson().toJson(listQuality)); - + out.print(JsonUtil.loadTrueResult(data)); } -- Gitblit v1.8.0