From 979cd9c4fbcc037a34ceaf65f6c519b9469f2ac7 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 12 四月 2019 14:16:19 +0800
Subject: [PATCH] 手机登录短信验证

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 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 2bf7140..f7edf53 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;
 				}
 			}
@@ -1096,6 +1102,8 @@
 					goods.setZkPrice(new BigDecimal(item.optString("zk_final_price")));
 					goods.setAuctionUrl(item.optString("item_url"));
 					goods.setPictUrl(item.optString("pict_url"));
+					goods.setSalesCount(item.optString("volume"));
+					goods.setUserType(item.optInt("user_type"));
 					list.add(goods);
 				}
 		}
@@ -1656,8 +1664,10 @@
 			String itemLink = resultJSON.optString("item_url");
 			TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
 			goods.setAuctionUrl(itemLink);
-			if (!StringUtil.isNullOrEmpty(resultJSON.optString("coupon_info")))
+			if (!StringUtil.isNullOrEmpty(resultJSON.optString("coupon_info"))) {
 				goods.setCouponLink(couponLink);
+				goods.setCouponInfo(resultJSON.optString("coupon_info"));
+			}
 			String tkRate = resultJSON.optString("max_commission_rate");
 			if (!StringUtil.isNullOrEmpty(tkRate)) {
 				goods.setTkRate(new BigDecimal(tkRate));
@@ -1780,6 +1790,7 @@
 		}
 		goods.setReservePrice(new BigDecimal(0));
 		goods.setTotalFee(new BigDecimal("0"));
+		goods.setPictUrlWhite(item.optString("white_image"));
 		return goods;
 	}
 

--
Gitblit v1.8.0