From cdcbed9af813b2a02cdc01eefa24db8bec6b51a9 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 三月 2019 12:17:33 +0800
Subject: [PATCH] 主分类 + 子分类 DAO改造
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java | 54 ++++++++++--------------------------------------------
1 files changed, 10 insertions(+), 44 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 35250c2..327afbf 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
@@ -72,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("鎿嶄綔寮傚父")));
- }
- }
-
-
-
/**
* 淇濆瓨淇敼绮惧搧搴撳晢鍝佸叧鑱斾俊鎭�
@@ -384,6 +340,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();
@@ -919,6 +882,9 @@
if (!StringUtil.isNullOrEmpty(pictUrl))
taobao.setPictUrl(pictUrl);
+ if (!StringUtil.isNullOrEmpty(tb.getPictUrlWhite()))
+ taobao.setPictUrlWhite(tb.getPictUrlWhite());
+
// 鏇存柊鍟嗗搧
taoBaoGoodsUpdateService.getUpdateTaoBaoGoodsBrief(taobao);
--
Gitblit v1.8.0