From 0e552c5dba18d27622116a7d7a6e04fc99f8e8a7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 22 一月 2019 14:14:23 +0800
Subject: [PATCH] Merge branch 'dev-msg'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFactoryServiceImpl.java | 178 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 89 insertions(+), 89 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 8e51262..020d4f2 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
@@ -71,12 +71,10 @@
@Resource
private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
-
@Override
public int updateByPrimaryKeySelective(QualityFactory record) throws QualityFactoryException {
return qualityFactoryMapper.updateByPrimaryKeySelective(record);
}
-
@Override
public void deleteByTbAuctionId(Long auctionId) {
@@ -148,7 +146,6 @@
labelGoodsMapper.deleteBatchByGoodsId(listGid);
}
-
@Override
@Transactional
public void deleteByGoodsId(List<String> ids) throws QualityFactoryException {
@@ -159,7 +156,6 @@
}
}
}
-
@Override
public QualityFactory selectByPrimaryKey(Long id) throws QualityFactoryException {
@@ -290,10 +286,10 @@
TaoBaoGoodsBrief currentGoodsBrief = taoBaoGoodsBriefList.get(0);
goodsBrief.setId(currentGoodsBrief.getId());
-
+
// 鏇存柊鍟嗗搧鏈�鏂颁俊鎭�
taoBaoGoodsUpdateService.updateTaoBaoGoods(goodsBrief);
-
+
} else {
// 鎻掑叆鏈湴鏁版嵁搴�
@@ -416,22 +412,24 @@
return qualityFactoryMapper.queryNeedUpdate(start, count, hour);
}
-
/**
* 鑾峰彇缂撳瓨
- * @param key 閿�
- * @param title 鏍囩鍚嶇О
+ *
+ * @param key
+ * 閿�
+ * @param title
+ * 鏍囩鍚嶇О
* @return
*/
- public String getLabelIdByRedis (String key, String title) throws Exception {
-
+ public String getLabelIdByRedis(String key, String title) throws Exception {
+
String value = redisManager.getCommonString(key);
-
+
if (StringUtil.isNullOrEmpty(value)) {
-
+
// id涓虹┖鏃剁郴缁熻繘琛屾煡璇�
List<Label> list9K9 = labelService.selectByTitle(title);
-
+
if (list9K9 != null && list9K9.size() > 0) {
Long id = list9K9.get(0).getId();
if (id != null) {
@@ -441,10 +439,10 @@
}
}
}
-
+
return value;
}
-
+
@Override
@Transactional
public void updateGoodsFactory(List<Long> listId) {
@@ -462,8 +460,7 @@
List<Long> listDeleteQuality = new ArrayList<Long>();
// 鍒犻櫎鏍囩
List<Long> listDeleteLabel = new ArrayList<Long>();
-
-
+
List<QualityFactory> listUpdateQuality = new ArrayList<QualityFactory>();
List<TaoBaoGoodsBrief> listUpdateGoodsBrief = new ArrayList<TaoBaoGoodsBrief>();
@@ -473,37 +470,37 @@
List<LabelGoods> listLabelAdd = new ArrayList<LabelGoods>();
try {
-
+
List<Long> list9Class = new ArrayList<Long>();
Map<String, Label> map = new HashMap<String, Label>();
-
+
if (Constant.IS_OUTNET) {
-
+
String value9K9 = getLabelIdByRedis("lab-9K9", "9.9");
String value19K9 = getLabelIdByRedis("lab-19K9", "19.9");
String value29K9 = getLabelIdByRedis("lab-29K9", "29.9");
String value49K9 = getLabelIdByRedis("lab-49K9", "49.9");
-
+
if (!StringUtil.isNullOrEmpty(value9K9)) {
map.put("9.9", new Label(Long.parseLong(value9K9)));
- list9Class.add(Long.parseLong(value9K9));
+ list9Class.add(Long.parseLong(value9K9));
}
-
+
if (!StringUtil.isNullOrEmpty(value19K9)) {
map.put("19.9", new Label(Long.parseLong(value19K9)));
- list9Class.add(Long.parseLong(value19K9));
+ list9Class.add(Long.parseLong(value19K9));
}
-
+
if (!StringUtil.isNullOrEmpty(value29K9)) {
map.put("29.9", new Label(Long.parseLong(value29K9)));
- list9Class.add(Long.parseLong(value29K9));
+ list9Class.add(Long.parseLong(value29K9));
}
-
+
if (!StringUtil.isNullOrEmpty(value49K9)) {
map.put("49.9", new Label(Long.parseLong(value49K9)));
- list9Class.add(Long.parseLong(value49K9));
+ list9Class.add(Long.parseLong(value49K9));
}
-
+
}
listQuality.parallelStream().forEach(quality -> {
@@ -555,11 +552,12 @@
} else {
/* 鏇存柊鍟嗗搧淇℃伅 */
- TaoBaoGoodsBrief updateGoods = taoBaoGoodsUpdateService.getUpdateTaoBaoGoodsBrief(newGoodsBrief);
-
+ TaoBaoGoodsBrief updateGoods = taoBaoGoodsUpdateService
+ .getUpdateTaoBaoGoodsBrief(newGoodsBrief);
+
updateGoods.setId(id);
taoBaoGoodsBriefService.setGoodsBriefDefault(updateGoods);
-
+
listUpdateGoodsBrief.add(updateGoods);
/* 鏇存柊绮鹃�夊簱 淇℃伅鏃堕棿 */
@@ -616,7 +614,7 @@
if (listDeleteLabel.size() > 0) {
labelGoodsMapper.deleteBatchByGoodsId(listDeleteLabel);
}
-
+
// 娣诲姞鏍囩
if (listLabelAdd.size() > 0) {
labelGoodsMapper.insertBatch(listLabelAdd);
@@ -635,7 +633,6 @@
}
}
}
-
@Override
public void autoInsertOrUpadateStorage(List<TaoBaoGoodsBrief> goodsList, List<Label> listLabs,
@@ -672,8 +669,6 @@
}
}
-
-
// 鍟嗗搧id闆嗗悎
List<Long> listSystemTBid = new ArrayList<Long>();
@@ -689,7 +684,6 @@
List<QualityFactory> listAddInsert = new ArrayList<QualityFactory>();
// 杩涘叆绮鹃�夊晢鍝佸垪琛�
List<QualityFactory> listAddUpdate = new ArrayList<QualityFactory>();
-
// 鎻掑叆鍟嗗搧娣樺疂ID闆嗗悎
List<Long> listAuctionId = new ArrayList<Long>();
@@ -750,10 +744,10 @@
/* 鍟嗗搧宸插瓨鍦ㄦ暟鎹簱 */
if (isExist && systemId != null) {
-
+
// 鐢ㄤ簬纭畾鏄惁瀛樺湪绮鹃�夊簱
listSystemTBid.add(systemId);
-
+
// 鏇存柊鍟嗗搧淇℃伅
TaoBaoGoodsBrief updateGoods = taoBaoGoodsUpdateService.getUpdateTaoBaoGoodsBrief(newGoodsBrief);
// 璁剧疆涓婚敭id
@@ -763,41 +757,42 @@
updateGoods.setCreatetime(date);
updateGoods.setUpdatetime(date);
taoBaoGoodsBriefService.setGoodsBriefDefault(updateGoods);
-
+
listGoodsUpdate.add(updateGoods);
-
Long has9k9ID = null;
- /* 璐翠笂鏍囩 */
+ /* 璐翠笂鏍囩 */
if (listLabs != null && listLabs.size() > 0) {
for (Label label : listLabs) {
-
- // 鍖呭惈 9.9/19.9/29.9/49.9 銆佸悓鏃舵潵婧愭窐瀹濇帹鑽�: 鐢变簬鑾峰彇璇︽儏涓庢帹鑽愭帴鍙ｇ殑鍒镐俊鎭瓨鍦ㄥ嚭鍏� 浠ユ渶鍚庤鎯呬负鍑�
- if (list9Class.contains(label.getId()) && autoRule.isCalss9k9() && QualityFactory.SOURCE_TAOBAO_MATERIAL == autoRule.getGoodsSource()) {
-
- /* 鑾峰彇鍟嗗搧璇︽儏鍚庤绠楁槸鍚﹀睘浜� 9k9绯诲垪 鍔犲叆瀵瑰簲鐨勬爣绛�*/
+
+ // 鍖呭惈 9.9/19.9/29.9/49.9 銆佸悓鏃舵潵婧愭窐瀹濇帹鑽�: 鐢变簬鑾峰彇璇︽儏涓庢帹鑽愭帴鍙ｇ殑鍒镐俊鎭瓨鍦ㄥ嚭鍏�
+ // 浠ユ渶鍚庤鎯呬负鍑�
+ if (list9Class.contains(label.getId()) && autoRule.isCalss9k9()
+ && QualityFactory.SOURCE_TAOBAO_MATERIAL == autoRule.getGoodsSource()) {
+
+ /* 鑾峰彇鍟嗗搧璇︽儏鍚庤绠楁槸鍚﹀睘浜� 9k9绯诲垪 鍔犲叆瀵瑰簲鐨勬爣绛� */
LabelGoods labelGds = screen9K9(updateGoods, map);
-
+
if (labelGds != null) {
-
+
Label label9k = labelGds.getLabel();
Long id = label9k.getId();
-
+
long existence = labelGoodsMapper.isExistence(systemId, id);
if (existence <= 0) {
// 涓嶅瓨鍦ㄥ搴旀爣绛�
listLabelAdd.add(labelGds);
} else {
// 宸插瓨鍦�
- has9k9ID = id;
+ has9k9ID = id;
}
-
+
}
-
+
} else {
-
+
long existence = labelGoodsMapper.isExistence(systemId, label.getId());
if (existence <= 0) {
// 璐翠笂鏂版爣绛�
@@ -809,54 +804,52 @@
listLabelAdd.add(lg);
} else {
- if(list9Class.contains(label.getId())){
+ if (list9Class.contains(label.getId())) {
// 宸插瓨鍦�
- has9k9ID = label.getId();
+ has9k9ID = label.getId();
}
}
}
}
}
-
/* 鍒ゆ柇鏄惁宸茬粡璐翠笂鏍囩 9k9鏍囩 */
if (list9Class.size() > 0) {
-
+
List<LabelGoods> listGlid = labelGoodsMapper.listQuery9k9Class(systemId, list9Class);
-
+
if (listGlid != null && listGlid.size() > 0) {
-
+
if (has9k9ID == null && !autoRule.isCalss9k9()) {
- // 闈�9k9鍏ュ簱瑙勫垯 鑻ュ晢鍝佷俊鎭彉鍖� 瀵瑰簲鐨勬爣绛炬牴鎹环鏍� 淇敼
+ // 闈�9k9鍏ュ簱瑙勫垯 鑻ュ晢鍝佷俊鎭彉鍖� 瀵瑰簲鐨勬爣绛炬牴鎹环鏍� 淇敼
LabelGoods labelGds = screen9K9(updateGoods, map);
if (labelGds != null) {
Label label9k = labelGds.getLabel();
Long id = label9k.getId();
-
+
long existence = labelGoodsMapper.isExistence(systemId, id);
if (existence <= 0) {
// 涓嶅瓨鍦ㄥ搴旀爣绛�
listLabelAdd.add(labelGds);
} else {
// 宸插瓨鍦�
- has9k9ID = id;
+ has9k9ID = id;
}
}
}
-
-
+
// 娓呯┖ 9K9绯诲垪鏍囩
for (LabelGoods labelGoods : listGlid) {
Label label = labelGoods.getLabel();
if (has9k9ID != null && has9k9ID.equals(label.getId())) {
continue;
}
-
+
list9ClassDelete.add(labelGoods.getId());
}
}
}
-
+
} else {
newGoodsBrief.setId(null);
newGoodsBrief.setState(0); // 鐘舵�佸惎鐢�
@@ -872,19 +865,20 @@
// 璐翠笂鏍囩
if (listLabs != null && listLabs.size() > 0) {
-
+
for (Label label : listLabs) {
-
- // 鍖呭惈 9.9/19.9/29.9/49.9 銆佸悓鏃舵潵婧愭窐瀹濇帹鑽�: 鐢变簬鑾峰彇璇︽儏涓庢帹鑽愭帴鍙ｇ殑鍒镐俊鎭瓨鍦ㄥ嚭鍏� 浠ユ渶鍚庤鎯呬负鍑�
- if (list9Class.contains(label.getId()) && autoRule.isCalss9k9() &&
- QualityFactory.SOURCE_TAOBAO_MATERIAL == autoRule.getGoodsSource()) {
- /* 鍔犲叆瀵瑰簲鐨�9.9/19.9/29.9/49.9 鏍囩*/
+
+ // 鍖呭惈 9.9/19.9/29.9/49.9 銆佸悓鏃舵潵婧愭窐瀹濇帹鑽�: 鐢变簬鑾峰彇璇︽儏涓庢帹鑽愭帴鍙ｇ殑鍒镐俊鎭瓨鍦ㄥ嚭鍏�
+ // 浠ユ渶鍚庤鎯呬负鍑�
+ if (list9Class.contains(label.getId()) && autoRule.isCalss9k9()
+ && QualityFactory.SOURCE_TAOBAO_MATERIAL == autoRule.getGoodsSource()) {
+ /* 鍔犲叆瀵瑰簲鐨�9.9/19.9/29.9/49.9 鏍囩 */
LabelGoods labelGds = screen9K9(newGoodsBrief, map);
-
+
if (labelGds != null) {
listLabelAdd.add(labelGds);
}
-
+
} else {
// 璐翠笂鏂版爣绛�
LabelGoods lg = new LabelGoods();
@@ -894,9 +888,9 @@
lg.setTaoBaoGoodsBrief(newGoodsBrief);
listLabelAdd.add(lg);
}
-
+
}
-
+
}
}
}
@@ -1027,29 +1021,29 @@
// 鏌ヨ宸插瓨鍦ㄦ樉绀洪檺鏃舵姠璐殑鍟嗗搧
List<QualityFlashSale> listQuery = qualityFlashSaleService.listQueryByQualityID(listQFId);
-
+
if (listQuery == null || listQuery.size() == 0) {
// 鍏ㄩ儴鏂板鍏ュ簱
int i = 0;
for (Long qfId : listQFId) {
listFlashSale.add(getNewQualityFlashSale(qfId, i, startWeight, endWeight, goodsSource));
}
-
+
} else {
int i = 0;
boolean exist = false;
-
+
for (Long qfId : listQFId) {
-
+
for (QualityFlashSale flashSale : listQuery) {
QualityFactory qualityFactory = flashSale.getQualityFactory();
-
+
if (qfId.equals(qualityFactory.getId())) {
exist = true;
- //鍗冲皢鍑嗗鏃堕棿娈垫椂闂�
- //int nowType = qualityFlashSaleService.getQueryType();
- //flashSale.setType(nowType);
+ // 鍗冲皢鍑嗗鏃堕棿娈垫椂闂�
+ // int nowType = qualityFlashSaleService.getQueryType();
+ // flashSale.setType(nowType);
double weight = startWeight + (Math.random() * ((endWeight - startWeight) + 1));
flashSale.setWeight(weight);
@@ -1064,7 +1058,7 @@
listFlashSale.add(getNewQualityFlashSale(qfId, i, startWeight, endWeight, goodsSource));
}
}
-
+
}
// 鎻掑叆闄愭椂鎶㈣喘
@@ -1102,8 +1096,8 @@
flashSale.setWeight(weight);
}
- //int nowType = qualityFlashSaleService.getNowType();
- //flashSale.setType(nowType);
+ // int nowType = qualityFlashSaleService.getNowType();
+ // flashSale.setType(nowType);
flashSale.setCreatetime(new Date());
flashSale.setUpdatetime(new Date());
@@ -1315,4 +1309,10 @@
return lg;
}
+ @Override
+ public List<QualityFactory> listByMinSalesCountOrderByCreateTimeDesc(int salesCount, int page, int pageSize) {
+ return qualityFactoryMapper.listByMinSalesCountOrderByCreateTimeDesc(salesCount, (page - 1) * pageSize,
+ pageSize);
+ }
+
}
--
Gitblit v1.8.0