From 6090839cb1a40547304ffe59e75320799fc47bea Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 31 十二月 2019 15:09:54 +0800
Subject: [PATCH] 删除DaTaoKeDetail实体，修改其依赖
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 d935a2d..6308999 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
@@ -38,7 +38,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.entity.taobao.TaoBaoShop;
-import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
+import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.activity.ActivityUserService;
@@ -49,7 +49,7 @@
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
-import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
import com.yeshi.fanli.service.inter.user.QrCodeService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
@@ -78,7 +78,7 @@
private RedisManager redisManager;
@Resource
- private DaTaoKeGoodsService daTaoKeGoodsService;
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
@Resource
private JumpDetailV2Service jumpDetailV2Service;
@@ -347,9 +347,9 @@
count = 4;
}
- List<DaTaoKeDetail> listDaTaoKe = daTaoKeGoodsService.getGoodsNotInList(subclassId, null, count);
+ List<DaTaoKeDetailV2> listDaTaoKe = daTaoKeGoodsDetailV2Service.getGoodsNotInList(subclassId, null, count);
- DaTaoKeDetail daTaoKeDetail = null;
+ DaTaoKeDetailV2 daTaoKeDetail = null;
// 鍟嗗搧鍒楄〃
List<GoodsPicture> listPicture = new ArrayList<GoodsPicture>();
// 鍟嗗搧鍒楄〃
@@ -358,7 +358,7 @@
BigDecimal shareMoney = new BigDecimal(0);
BigDecimal proportion = hongBaoManageService.getFanLiRate();
- for (DaTaoKeDetail daTaoKe : listDaTaoKe) {
+ for (DaTaoKeDetailV2 daTaoKe : listDaTaoKe) {
if (daTaoKeDetail == null) {
daTaoKeDetail = daTaoKe;
}
@@ -478,7 +478,7 @@
}
}
// 澶ф窐瀹㈡暟鎹�
- DaTaoKeDetail daTaoKe = daTaoKeGoodsService.getGoodsNotInList(subclassId, listId, 1).get(0);
+ DaTaoKeDetailV2 daTaoKe = daTaoKeGoodsDetailV2Service.getGoodsNotInList(subclassId, listId, 1).get(0);
if (daTaoKe == null) {
return addSuccess;
}
@@ -515,7 +515,7 @@
TaoBaoGoodsBrief taoBaoGoodsBrief2 = TaoKeApiUtil.getSimpleGoodsInfo(daTaoKe.getGoodsId());
List<String> imgList = taoBaoGoodsBrief2.getImgList();
List<String> listimgs = new ArrayList<String>();
- String pic = daTaoKe.getPic();
+ String pic = daTaoKe.getMainPic();
listimgs.add(TbImgUtil.getTBSize320Img(pic));
if (imgList != null && imgList.size() > 0) {
for (String img : imgList) {
@@ -578,7 +578,7 @@
* @param subclassId
* @throws TaobaoGoodsDownException
*/
- public DynamicInfo getDynamicInfo(DaTaoKeDetail daTaoKe, Long classId, Long subclassId) {
+ public DynamicInfo getDynamicInfo(DaTaoKeDetailV2 daTaoKe, Long classId, Long subclassId) {
DynamicInfo dynamicInfo = new DynamicInfo();
dynamicInfo.setId(UUID.randomUUID().toString().replace("-", ""));
dynamicInfo.setClassId(classId);
@@ -613,11 +613,11 @@
* @param daTaoKe
* @return
*/
- public GoodsPicture getGoodsPicture(DaTaoKeDetail daTaoKe) {
+ public GoodsPicture getGoodsPicture(DaTaoKeDetailV2 daTaoKe) {
GoodsPicture goodsPicture = new GoodsPicture();
goodsPicture.setH(100);
goodsPicture.setW(100);
- goodsPicture.setUrl(TbImgUtil.getTBSize320Img(daTaoKe.getPic()));
+ goodsPicture.setUrl(TbImgUtil.getTBSize320Img(daTaoKe.getMainPic()));
goodsPicture.setJumpDetail(jumpDetailV2Service.getByTypeCache("goodsdetail"));
String goodsId = daTaoKe.getGoodsId().toString();
--
Gitblit v1.8.0