添加重要api的错误监控

Administrator

2018-11-09 ecf03f89b06226588d9a0e6e7f6c58c42f3a85a3

添加重要api的错误监控

 fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsClassController.java

@@ -8,6 +8,7 @@
import java.util.Map;



import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -46,11 +47,13 @@
import com.yeshi.fanli.service.inter.lable.QualityFactoryService;

import com.yeshi.fanli.service.inter.lable.QualityGoodsService;

import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;

import com.yeshi.fanli.service.inter.monitor.MonitorService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

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.TaoBaoUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

import org.yeshi.utils.JsonUtil;

@@ -102,6 +105,9 @@


    @Resource

    private QualityGoodsService qualityGoodsService;



    @Resource

    private MonitorService monitorService;



    /**

     * 获取主类目

@@ -348,9 +354,11 @@
     * @param page

     * @param scid

     * @param filter

     * @param order  来源：【推荐：0  | 综合：4  、综合只看有券 1  、综合只看天猫 1  | 价格：低到高3  高到低2  |  销量：1】

     *               排序值：【销量由高到低: 1 ； 销量由低到高 5；  价格从高到低: 2 ； 价格从低到高:3  ；  推广量高到低:4    ； 其他默认： 销量由高到低】

     *            
     * @param order

     *            来源：【推荐：0 | 综合：4 、综合只看有券 1 、综合只看天猫 1 | 价格：低到高3 高到低2 | 销量：1】

     *            排序值：【销量由高到低: 1 ； 销量由低到高 5； 价格从高到低: 2 ； 价格从低到高:3 ； 推广量高到低:4 ；

     *            其他默认： 销量由高到低】

     * 
     * @param startprice

     *            起始价格

     * @param endprice

@@ -371,71 +379,69 @@
        }



        try {

			


            GoodsSubClass goodsSubClass = goodsSubClassService.getSubClassByPrimaryKeyCache(scid);

            if (goodsSubClass == null) {

                out.print(JsonUtil.loadFalseResult("不存在该分类"));

                return;

            }

			


            if (page == 0) {

                // 统计点击量

                goodsSubClassService.countClick(acceptData, goodsSubClass);

            }

			


            /* 搜索关键词 */

            String searchKey = goodsSubClass.getName();

            String key = goodsSubClass.getKey();

            if (key != null && !"".equals(key.trim())) {

                searchKey = key;

            }

			


            /* 商品系统分类id */

            Long systemCid = null;

            GoodsClass rootClass = goodsSubClass.getRootClass();

            if (rootClass != null) {

                systemCid = rootClass.getId();

            }

			
			


            // page从1开始

            page += 1;

            // 请求淘宝接口页码

            int pageNo = page; 
			
            int pageNo = page;



            int pageSize = Constant.PAGE_SIZE;

			
            /*  查询推荐模块  清空其他非必要筛选项和排序项   */



            /* 查询推荐模块 清空其他非必要筛选项和排序项 */

            if (!StringUtil.isNullOrEmpty(order) && Integer.parseInt(order) == 0) {

				


                // 分类关联标签id集合

                List<Long> listLabId = 
                        labelClassService.getRelationLabIds((page - 1) * pageSize, pageSize, goodsSubClass.getId());

				
                List<Long> listLabId = labelClassService.getRelationLabIds((page - 1) * pageSize, pageSize,

                        goodsSubClass.getId());



                /* 计算精选库数据 总页数 */

                long incount = taoKeGoodsService.countByQuality(searchKey, systemCid, listLabId);



                int totalPage = (int) (incount % pageSize == 0 ? incount / pageSize : incount / pageSize + 1);

				


                pageNo = page - totalPage;

				
				


                /* 查询精选库数据 */

                if (pageNo <= 0 ) {

					
                    List<QualityFactory> listQuality = taoKeGoodsService.queryByQuality((page - 1) * pageSize,

                            pageSize,searchKey, systemCid, listLabId);

					
                if (pageNo <= 0) {



                    List<QualityFactory> listQuality = taoKeGoodsService.queryByQuality((page - 1) * pageSize, pageSize,

                            searchKey, systemCid, listLabId);



                    List<TaoBaoGoodsBrief> searchWuLiaoList = null;

					
                    /*  精选库数据不足10条  */



                    /* 精选库数据不足10条 */

                    if (listQuality != null && listQuality.size() != 0 && listQuality.size() < 10) {

						


                        String searchParam = goodsSubClass.getSearchJson();

						


                        Gson gs = new Gson();

                        SearchFilter searchfilter = gs.fromJson(searchParam, SearchFilter.class);

						


                        int quanfilter = searchfilter.getQuan();

                        if (quanfilter != 1) {

                            searchfilter.setQuan(1);

@@ -445,53 +451,51 @@
                        if (endPricefilter == null) {

                            searchfilter.setEndPrice(new BigDecimal(220));

                        }

						


                        boolean includeGoodRate = searchfilter.isIncludeGoodRate();

                        if (!includeGoodRate) {

                            searchfilter.setIncludeGoodRate(true);

                        }

						
                        //请求第一页数据



                        // 请求第一页数据

                        searchfilter.setPage(1);

                        searchfilter.setPageSize(pageSize);

                        searchfilter.setKey(searchKey);

                        searchfilter.setMaterialId("6707");

						


                        searchWuLiaoList = taoKeGoodsService.searchWuLiaoList(searchfilter);

                    }



                    Map<String, String> map = manageService.convertMap();

					


                    JSONObject data = taoKeGoodsService.listQualityGoods(listQuality, searchWuLiaoList, map);

					


                    out.print(JsonUtil.loadTrueResult(data));

					


                    return;

                }

				
				
                if (pageNo > 0  && totalPage > 0) {

                    List<QualityFactory>  list = taoKeGoodsService.queryByQuality((totalPage - 1) * pageSize,

                            pageSize, searchKey, systemCid, listLabId);

					


                if (pageNo > 0 && totalPage > 0) {

                    List<QualityFactory> list = taoKeGoodsService.queryByQuality((totalPage - 1) * pageSize, pageSize,

                            searchKey, systemCid, listLabId);



                    if (list != null && list.size() != 0 && list.size() < 10) {

                        // 页码+ 1 已请求一次淘宝接口

                        pageNo += 1 ;

                        pageNo += 1;

                    }

                }

            }

			
	
            /* 网络请求  */



            /* 网络请求 */

            SearchFilter searchfilter = null;

            String searchParam = goodsSubClass.getSearchJson();

			
            if (!StringUtil.isNullOrEmpty(searchParam) && !StringUtil.isNullOrEmpty(order) 


            if (!StringUtil.isNullOrEmpty(searchParam) && !StringUtil.isNullOrEmpty(order)

                    && Integer.parseInt(order) == 0) {

                // 推荐 使用子分类默认查询条件

                Gson gs = new Gson();

                searchfilter = gs.fromJson(searchParam, SearchFilter.class);

				


                int quanfilter = searchfilter.getQuan();

                if (quanfilter != 1) {

                    searchfilter.setQuan(1);

@@ -501,26 +505,27 @@
                if (endPricefilter == null) {

                    searchfilter.setEndPrice(new BigDecimal(220));

                }

				


                boolean includeGoodRate = searchfilter.isIncludeGoodRate();

                if (!includeGoodRate) {

                    searchfilter.setIncludeGoodRate(true);

                }

				


            } else {

                searchfilter = new SearchFilter();

                // 设置SearchFilter

                taoKeGoodsService.setSearchFilter(searchfilter, filter, order, startprice, endprice, fastFilter, totalSales);

                taoKeGoodsService.setSearchFilter(searchfilter, filter, order, startprice, endprice, fastFilter,

                        totalSales);

            }



            searchfilter.setPage(pageNo);

            searchfilter.setPageSize(pageSize);

            searchfilter.setKey(searchKey);

			
            if (!StringUtil.isNullOrEmpty(order) && Integer.parseInt(order) != 4 ) {



            if (!StringUtil.isNullOrEmpty(order) && Integer.parseInt(order) != 4) {

                searchfilter.setMaterialId("6707");

            }

			


            // 查询物料接口

            JSONObject result = taoKeGoodsService.searchWuLiao(searchfilter);

            out.print(JsonUtil.loadTrueResult(result));

@@ -673,7 +678,7 @@
    }



    @RequestMapping("getCouponList")

    public void getCouponList(AcceptData acceptData, int page, PrintWriter out) {

    public void getCouponList(AcceptData acceptData, int page, HttpServletRequest request, PrintWriter out) {

        page = page > 0 ? page : 1;

        List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = taoBaoCouponService.getTaoBaoCouponList(page);

        Map<String, String> map = manageService.convertMap();

@@ -692,6 +697,12 @@
        data.put("taoBaoCoupons", array);

        data.put("count", count);

        out.print(JsonUtil.loadTrueResult(data));



        try {

            monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0, 0, null));

        } catch (Exception e) {

            e.printStackTrace();

        }

    }



    /**

@@ -796,12 +807,11 @@
            }

        }

    }

	
    @RequestMapping(value={"getcategory"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})



    @RequestMapping(value = { "getcategory" }, method = { org.springframework.web.bind.annotation.RequestMethod.POST })

    public void getcategory(AcceptData acceptData, PrintWriter out) {

        com.yeshi.fanli.entity.system.System system = this.systemService

                .getSystemCache(acceptData.getPlatform(),

                        acceptData.getPackages());

        com.yeshi.fanli.entity.system.System system = this.systemService.getSystemCache(acceptData.getPlatform(),

                acceptData.getPackages());

        if (system == null) {

            out.print(JsonUtil.loadFalseResult("系统不存在"));

            return;

@@ -837,7 +847,7 @@
                long gcid = goodsClass.getId();

                try {

                    List<GoodsSubClass> subClassList = this.goodsSubClassService.getSubClassCache(Long.valueOf(gcid),

                                    Integer.valueOf(1));

                            Integer.valueOf(1));

                    if ((subClassList == null) || (subClassList.size() == 0)) {

                        subClassList = new ArrayList<GoodsSubClass>();

                    }


 fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java

@@ -3,6 +3,7 @@
import java.io.PrintWriter;



import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

@@ -14,8 +15,11 @@
import com.yeshi.fanli.entity.taobao.TaoBaoLink;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.service.inter.goods.ShareGoodsService;

import com.yeshi.fanli.service.inter.monitor.MonitorService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.user.TBPidService;

import com.yeshi.fanli.util.factory.MonitorFactory;



import org.yeshi.utils.JsonUtil;



import net.sf.json.JSONObject;

@@ -33,6 +37,9 @@
    @Resource

    private TaoBaoUnionConfigService taoBaoUnionConfigService;



    @Resource

    private MonitorService monitorService;



    /**

     * 获取淘宝的分享链接

     * 

@@ -43,7 +50,8 @@
     * @param out

     */

    @RequestMapping(value = "gettaobaolink")

    public void getTaobaoShareLink(AcceptData acceptData, Long uid, Long auctionId, PrintWriter out) {

    public void getTaobaoShareLink(AcceptData acceptData, Long uid, Long auctionId, HttpServletRequest request,

            PrintWriter out) {

        if (uid == null || uid <= 0) {

            out.print(JsonUtil.loadFalseResult(1, "用户ID不能为空"));

            return;

@@ -68,7 +76,14 @@
            data.put("type", 1);

            data.put("link", link);

            out.print(JsonUtil.loadTrueResult(data));



        } catch (Exception e) {

            try {

                monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0, 0, "购买淘宝商品转链出错"));

            } catch (Exception e1) {

                e1.printStackTrace();

            }



            TBPid tbPid = null;

            if (acceptData.getPlatform().equalsIgnoreCase("android")) {

                tbPid = tbPidService.getTBPid(uid, PidUser.TYPE_FANLI_ANDROID);


 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的idfa广告标识信息

     */

    @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, "请上传id"));

            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是否正在上线

        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, "请上传id"));

            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));

    }




 fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java

@@ -7,6 +7,7 @@
import java.util.List;



import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

@@ -22,9 +23,11 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.goods.ShareGoodsService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.monitor.MonitorService;

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.factory.MonitorFactory;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;



import net.sf.json.JSONObject;

@@ -41,6 +44,9 @@


    @Resource

    private HongBaoManageService hongBaoManageService;



    @Resource

    private MonitorService monitorService;



    // 获取商品分享链接

    @RequestMapping(value = "getGoodsShareUrl")

@@ -59,7 +65,8 @@
     * @param out

     */

    @RequestMapping(value = "gettaobaosharelink")

    public void getTaobaoShareLink(AcceptData acceptData, Long uid, Long auctionId, PrintWriter out) {

    public void getTaobaoShareLink(AcceptData acceptData, Long uid, Long auctionId, HttpServletRequest request,

            PrintWriter out) {

        if (uid == null || uid <= 0) {

            out.print(JsonUtil.loadFalseResult(1, "用户ID不能为空"));

            return;

@@ -85,7 +92,8 @@


            data.put("clickUrl", url);

            data.put("token", taoBaoLink.getTaoToken());

            data.put("rule", "http://apph5.yeshitv.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0");

            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 shareText = "";

@@ -105,10 +113,10 @@
            }

            shareText = shareText.replace("[价格类型]", shopType);

            data.put("shareText", shareText);

            String descText=shareText.replace(taoBaoLink.getGoods().getTitle()+"\r\n", "");

            if(descText.startsWith("\\r\\n"))

                descText=descText.substring(0);

            data.put("descText",descText );

            String descText = shareText.replace(taoBaoLink.getGoods().getTitle() + "\r\n", "");

            if (descText.startsWith("\\r\\n"))

                descText = descText.substring(0);

            data.put("descText", descText);



            // 添加分享记录

            BigDecimal rate = new BigDecimal(hongBaoManageService.get("hongbao_goods_proportion"));

@@ -141,6 +149,10 @@
            });

            return;

        } catch (ShareGoodsException e) {

            try {

                monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, e.getCode(), 0, "分享出错"));

            } catch (Exception e1) {

            }

            out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));

        }