Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

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

@@ -27,6 +27,7 @@
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.integral.IntegralGetService;

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

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

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

@@ -85,8 +86,13 @@


   @Resource

   private TLJBuyGoodsService tljBuyGoodsService;

	
   @Resource

   private IntegralGetService integralGetService;

	
	


   private void doTaoLiJinBuy(Long uid, Long auctionId, PrintWriter out) {

   private void doTaoLiJinBuy(AcceptData acceptData, Long uid, Long auctionId, PrintWriter out) {

      JSONObject data = new JSONObject();

      TaoBaoLink taoBaoLink = null;

      try {

@@ -115,6 +121,8 @@
      data.put("type", 1);

      data.put("link", link);

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

		
      integralGetService.addTaoLiJinBuy(uid, auctionId);

   }



   /**

@@ -161,7 +169,7 @@
      }



      if ("taolijin_buy".equalsIgnoreCase(source)) {

         doTaoLiJinBuy(uid, auctionId, out);

         doTaoLiJinBuy(acceptData, uid, auctionId, out);

         return;

      }



@@ -279,6 +287,9 @@
         data.put("link", link);

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



         // 获得金币

         integralGetService.addCouponRebate(uid);

			
      } catch (Exception e) {



         LogHelper.errorDetailInfo(e);

@@ -410,6 +421,9 @@
      history.setGoodsId(goodsId);

      recommendGoodsDeleteHistoryService.addRecommendGoodsDeleteHistory(history);

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

		
      // 获得金币

      integralGetService.addCloseRecommendGoods(uid);

   }



}