From 1e92eff67b997263ecefa255c63eb6641c47b57f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 14 六月 2019 10:22:33 +0800
Subject: [PATCH] 设备消息BUG解决，品牌
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java | 80 +++++++++-------------------------------
1 files changed, 18 insertions(+), 62 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..7cfff73 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")
@@ -59,10 +58,6 @@
@Resource
private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
- @Resource
- private AdminUserService adminUserService;
-
-
public static final int SALES_ASC = 1;
public static final int SALES_DESC = 2;
@@ -77,50 +72,6 @@
public static final int PROPOR_ASC = 7;
public static final int PROPOR_DESC = 8;
- /**
- * 鎵归噺娣诲姞鏍囩 --- 娣樺疂
- *
- * @param callback
- * @param label
- * @param request
- * @param out
- */
- @RequestMapping(value = "addBatch")
- public void addBatch(String callback, String auctionIds, String lableNames, HttpServletRequest request, PrintWriter out) {
-
- try {
- // 鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛
- AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
- if (admin == null) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄嗐��")));
- return;
- }
-
- if (StringUtil.isNullOrEmpty(auctionIds)) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("璇烽�夋嫨姝ｇ‘鐨勫晢鍝佸叆搴�")));
- return;
- }
-
- Gson gson = new Gson();
- List<Long> auctionIdList = gson.fromJson(auctionIds, new TypeToken<ArrayList<Long>>() {
- }.getType());
- if (auctionIdList == null || auctionIdList.size() == 0) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("璇烽�夋嫨姝ｇ‘鐨勫晢鍝佸叆搴�")));
- return;
- }
-
- qualityFactoryService.addBatch(auctionIdList,lableNames, admin);
-
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛")));
-
- } catch (Exception e) {
- e.printStackTrace();
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")));
- }
- }
-
-
-
/**
* 淇濆瓨淇敼绮惧搧搴撳晢鍝佸叧鑱斾俊鎭�
@@ -201,21 +152,16 @@
@RequestMapping(value = "removeGoods")
public void removeGoods(String callback, String ids, PrintWriter out) {
try {
-
Gson gson = new Gson();
- List<String> goodsIds = gson.fromJson(ids, new TypeToken<ArrayList<String>>() {}.getType());
+ List<Long> goodsIds = gson.fromJson(ids, new TypeToken<ArrayList<Long>>() {}.getType());
if (goodsIds == null || goodsIds.size() == 0) {
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鏈娴嬪埌绉婚櫎鍟嗗搧鏁版嵁")));
- } else {
- // 鍟嗗搧绉婚櫎绮惧搧搴�
- qualityFactoryService.deleteByGoodsId(goodsIds);
- // 娓呯悊鍟嗗搧鎵�鏈夋爣绛�
- labelGoodsService.deleteByGoodsId(goodsIds);
-
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("绉婚櫎鎴愬姛")));
- }
-
+ return;
+ }
+
+ qualityFactoryService.deleteBatchByTaoBaoGoodsId(goodsIds);
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("绉婚櫎鎴愬姛")));
} catch (Exception e) {
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触")));
e.printStackTrace();
@@ -389,6 +335,13 @@
if (taoBaoGoodsBrief == null)
continue; // 涓虹┖缁撴潫鏈寰幆
+
+ String auctionUrl = taoBaoGoodsBrief.getAuctionUrl();
+ if (auctionUrl != null && auctionUrl.trim().length() > 0 && auctionUrl.contains("id=null")) {
+ auctionUrl =auctionUrl.replace("id=null","id="+ taoBaoGoodsBrief.getAuctionId());
+ taoBaoGoodsBrief.setAuctionUrl(auctionUrl);
+ }
+
Map<String, Object> map = new HashMap<String, Object>();
BoutiqueAutoRule boutiqueAutoRule = selectionGoods.getBoutiqueAutoRule();
@@ -924,6 +877,9 @@
if (!StringUtil.isNullOrEmpty(pictUrl))
taobao.setPictUrl(pictUrl);
+ if (!StringUtil.isNullOrEmpty(tb.getPictUrlWhite()))
+ taobao.setPictUrlWhite(tb.getPictUrlWhite());
+
// 鏇存柊鍟嗗搧
taoBaoGoodsUpdateService.getUpdateTaoBaoGoodsBrief(taobao);
--
Gitblit v1.8.0