设备消息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,7 @@
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;

@@ -60,9 +62,12 @@


   @Resource

   private TaoBaoBuyRelationMapService taoBaoBuyRelationMapService;

	


   @Resource

   private BusinessEmergent110Service businessEmergent110Service;



   @Resource

   private RecommendGoodsDeleteHistoryService recommendGoodsDeleteHistoryService;



   /**

    * 获取淘宝的分享链接

@@ -237,12 +242,12 @@
               data.put("tbPidInfo", clientTBPid);

               data.put("native", true);

            }

				


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

         } else {

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

         }

			


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

      }



@@ -295,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(""));

   }



}