设备消息BUG解决，品牌

admin

2019-06-14 1e92eff67b997263ecefa255c63eb6641c47b57f

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

@@ -12,6 +12,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.goods.recommend.RecommendGoodsDeleteHistory;

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

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

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

@@ -21,6 +22,8 @@
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.log.LogHelper;

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

import com.yeshi.fanli.service.inter.goods.recommend.RecommendGoodsDeleteHistoryService;

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

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

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

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

@@ -60,6 +63,12 @@
   @Resource

   private TaoBaoBuyRelationMapService taoBaoBuyRelationMapService;



   @Resource

   private BusinessEmergent110Service businessEmergent110Service;



   @Resource

   private RecommendGoodsDeleteHistoryService recommendGoodsDeleteHistoryService;



   /**

    * 获取淘宝的分享链接

    * 

@@ -70,7 +79,7 @@
    * @param out

    */

   @RequestMapping(value = "gettaobaolink")

   public void getTaoBaoLink(AcceptData acceptData, Long uid, Long auctionId,String from, HttpServletRequest request,

   public void getTaoBaoLink(AcceptData acceptData, Long uid, Long auctionId, String from, HttpServletRequest request,

         PrintWriter out) {

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

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

@@ -140,7 +149,6 @@
      if (acceptData.getPlatform().equalsIgnoreCase("ios"))

         pidType = PidUser.TYPE_FANLI_IOS;

      try {



         TaoBaoLink taoBaoLink = null;

         // 是返利商品库的商品

         if (specialConvert) {

@@ -155,8 +163,10 @@
                  else

                     taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,

                           tbPidService.getIOSDefault().getPid());



               } else

                  taoBaoLink = shareGoodsService.getTaoBaoLinkForBuy(uid, auctionId, pidType);

               LogHelper.test("购买转链:默认PID转链-" + uid + "：" + auctionId);

            }

         } else {// 不是返利库的商品，用特殊PID替代

            try {

@@ -175,6 +185,8 @@
               else

                  taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,

                        tbPidService.getIOSDefault().getPid());



               LogHelper.test("购买转链:默认PID转链-非返利库商品-" + uid + "：" + auctionId);

            }

         }

         JSONObject link = new JSONObject();

@@ -199,19 +211,44 @@
            tbPid = tbPidService.getTBPid(uid, PidUser.TYPE_FANLI_IOS);

         }



         LogHelper.test("购买转链:默认PID转链-异常商品-" + uid + "：" + auctionId);



         data.put("native", isNative);



         if (tbPid != null) {

            String siteId = tbPid.getPid().split("_")[2];

            String adzoneId = tbPid.getPid().split("_")[3];

            TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);

            ClientTBPid clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);

            data.put("type", 2);

            data.put("tbPidInfo", clientTBPid);



            try {

               TaoBaoLink taoBaoLink = null;

               if (pidType == PidUser.TYPE_FANLI_ANDROID)

                  taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,

                        tbPidService.getAndroidDefault().getPid());

               else

                  taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,

                        tbPidService.getIOSDefault().getPid());



               JSONObject link = new JSONObject();

               link.put("clickUrl", taoBaoLink.getClickUrl());

               link.put("couponUrl", taoBaoLink.getCouponLink());

               data.put("type", 1);

               data.put("link", link);

               data.put("native", true);



            } catch (Exception e1) {

               String siteId = tbPid.getPid().split("_")[2];

               String adzoneId = tbPid.getPid().split("_")[3];

               TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);

               ClientTBPid clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);

               data.put("type", 2);

               data.put("tbPidInfo", clientTBPid);

               data.put("native", true);

            }



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

         } else {

            out.print(JsonUtil.loadFalseResult(1, "请求失败"));

         }



         businessEmergent110Service.buyTaoBaoGoodsError(StringUtil.Md5(auctionId + ""));

      }



   }

@@ -263,4 +300,32 @@
      }

   }



   /**

    * 删除推荐商品

    * 
    * @param acceptData

    * @param goodsId

    * @param source

    * @param uid

    * @param reason

    * @param out

    */

   @RequestMapping(value = "deleteRecommendGoods")

   public void deleteRecommendGoods(AcceptData acceptData, Long goodsId, Integer source, Long uid, String reason,

         PrintWriter out) {

      if (goodsId == null) {

         out.print(JsonUtil.loadFalseResult(1, "请上传商品"));

         return;

      }



      RecommendGoodsDeleteHistory history = new RecommendGoodsDeleteHistory();

      history.setDevice(acceptData.getDevice());

      history.setReason(reason);

      history.setUid(uid);

      history.setGoodsSource(source == null ? Constant.SOURCE_TYPE_TAOBAO : source);

      history.setGoodsId(goodsId);

      recommendGoodsDeleteHistoryService.addRecommendGoodsDeleteHistory(history);

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

   }



}