金币版本拦截与频率拦截bug修改

admin

2019-09-25 28a0efc6ec16f3f82eb8e16e87269300d6744fd4

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

@@ -34,6 +34,7 @@
import com.yeshi.fanli.exception.share.ShareGoodsException;

import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.SystemConfigService;

@@ -45,11 +46,13 @@
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;

import com.yeshi.fanli.service.inter.user.TBPidService;

import com.yeshi.fanli.service.inter.user.UserShareGoodsGroupService;

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TaoBaoConstant;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.jd.JDApiUtil;

import com.yeshi.fanli.util.jd.JDUtil;

@@ -103,6 +106,8 @@
   @Resource

   private UserTaoLiJinRecordService userTaoLiJinRecordService;

   

   @Resource

   private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;



   /**

    * 

@@ -238,6 +243,7 @@
   @RequestMapping(value = "getGoodsDetail", method = RequestMethod.GET)

   public void getGoodsDetail(final AcceptData acceptData, final String id, String tid, String uid, String callback,

         PrintWriter out) {

      LogHelper.shareGoods("分享出去的H5访问: uid:" + uid + " id:" + id);

      long begin = java.lang.System.currentTimeMillis();

      if (StringUtil.isNullOrEmpty(id)) {

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

@@ -281,22 +287,14 @@
               }



         } else {// 没有分享记录，需要直接分享

            List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService

                  .getConfigByTypeCache(PidUser.TYPE_SHARE_GOODS);

            String pid = null;

            ClientTBPid tbPid = tbPidService.getSharePid();

            if (tbPid != null)

               pid = tbPid.getPid();

            else {

               pid = configList.get(0).getDefaultPid();

            }



            LogHelper.test("没有分享记录:uid:" + uid + "  actionid:" + id);

            // 获取

            TaoKeAppInfo app = new TaoKeAppInfo();

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

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

            app.setAppSecret(configList.get(0).getAppSecret());

            app.setPid(pid);

            app.setPid(TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT);

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

            app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);

            app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);



            try {

               goods = TaoKeApiUtil.searchGoodsDetail(Long.parseLong(id), app);

            } catch (NumberFormatException e) {

@@ -309,6 +307,9 @@
               if (!StringUtil.isNullOrEmpty(goods.getCouponLink())) {

                  url = goods.getCouponLink();

               }

               String relationId = userExtraTaoBaoInfoService.getRelationIdByUid(Long.parseLong(uid));

               if (!StringUtil.isNullOrEmpty(relationId))

                  url += "&relationId=" + relationId;

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

            }

         }

@@ -405,10 +406,9 @@
      return;

   }

   

	
	
   /**

    * 京东分享商品信息

    * 
    * @param acceptData

    * @param id

    * @param uid

@@ -463,7 +463,8 @@
      String jumpLink = JDApiUtil.convertShortLink(materialId, couponUrl, JDApiUtil.POSITION_SHARE + "", uid);

      

      int priceType = 1;

      BigDecimal price = jdGoods.getPrice();;

      BigDecimal price = jdGoods.getPrice();

      ;

      JDPingouInfo pinGouInfo = jdGoods.getPinGouInfo();

      if (pinGouInfo != null) {

         priceType = 2; // 拼购价

@@ -489,7 +490,8 @@
         public void run() {

            try {

               if (!StringUtil.isNullOrEmpty(tempUid))

                  userShareGoodsGroupService.updateBrowseNum(Long.parseLong(tempUid), id, Constant.SOURCE_TYPE_JD);

                  userShareGoodsGroupService.updateBrowseNum(Long.parseLong(tempUid), id,

                        Constant.SOURCE_TYPE_JD);

            } catch (NumberFormatException e) {

               e.printStackTrace();

            } catch (UserShareGoodsRecordException e) {

@@ -500,9 +502,9 @@
      return;

   }

   

	
   /**

    * 拼多多分享商品详情

    * 
    * @param acceptData

    * @param id

    * @param uid

@@ -568,7 +570,8 @@
         public void run() {

            try {

               if (!StringUtil.isNullOrEmpty(tempUid))

                  userShareGoodsGroupService.updateBrowseNum(Long.parseLong(tempUid), id, Constant.SOURCE_TYPE_PDD);

                  userShareGoodsGroupService.updateBrowseNum(Long.parseLong(tempUid), id,

                        Constant.SOURCE_TYPE_PDD);

            } catch (NumberFormatException e) {

               e.printStackTrace();

            } catch (UserShareGoodsRecordException e) {