From f27c390100838b75c468ce92330276b68e476ef5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 15 十月 2019 10:20:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
index 500ad52..457f164 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
@@ -44,6 +44,7 @@
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.factory.MonitorFactory;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import net.sf.json.JSONObject;
@@ -179,7 +180,7 @@
ClientTBPid clientTBPid = null;
String dpid = null;
- if (goods.getMaterialLibType() != null && goods.getMaterialLibType() > 0) {
+ if (TaoBaoUtil.isSpecialGoods(goods.getMaterialLibType())) {
dpid = TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT;
} else {
dpid = TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID;
@@ -195,7 +196,7 @@
boolean specialConvert = false;
- if (goods.getMaterialLibType() != null && goods.getMaterialLibType() == 1) {
+ if (TaoBaoUtil.isSpecialGoods(goods.getMaterialLibType())) {
specialConvert = true;
} else
specialConvert = false;
--
Gitblit v1.8.0