From d0f12da013131cd291cec6e81a12d661c02c4bf4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 17 三月 2020 12:14:27 +0800
Subject: [PATCH] 2.1
---
fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java
index 271eb13..9c01dc5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java
@@ -3,7 +3,9 @@
import java.math.BigDecimal;
import com.alibaba.fastjson.JSONObject;
+import com.yeshi.fanli.dto.common.CategoryInfoDTO;
import com.yeshi.fanli.dto.common.GoodsOtherInfoDTO;
+import com.yeshi.fanli.dto.jd.JDCategoryInfo;
import com.yeshi.fanli.dto.jd.JDCommissionInfo;
import com.yeshi.fanli.dto.jd.JDCouponInfo;
import com.yeshi.fanli.dto.jd.JDShopInfo;
@@ -53,6 +55,23 @@
cg.setVideoUrl(null);
cg.setState(goods.getState());
cg.setMaterialLibType(goods.getMaterialLibType());
+
+
+ // 鍒嗙被淇℃伅
+ CategoryInfoDTO categoryInfo = new CategoryInfoDTO();
+ Integer rootCatId = goods.getRootCatId();
+ if (rootCatId != null) {
+ categoryInfo.setCid1(Long.parseLong(rootCatId.toString()));
+ }
+ categoryInfo.setCid1Name(goods.getRootCategoryName());
+
+ Integer leafCatId = goods.getLeafCatId();
+ if (leafCatId != null) {
+ categoryInfo.setCid2(Long.parseLong(leafCatId.toString()));
+ }
+ categoryInfo.setCid2Name(goods.getLeafName());
+ cg.setCategoryInfo(JSONObject.toJSON(categoryInfo).toString());
+
return cg;
}
@@ -120,6 +139,20 @@
other.setPinGouInfo( goods.getPinGouInfo()); // 鎷艰喘淇℃伅
other.setIsFreeShipping(goods.getIsFreeShipping()); // 鏄惁鍖呴偖
cg.setOtherInfo(JSONObject.toJSON(other).toString());
+
+
+ // 鍒嗙被淇℃伅
+ JDCategoryInfo categoryJD = goods.getCategoryInfo();
+ if (categoryJD != null) {
+ CategoryInfoDTO categoryInfo = new CategoryInfoDTO();
+ categoryInfo.setCid1(categoryJD.getCid1());
+ categoryInfo.setCid1Name(categoryJD.getCid1Name());
+ categoryInfo.setCid2(categoryJD.getCid2());
+ categoryInfo.setCid2Name(categoryJD.getCid2Name());
+ categoryInfo.setCid3(categoryJD.getCid3());
+ categoryInfo.setCid3Name(categoryJD.getCid3Name());
+ cg.setCategoryInfo(JSONObject.toJSON(categoryInfo).toString());
+ }
// 淇濈暀瀛楁
cg.setVideoCover(null);
@@ -190,6 +223,14 @@
cg.setVideoUrl(null);
cg.setState(goods.getState());
cg.setMaterialLibType(1);
+
+ // 鍒嗙被淇℃伅
+ CategoryInfoDTO categoryInfo = new CategoryInfoDTO();
+ categoryInfo.setCid1(goods.getCategoryId());
+ categoryInfo.setCid1Name(goods.getCategoryName());
+ cg.setCategoryInfo(JSONObject.toJSON(categoryInfo).toString());
+
+
return cg;
}
--
Gitblit v1.8.0