From 21a5d62894e6cca7d536ffcc1d63898ffaf16185 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 25 二月 2019 11:41:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java
index 9d0e825..64c8b5c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java
@@ -11,8 +11,6 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import net.sf.json.JSONObject;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
@@ -27,7 +25,6 @@
import com.yeshi.fanli.entity.common.AdminUser;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.QualityFactoryException;
-import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.lable.LabelGoodsService;
import com.yeshi.fanli.service.inter.lable.LabelService;
@@ -41,6 +38,8 @@
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.quality.QualityFactoryVO;
+
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("admin/new/api/v1/qualityFactory")
@@ -58,10 +57,6 @@
private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
@Resource
private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
-
- @Resource
- private AdminUserService adminUserService;
-
public static final int SALES_ASC = 1;
@@ -109,7 +104,7 @@
return;
}
- qualityFactoryService.addBatch(auctionIdList,lableNames, admin);
+ qualityFactoryService.addBatchGoodsByTaoBaoId(auctionIdList,lableNames, admin);
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛")));
@@ -924,6 +919,9 @@
if (!StringUtil.isNullOrEmpty(pictUrl))
taobao.setPictUrl(pictUrl);
+ if (!StringUtil.isNullOrEmpty(tb.getPictUrlWhite()))
+ taobao.setPictUrlWhite(tb.getPictUrlWhite());
+
// 鏇存柊鍟嗗搧
taoBaoGoodsUpdateService.getUpdateTaoBaoGoodsBrief(taobao);
--
Gitblit v1.8.0