Merge branch 'master-new' into div

yujian

2019-06-24 4c68642aad8889ff599af52d33453c483f13092a

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

@@ -36,10 +36,12 @@
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

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

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.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.ThreadUtil;

@@ -87,6 +89,10 @@


   @Resource

   private UserShareGoodsGroupService userShareGoodsGroupService;

	
   @Resource

   private UserTaoLiJinRecordService userTaoLiJinRecordService;

	


   /**

    * 

@@ -276,13 +282,32 @@
         goods.setImgList(new ArrayList<>());

      goods.getImgList().add(0, TbImgUtil.getTBSizeImg(goods.getPictUrl(), 300));

      data.put("imgs", goods.getImgList());

      data.put("couponPrice", afterCouponPrice);

      // 老版本兼容

      data.put("quanPrice", afterCouponPrice);

      data.put("zkPrice", goods.getZkPrice());

      data.put("shareContent", "长按复制本段文字，打开【手机淘宝】即可领取【特别优惠券】购买下单，");

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

      data.put("quan", !StringUtil.isNullOrEmpty(goods.getCouponInfo()));

      data.put("reservePrice", goods.getReservePrice());

      data.put("shopType", goods.getUserType() == 1 ? 2 : 1);

      if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && !"无".equalsIgnoreCase(goods.getCouponInfo())) {

         data.put("couponAmount", MoneyBigDecimalUtil.getWithNoZera(goods.getCouponAmount()));

         data.put("coupon", true);

         // 老版本兼容

         data.put("quan", true);

      } else {

         data.put("coupon", false);

         // 老版本兼容

         data.put("quan", true);

      }

		
		
      // 查询商品淘礼金

      BigDecimal taoLiJin = userTaoLiJinRecordService.getShareHongBaoByUidAndGoodsId(Long.parseLong(uid), Long.parseLong(id));

      if (taoLiJin != null && taoLiJin.compareTo(new BigDecimal(0)) == 1) {

         data.put("taoLiJin", "可获淘礼金红包 ¥" + taoLiJin);

      }

		
      out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));



      final String tempUid = uid;