From 1da9a96fd9f1031d81d5d829a2df18fd4ac5abd1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Jun 2021 14:42:48 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
index 805507b..9e9985a 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
@@ -68,7 +68,7 @@
         scoreGoodsCategory.setParentId(model.getParentId());
         scoreGoodsCategory.setCreatedBy(model.getCreatedBy());
         scoreGoodsCategory.setCreatedTime(model.getCreatedTime());
-        scoreGoodsCategoryMapper.insert(scoreGoodsCategory);
+        scoreGoodsCategoryMapper.insertSelective(scoreGoodsCategory);
         return scoreGoodsCategory.getId();
     }
 
@@ -116,15 +116,15 @@
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         ScoreGoods scoreGoods = objectMapper.convertValue(model, ScoreGoods.class);
         scoreGoods.setDelFlag(Convert.toShort(Constants.DEL_NOT_FLAG));
-        scoreGoodsMapper.insert(scoreGoods);
+        scoreGoodsMapper.insertSelective(scoreGoods);
         //样式信息
-        List<ScoreGoodsStyleDto> scoreGoodsStyleDtos = model.getScoreGoodsStyleDtos();
+        List<ScoreGoodsStyleDto> scoreGoodsStyleDtos = model.getScoreGoodsStyles();
         if(CollUtil.isNotEmpty(scoreGoodsStyleDtos)){
             for(ScoreGoodsStyleDto scoreGoodsStyleDto : scoreGoodsStyleDtos){
                 ScoreGoodsStyle scoreGoodsStyle = objectMapper.convertValue(scoreGoodsStyleDto, ScoreGoodsStyle.class);
                 scoreGoodsStyle.setGoodsId(scoreGoods.getId());
                 scoreGoodsStyle.setDelFlag(Convert.toShort(Constants.DEL_NOT_FLAG));
-                scoreGoodsStyleMapper.insert(scoreGoodsStyle);
+                scoreGoodsStyleMapper.insertSelective(scoreGoodsStyle);
                 //规格信息
                 List<ScoreGoodsSkuDto> scoreGoodsSkuDtos = scoreGoodsStyleDto.getScoreGoodsSkus();
                 if(CollUtil.isNotEmpty(scoreGoodsSkuDtos)){
@@ -133,7 +133,7 @@
                         scoreGoodsSku.setGoodsId(scoreGoods.getId());
                         scoreGoodsSku.setStyleId(scoreGoodsStyle.getId());
                         scoreGoodsSku.setDelFlag(Convert.toShort(Constants.DEL_NOT_FLAG));
-                        scoreGoodsSkuMapper.insert(scoreGoodsSku);
+                        scoreGoodsSkuMapper.insertSelective(scoreGoodsSku);
                     }
                 }
             }
@@ -184,6 +184,7 @@
             ObjectMapper objectMapper = new ObjectMapper();
             objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
             viewGoodsVo = objectMapper.convertValue(scoreGoods, ViewGoodsVo.class);
+//            viewGoodsVo.setCreateTime(scoreGoods.getCreatedTime().toString());
             //轮播图
             List<String> goodsImages = scoreGoodsImagesMapper.selectScoreGoodsImagesByGoodsId(id);
             viewGoodsVo.setGoodsImages(goodsImages);
@@ -223,24 +224,34 @@
                 scoreGoodsImages.setImageUrl(goodImage);
                 scoreGoodsImages.setGoodsId(scoreGoods.getId());
                 scoreGoodsImages.setDelFlag(Convert.toShort(Constants.DEL_NOT_FLAG));
-                scoreGoodsImagesMapper.insert(scoreGoodsImages);
+                scoreGoodsImagesMapper.insertSelective(scoreGoodsImages);
             }
         }
 
         List<ScoreGoodsStyleDto> scoreGoodsStyleDtos = model.getScoreGoodsStyles();
         if(CollUtil.isNotEmpty(scoreGoodsStyleDtos)){
+            Example exampleStyle = new Example(ScoreGoodsStyle.class);
+            Example.Criteria criteriaStyle = exampleStyle.createCriteria();
+            criteriaStyle.andEqualTo("goodsId",scoreGoods.getId());
+            scoreGoodsStyleMapper.deleteByExample(exampleImages);
+
+            Example exampleSku = new Example(ScoreGoodsSku.class);
+            Example.Criteria criteriaSku = exampleSku.createCriteria();
+            criteriaSku.andEqualTo("goodsId",scoreGoods.getId());
+            scoreGoodsSkuMapper.deleteByExample(exampleImages);
+
             for(ScoreGoodsStyleDto scoreGoodsStyleDto : scoreGoodsStyleDtos){
                 ScoreGoodsStyle scoreGoodsStyle = new ScoreGoodsStyle();
                 scoreGoodsStyle.setId(scoreGoodsStyleDto.getId());
                 scoreGoodsStyle.setName(scoreGoodsStyleDto.getName());
                 scoreGoodsStyle.setGoodsId(scoreGoods.getId());
-                scoreGoodsStyleMapper.updateByPrimaryKeySelective(scoreGoodsStyle);
+                scoreGoodsStyleMapper.insertSelective(scoreGoodsStyle);
                 //规格
                 List<ScoreGoodsSkuDto> scoreGoodsSkuDtos = scoreGoodsStyleDto.getScoreGoodsSkus();
                 if(CollUtil.isNotEmpty(scoreGoodsSkuDtos)){
                     for(ScoreGoodsSkuDto scoreGoodsSkuDto : scoreGoodsSkuDtos){
                         ScoreGoodsSku scoreGoodsSku = objectMapper.convertValue(scoreGoodsSkuDto, ScoreGoodsSku.class);
-                        scoreGoodsSkuMapper.updateByPrimaryKey(scoreGoodsSku);
+                        scoreGoodsSkuMapper.insertSelective(scoreGoodsSku);
                     }
                 }
             }
@@ -306,6 +317,8 @@
         dto.setId(id);
         List<XcxGoodsListVo> list = scoreGoodsMapper.selectXcxGoodsList(dto);
 
+        List<String> images = scoreGoodsImagesMapper.selectScoreGoodsImagesByGoodsId(id);
+        data.setImages(images);
         if (CollUtil.isNotEmpty(list)) {
             data.setQuantity(list.get(0).getQuantity());
             data.setStock(list.get(0).getStock());

--
Gitblit v1.9.1