From a2e287f9bfec6f64bcd1dce4155b0139d1474cb7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 10 六月 2019 12:15:57 +0800
Subject: [PATCH] 设备消息，用户消息总未读消息修改
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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 629342c..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
@@ -152,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();
@@ -340,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();
--
Gitblit v1.8.0