金币BUG修改

admin

2019-09-22 b9f8ef2c4737b6e6be4b12fc8f7bafb033bfcfe5

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

@@ -16,6 +16,7 @@


import com.google.gson.Gson;

import com.yeshi.fanli.dto.jd.JDCouponInfo;

import com.yeshi.fanli.dto.jd.JDPingouInfo;

import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;

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

import com.yeshi.fanli.entity.bus.recommend.RecommendBanner;

@@ -30,7 +31,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoLink;

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

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

import com.yeshi.fanli.exception.ShareGoodsException;

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.service.inter.config.BusinessSystemService;

@@ -39,7 +40,7 @@
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;

import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerService;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

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

import com.yeshi.fanli.service.inter.order.config.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;

@@ -459,13 +460,22 @@
      }

      

      String materialId = "https://item.jd.com/" + id + ".html";

      String jumpLink = JDApiUtil.convertLink(materialId, couponUrl, JDApiUtil.POSITION_SHARE + "", uid);

      String jumpLink = JDApiUtil.convertShortLink(materialId, couponUrl, JDApiUtil.POSITION_SHARE + "", uid);

		
      int priceType = 1;

      BigDecimal price = jdGoods.getPrice();;

      JDPingouInfo pinGouInfo = jdGoods.getPinGouInfo();

      if (pinGouInfo != null) {

         priceType = 2; // 拼购价

         price =  pinGouInfo.getPingouPrice();

      }

      

      JSONObject data = new JSONObject();

      data.put("jdzy", jdzy);

      data.put("imgs", imageList);

      data.put("title", jdGoods.getSkuName());

      data.put("zkPrice", jdGoods.getPrice());

      data.put("zkPrice", price);

      data.put("priceType", priceType); 
      data.put("coupon", hasCoupon);

      data.put("couponAmount", discount);

      data.put("couponPrice", JDUtil.getQuanPrice(jdGoods));

@@ -539,7 +549,7 @@
         hasCoupon = false;

      }

      

      String jumpLink = PinDuoDuoApiUtil.convert(id, PinDuoDuoApiUtil.PID_SHARE + "", uid);

      String jumpLink = PinDuoDuoApiUtil.getPromotionUrl(id, PinDuoDuoApiUtil.PID_SHARE + "", uid);

      

      JSONObject data = new JSONObject();

      data.put("imgs", imageList);