Merge remote-tracking branch 'origin/master'

admin

2018-12-05 21f49216736c547d99ec1dd46a24c6f43f852fc5

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

@@ -7,27 +7,28 @@
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;

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.taobao.TbImgUtil;



import com.mongodb.util.ThreadUtil;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;

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

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

import com.yeshi.fanli.exception.ShareGoodsException;

import com.yeshi.fanli.service.impl.goods.ShareGoodsServiceImpl;

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 org.yeshi.utils.HttpUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.taobao.TbImgUtil;



import net.sf.json.JSONObject;



@@ -43,6 +44,9 @@


   @Resource

   private HongBaoManageService hongBaoManageService;



   @Resource

   private MonitorService monitorService;



   // 获取商品分享链接

   @RequestMapping(value = "getGoodsShareUrl")

@@ -61,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;

@@ -87,7 +92,8 @@


         data.put("clickUrl", url);

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

         data.put("rule", "http://flq.yeshitv.com/fanli/client/html/help_item.html?id=8");

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

@@ -107,6 +113,13 @@
         }

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

         //

         data.put("notifyPicture", "");

         data.put("notifyDesc", "");



         // 添加分享记录

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

@@ -139,6 +152,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()));

      }