From cc88ea25dc395b5d1b9b5ac9ddba7713c667c1c1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 17 十二月 2019 12:45:38 +0800
Subject: [PATCH] 专题与banner设置版本管理
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
index c2b39a8..d935a2d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.impl.dynamic;
+import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
@@ -18,9 +19,11 @@
import org.springframework.stereotype.Service;
import org.yeshi.utils.DateLunarUtil;
import org.yeshi.utils.DateUtil;
+import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.taobao.TbImgUtil;
import com.yeshi.fanli.dao.dynamic.DynamicInfoDao;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
import com.yeshi.fanli.dto.taobao.TaoBaoShopDTO;
import com.yeshi.fanli.entity.bus.activity.ActivityRuleUser;
import com.yeshi.fanli.entity.bus.activity.ActivityUser;
@@ -714,8 +717,14 @@
size = inviteInfo.getSize();
}
+ InputStream asInputStream = HttpUtil.getAsInputStream(picUrl);
+
+ int index = picUrl.lastIndexOf("/");
+ String newUrl = picUrl.substring(index + 1);
+ String urlMd5 = newUrl.substring(0, newUrl.lastIndexOf("."));
+
// 鍥剧墖
- String imgLink = qrCodeService.drawInviteQrCodeNew(picUrl, null, null, pX, pY, size, null);
+ String imgLink = qrCodeService.drawInviteQrCodeNew(asInputStream, urlMd5, null, null, pX, pY, size, null);
GoodsPicture p2 = new GoodsPicture();
p2.setW(100);
p2.setH(100);
@@ -966,6 +975,8 @@
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
+ ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());
+
for (DynamicInfo dynamicInfo : list) {
DynamicInfo dynamicNew = new DynamicInfo();
try {
@@ -1020,8 +1031,7 @@
goods.setCouponStartFee(goodsMap.get(goods.getAuctionId()).getCouponStartFee());
goods.setTkRate(goodsMap.get(goods.getAuctionId()).getTkRate());
- GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBaoGoodsBriefExtra(goods, fanLiRate,
- shareRate);
+ GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBaoGoodsBriefExtra(goods, paramsDTO);
goodsNew.setGoodsVO(detailVO);
goodsNew.setGoods(null);
--
Gitblit v1.8.0