Merge branch 'master-new' into div

yujian

2019-06-24 4c68642aad8889ff599af52d33453c483f13092a

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

@@ -36,6 +36,7 @@
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;

@@ -88,6 +89,10 @@


   @Resource

   private UserShareGoodsGroupService userShareGoodsGroupService;

	
   @Resource

   private UserTaoLiJinRecordService userTaoLiJinRecordService;

	


   /**

    * 

@@ -295,6 +300,14 @@
         // 老版本兼容

         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;