From 9c20f268e0628017d09427989724cdf2a8e9e8e2 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 19 九月 2023 12:47:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java | 91 ++++++++++++++++++++++++---------------------
1 files changed, 48 insertions(+), 43 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
index e7d9dc1..f0ba93b 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
@@ -22,6 +22,7 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -313,7 +314,6 @@
}
public static boolean IS_RUNNING = false;
@Override
- @Transactional
@Async
public void dealBaseData() {
if(IS_RUNNING){
@@ -350,48 +350,7 @@
OssModel ossModel = initOssModel();
Date date = new Date();
for(BaseData data : allLis){
- BaseGoods goods = new BaseGoods();
- goods.setBaseDataId(data.getId());
- goods.setIsdeleted(Constants.ZERO);
- if(baseGoodsMapper.selectCount(new QueryWrapper<>(goods)) >0){
- //濡傛灉宸茬粡瀛樺湪锛岄�昏緫鍒犻櫎鏃х殑鍟嗗搧鏁版嵁
- UpdateWrapper<BaseGoods> updateModel = new UpdateWrapper<>();
- updateModel.lambda().set(BaseGoods::getIsdeleted,Constants.ONE);
- updateModel.lambda().set(BaseGoods::getEditDate, new Date());
- updateModel.lambda().eq(BaseGoods::getBaseDataId, data.getId());
- baseGoodsMapper.update(null, updateModel);
- }
- goods.setCreateDate(date);
- goods.setName(StringUtils.defaultString(data.getName(),data.getTitle()));
- goods.setRemark(data.getTitle());
- goods.setContent(data.getTitle());
- goods.setStatus(Constants.ZERO);
- goods.setShortPinyin(PinYinUtil.getFirstSpell(goods.getName()));
- goods.setPinyin(PinYinUtil.getFullSpell(goods.getName()));
- goods.setZdPrice(data.getPrice());
- //澶勭悊鍝佺墝鏁版嵁
- Brand bModel = getBrandModelFromList(data.getBrand(),brandList);
- if(bModel!= null){
- goods.setBrandId(bModel.getId());
- }
- //澶勭悊鍒楄〃鏁版嵁
- BaseCategory cModel = getCateModelFromList(rate,data.getCategory(),ossModel,data.getCategoryImg(), cateList);
- if(cModel!= null){
- goods.setCategoryId(cModel.getId());
- }
- goods.setImgurl(getOssImgurl(ossModel,ossModel.getGoodsFolder(), data.getImgurl()));
- goods.setPrice(Constants.formatBigdecimal(data.getSaleprice()).multiply(Constants.formatBigdecimal(cModel.getPriceRate())));
- //鎻掑叆鏂板晢鍝佹暟鎹�
- baseGoodsMapper.insert(goods);
- //澶勭悊鍒嗙被灞炴��
- dealCateParamAll(cModel.getId(),goods.getId(),data,paramList);
- //澶勭悊鑳屾櫙鍥�
- dealBgImgAll(ossModel,goods.getId(),data);
-
- data.setEditDate(new Date());
- data.setStatus(Constants.ONE);
- //鏇存柊鏁版嵁澶勭悊鐘舵��
- baseDataMapper.updateById(data);
+ dealPerData(ossModel,rate,date,data,cateList,brandList,paramList);
}
log.info("寮�濮嬪鐞嗘簮鏁版嵁=================success================澶勭悊鏁版嵁鍏憋紙"+allLis.size()+"锛変釜===");
}catch (Exception e){
@@ -403,6 +362,52 @@
}
}
+ @Transactional(isolation = Isolation.READ_UNCOMMITTED)
+ private void dealPerData(OssModel ossModel, BigDecimal rate, Date date, BaseData data, List<BaseCategory> cateList, List<Brand> brandList, List<BaseCateParam> paramList) {
+ BaseGoods goods = new BaseGoods();
+ goods.setBaseDataId(data.getId());
+ goods.setIsdeleted(Constants.ZERO);
+ if(baseGoodsMapper.selectCount(new QueryWrapper<>(goods)) >0){
+ //濡傛灉宸茬粡瀛樺湪锛岄�昏緫鍒犻櫎鏃х殑鍟嗗搧鏁版嵁
+ UpdateWrapper<BaseGoods> updateModel = new UpdateWrapper<>();
+ updateModel.lambda().set(BaseGoods::getIsdeleted,Constants.ONE);
+ updateModel.lambda().set(BaseGoods::getEditDate, new Date());
+ updateModel.lambda().eq(BaseGoods::getBaseDataId, data.getId());
+ baseGoodsMapper.update(null, updateModel);
+ }
+ goods.setCreateDate(date);
+ goods.setName(StringUtils.defaultString(data.getName(),data.getTitle()));
+ goods.setRemark(data.getTitle());
+ goods.setContent(data.getTitle());
+ goods.setStatus(Constants.ZERO);
+ goods.setShortPinyin(PinYinUtil.getFirstSpell(goods.getName()));
+ goods.setPinyin(PinYinUtil.getFullSpell(goods.getName()));
+ goods.setZdPrice(data.getPrice());
+ //澶勭悊鍝佺墝鏁版嵁
+ Brand bModel = getBrandModelFromList(data.getBrand(),brandList);
+ if(bModel!= null){
+ goods.setBrandId(bModel.getId());
+ }
+ //澶勭悊鍒楄〃鏁版嵁
+ BaseCategory cModel = getCateModelFromList(rate,data.getCategory(),ossModel,data.getCategoryImg(), cateList);
+ if(cModel!= null){
+ goods.setCategoryId(cModel.getId());
+ }
+ goods.setImgurl(getOssImgurl(ossModel,ossModel.getGoodsFolder(), data.getImgurl()));
+ goods.setPrice(Constants.formatBigdecimal(data.getSaleprice()).multiply(Constants.formatBigdecimal(cModel.getPriceRate())));
+ //鎻掑叆鏂板晢鍝佹暟鎹�
+ baseGoodsMapper.insert(goods);
+ //澶勭悊鍒嗙被灞炴��
+ dealCateParamAll(cModel.getId(),goods.getId(),data,paramList);
+ //澶勭悊鑳屾櫙鍥�
+ dealBgImgAll(ossModel,goods.getId(),data);
+
+ data.setEditDate(new Date());
+ data.setStatus(Constants.ONE);
+ //鏇存柊鏁版嵁澶勭悊鐘舵��
+ baseDataMapper.updateById(data);
+ }
+
private void dealBgImgAll(OssModel ossModel, Integer id, BaseData data) {
int i =0;
--
Gitblit v1.9.3