parent: 3df7c3ce | 补丁 | 提交 | ignore whitespace
admin
2019-03-22 30a832ddbab4fa85ac3a831f5d1c9e45d8d82bb2 
Bug修改
5个文件已修改
89 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java


@@ -33,7 +33,6 @@


import com.yeshi.fanli.entity.bus.homemodule.Special;



import com.yeshi.fanli.entity.bus.homemodule.SuperSpecial;



import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;



import com.yeshi.fanli.entity.bus.lable.QualityFactory;



import com.yeshi.fanli.entity.bus.recommend.Honest;



import com.yeshi.fanli.entity.bus.recommend.RecommendBanner;



import com.yeshi.fanli.entity.bus.recommend.RecommendBannerV2;



@@ -1666,6 +1665,21 @@






                    try {



                        goods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id));



                        if (goods.getTkRate() == null || new BigDecimal(0).compareTo(goods.getTkRate()) == 0) {



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



                            TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app);



                            if (linkInfo != null) {



                                goods.setAuctionUrl(linkInfo.getAuctionUrl());



                                goods.setCouponLink(linkInfo.getCouponLink());



                                goods.setTkRate(linkInfo.getTkRate());



                            }



                        }



                    } catch (TaobaoGoodsDownException e) {



                        // 商品下架



                        ThreadUtil.run(new Runnable() {



@@ -1694,6 +1708,15 @@


                            data.put("ticket", ticket);



                        }







                        if (goods.getTkRate() == null || new BigDecimal(0).compareTo(goods.getTkRate()) == 0) {



                            TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app);



                            if (linkInfo != null) {



                                goods.setAuctionUrl(linkInfo.getAuctionUrl());



                                goods.setCouponLink(linkInfo.getCouponLink());



                                goods.setTkRate(linkInfo.getTkRate());



                            }



                        }







                    } catch (NumberFormatException e) {



                        e.printStackTrace();



                    } catch (TaobaoGoodsDownException e) {





 fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java


@@ -99,7 +99,8 @@


    @RequestMapping(value = "getRecommenBanner", method = RequestMethod.GET)



    public void getRecommendBanner(AcceptData acceptData, String callback, PrintWriter out) {







        BusinessSystem system = businessSystemService.getBusinessSystem("WEB", Constant.systemCommonConfig.getH5PackageName());



        BusinessSystem system = businessSystemService.getBusinessSystem("WEB",



                Constant.systemCommonConfig.getH5PackageName());



        JSONObject json = new JSONObject();



        if (system == null) {



            out.print(JsonUtil.loadFalseResult(1, H5ControllerUtil.NOSYSTEM));



@@ -139,7 +140,6 @@


        out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(json)));



        return;



    }











    /**



     * 



@@ -194,7 +194,7 @@


                List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService



                        .getConfigByTypeCache(PidUser.TYPE_SHARE_GOODS);



                String pid = null;



                ClientTBPid  tbPid = tbPidService.getSharePid();



                ClientTBPid tbPid = tbPidService.getSharePid();



                if (tbPid != null)



                    pid = tbPid.getPid();



                else {



@@ -226,7 +226,7 @@


        } else {



            List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService



                    .getConfigByTypeCache(PidUser.TYPE_SHARE_GOODS);



            String pid =tbPidService.getSharePid().getPid();



            String pid = tbPidService.getSharePid().getPid();



            TaoKeAppInfo app = new TaoKeAppInfo();



            app.setAdzoneId(pid.split("_")[3]);



            app.setAppKey(configList.get(0).getAppKey());



@@ -244,6 +244,13 @@


                if (!StringUtil.isNullOrEmpty(goods.getCouponLink())) {



                    url = goods.getCouponLink();



                }



                if (!url.contains("uland.taobao.com") && !url.contains("s.click.taobao.com")) {



                    TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCoupon(Long.parseLong(id), app);



                    url = linkInfo.getCouponLink();



                    if (StringUtil.isNullOrEmpty(url))



                        url = linkInfo.getAuctionUrl();



                }







                token = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), url);



            }



        }





 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java


@@ -134,12 +134,12 @@






        // 没有获取到转过链的商品详情



        if (StringUtil.isNullOrEmpty(goods.getCouponLink()) && !goods.getAuctionUrl().contains("s.click.taobao.com")) {



            TaoBaoLink taoBaoLink = TaoBaoUtil.getTbLinkForShare(auctionId, tbPid.getPid(), taoBaoUnionConfig);



            TaoBaoGoodsBrief taoBaoLink = TaoKeApiUtil.specialConvertCoupon(auctionId, info);  //TaoBaoUtil.getTbLinkForShare(auctionId, tbPid.getPid(), taoBaoUnionConfig);



            if (taoBaoLink == null) {



                throw new ShareGoodsException(201, "转链失败");



            }



            goods.setCouponLink(taoBaoLink.getCouponLink());



            goods.setAuctionUrl(taoBaoLink.getClickUrl());



            goods.setAuctionUrl(taoBaoLink.getAuctionUrl());



        }



        return addShareGoodsHistory(uid, goods);



    }



@@ -399,12 +399,12 @@


        if (StringUtil.isNullOrEmpty(goods.getCouponLink()) && !goods.getAuctionUrl().contains("s.click.taobao.com")) {



            TaoBaoUnionConfig taoBaoUnionConfig = taoBaoUnionConfigService



                    .getConfigByAppIdCache(info.getPid().split("_")[2]);



            TaoBaoLink taoBaoLink = TaoBaoUtil.getTbLinkForShare(auctionId, info.getPid(), taoBaoUnionConfig);



            TaoBaoGoodsBrief taoBaoLink = TaoKeApiUtil.specialConvertCoupon(auctionId, info); 


            if (taoBaoLink == null) {



                throw new ShareGoodsException(201, "商品转链失败");



            }



            goods.setCouponLink(taoBaoLink.getCouponLink());



            goods.setAuctionUrl(taoBaoLink.getClickUrl());



            goods.setAuctionUrl(taoBaoLink.getAuctionUrl() );



        }







        if (!StringUtil.isNullOrEmpty(relationId)) {



@@ -498,12 +498,12 @@


        }







        if (StringUtil.isNullOrEmpty(goods.getCouponLink()) && !goods.getAuctionUrl().contains("s.click.taobao.com")) {



            TaoBaoLink taoBaoLink = TaoBaoUtil.getTbLinkForShare(auctionId, pid, taoBaoUnionConfig);



            TaoBaoGoodsBrief taoBaoLink = TaoKeApiUtil.specialConvertCoupon(auctionId, info); 


            if (taoBaoLink == null) {



                throw new ShareGoodsException(201, "商品转链失败");



            }



            goods.setCouponLink(taoBaoLink.getCouponLink());



            goods.setAuctionUrl(taoBaoLink.getClickUrl());



            goods.setAuctionUrl(taoBaoLink.getAuctionUrl());



        }







        // 创建淘口令





 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java


@@ -35,11 +35,12 @@


            int orderState) {



        MsgOrderDetail detail = MsgOrderDetailFactory.createFanLiOrder(uid, orderId, 0, orderState, payMoney, money,



                null);



        try {



            msgOrderDetailService.updateMsgOrderDetail(detail);



        } catch (MsgOrderDetailException e) {



            e.printStackTrace();



        }



//暂时不推送



//        try {



//            msgOrderDetailService.updateMsgOrderDetail(detail);



//        } catch (MsgOrderDetailException e) {



//            e.printStackTrace();



//        }







    }







@@ -61,11 +62,12 @@


            int orderState) {



        MsgOrderDetail detail = MsgOrderDetailFactory.createShareOrder(uid, orderId, 0, orderState, payMoney, money,



                null);



        try {



            msgOrderDetailService.updateMsgOrderDetail(detail);



        } catch (MsgOrderDetailException e) {



            e.printStackTrace();



        }



//暂时不推送



//        try {



//            msgOrderDetailService.updateMsgOrderDetail(detail);



//        } catch (MsgOrderDetailException e) {



//            e.printStackTrace();



//        }







    }







@@ -86,11 +88,12 @@


            int orderState) {



        MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, 0, orderState, payMoney, money,



                null);



        try {



            msgOrderDetailService.updateMsgOrderDetail(detail);



        } catch (MsgOrderDetailException e) {



            e.printStackTrace();



        }



//暂时不推送



//        try {



//            msgOrderDetailService.updateMsgOrderDetail(detail);



//        } catch (MsgOrderDetailException e) {



//            e.printStackTrace();



//        }







    }









 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java


@@ -1658,6 +1658,10 @@


            goods.setAuctionUrl(itemLink);



            if (!StringUtil.isNullOrEmpty(resultJSON.optString("coupon_info")))



                goods.setCouponLink(couponLink);



            String tkRate = resultJSON.optString("max_commission_rate");



            if (!StringUtil.isNullOrEmpty(tkRate)) {



                goods.setTkRate(new BigDecimal(tkRate));



            }



            return goods;



        } catch (TaoKeApiException e) {



            e.printStackTrace();