From 3a6e476b2f498e876ff10f1328455f58e63ee85a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 04 四月 2019 09:30:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
index 28b9fea..68a8b4c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
@@ -224,6 +224,8 @@
if (!StringUtil.isNullOrEmpty(item.optString("material_lib_type")))
goods.setMaterialLibType(item.optInt("material_lib_type"));
+ else
+ goods.setMaterialLibType(0);
return goods;
}
@@ -337,7 +339,9 @@
goods.setFreeShipment(1);
if ("1".equalsIgnoreCase(item.optString("material_lib_type")))
- ;
+ goods.setMaterialLibType(1);
+ else
+ goods.setMaterialLibType(0);
goodsList.add(goods);
}
@@ -385,6 +389,7 @@
g.setCouponStartFee(new BigDecimal(0));
}
g.setCreatetime(new Date());
+ g.setMaterialLibType(goods.getMaterialLibType());
return g;
}
}
@@ -452,6 +457,7 @@
g.setCouponStartFee(new BigDecimal(0));
}
g.setCreatetime(new Date());
+ g.setMaterialLibType(goods.getMaterialLibType());
return g;
}
}
--
Gitblit v1.8.0