From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFactoryServiceImpl.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFactoryServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFactoryServiceImpl.java
index 65e4538..b56cc2d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFactoryServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFactoryServiceImpl.java
@@ -8,9 +8,9 @@
import java.util.Map;
import javax.annotation.Resource;
-import javax.transaction.Transactional;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.dao.mybatis.TaoBaoClassRelationMapper;
import com.yeshi.fanli.dao.mybatis.lable.LabelGoodsMapper;
@@ -196,22 +196,22 @@
return qualityFactoryMapper.listQueryByAuctionId(list);
}
-
@Override
@Transactional
- public void addBatchTaoBaoGoods(List<TaoBaoGoodsBrief> listTaoBaoGoods, String lableNames, AdminUser admin) throws Exception {
-
+ public void addBatchTaoBaoGoods(List<TaoBaoGoodsBrief> listTaoBaoGoods, String lableNames, AdminUser admin)
+ throws Exception {
+
if (listTaoBaoGoods == null || listTaoBaoGoods.size() == 0) {
throw new Exception("鏈壘鍒板尮閰嶇殑鍟嗗搧");
}
-
+
// 鍒涘缓鏍囩
List<Label> listLabel = labelService.addBatchByNames(lableNames, admin);
List<QualityFactory> listQuality = new ArrayList<QualityFactory>();
List<LabelGoods> listLabelGoods = new ArrayList<LabelGoods>();
- for (TaoBaoGoodsBrief goodsBrief: listTaoBaoGoods) {
+ for (TaoBaoGoodsBrief goodsBrief : listTaoBaoGoods) {
// 鏈湴鏄惁宸插瓨鍦ㄦ鍟嗗搧
List<TaoBaoGoodsBrief> hasList = taoBaoGoodsBriefService.queryByAuctionId(goodsBrief.getAuctionId());
@@ -219,7 +219,7 @@
if (hasList != null && hasList.size() > 0) {
TaoBaoGoodsBrief currentGoodsBrief = hasList.get(0);
goodsBrief.setId(currentGoodsBrief.getId());
-
+
// 鏇存柊鍟嗗搧鏈�鏂颁俊鎭�
taoBaoGoodsUpdateService.updateTaoBaoGoods(goodsBrief);
} else {
@@ -275,7 +275,7 @@
}
}
}
-
+
}
if (listQuality.size() > 0) {
@@ -288,7 +288,6 @@
}
-
@Override
@Transactional
public void setWeightBatch(List<Long> idList, AdminUser admin, Integer weight, Integer weightSmall,
@@ -581,6 +580,7 @@
try {
TaoBaoGoodsBrief taoBaoGoodsBrief = TaoKeApiUtil.searchGoodsDetail(goods.getAuctionId());
if (taoBaoGoodsBrief != null) {
+
listGoodsBrief.add(taoBaoGoodsBrief);
}
@@ -598,6 +598,13 @@
}
}
+ for (int i = 0; i < goodsList.size(); i++) {
+ if (goodsList.get(i).getMaterialLibType() != null && goodsList.get(i).getMaterialLibType() == 0) {
+ goodsList.remove(i);
+ i--;
+ }
+ }
+
// 鍟嗗搧id闆嗗悎
List<Long> listSystemTBid = new ArrayList<Long>();
--
Gitblit v1.8.0