From e401f7c309b314555500212aa2e1ab9fcef5d292 Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Mon, 24 Aug 2020 11:23:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E6=B7=BB=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0sku?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/domain/YxStoreCombination.java   |  3 --
 .../impl/YxStoreCombinationServiceImpl.java   | 33 ++++++++++++++++++-
 .../activity/vo/StoreCombinationVo.java       |  1 +
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java
index 882c4415..0d003dc8 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java
@@ -62,9 +62,6 @@ public class YxStoreCombination extends BaseDomain {
     private String title;
 
 
-    /** 活动属性 */
-    private String attr;
-
 
     /** 参团人数 */
     @NotNull(message = "请输入拼团人数")
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java
index 485a769c..a09d120d 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java
@@ -11,12 +11,16 @@ package co.yixiang.modules.activity.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import co.yixiang.api.YshopException;
 import co.yixiang.common.service.impl.BaseServiceImpl;
 import co.yixiang.common.utils.QueryHelpPlus;
 import co.yixiang.dozer.service.IGenerator;
 import co.yixiang.enums.ShopCommonEnum;
 import co.yixiang.enums.SpecTypeEnum;
+import co.yixiang.exception.BadRequestException;
 import co.yixiang.modules.activity.domain.YxStoreCombination;
 import co.yixiang.modules.activity.domain.YxStorePink;
 import co.yixiang.modules.activity.domain.YxStoreVisit;
@@ -36,7 +40,10 @@ import co.yixiang.modules.product.service.YxStoreProductReplyService;
 import co.yixiang.modules.product.service.dto.FromatDetailDto;
 import co.yixiang.modules.product.service.dto.ProductFormatDto;
 import co.yixiang.modules.product.service.dto.ProductResultDto;
+import co.yixiang.modules.template.domain.YxShippingTemplates;
+import co.yixiang.modules.template.service.YxShippingTemplatesService;
 import co.yixiang.utils.FileUtil;
+import co.yixiang.utils.RedisUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageInfo;
@@ -84,6 +91,8 @@ public class YxStoreCombinationServiceImpl extends BaseServiceImpl<YxStoreCombin
     private YxStoreProductAttrService yxStoreProductAttrService;
     @Autowired
     private YxStoreProductAttrValueService yxStoreProductAttrValueService;
+    @Autowired
+    private YxShippingTemplatesService shippingTemplatesService;
 
 
     /**
@@ -149,6 +158,8 @@ public class YxStoreCombinationServiceImpl extends BaseServiceImpl<YxStoreCombin
         if(storeCombination == null){
             throw new YshopException("拼团不存在或已下架");
         }
+        //获取商品sku
+        Map<String, Object> returnMap = yxStoreProductAttrService.getProductAttrDetail(storeCombination.getProductId());
 
         YxStoreCombinationQueryVo storeCombinationQueryVo = generator.convert(storeCombination,
                 YxStoreCombinationQueryVo.class);
@@ -157,13 +168,33 @@ public class YxStoreCombinationServiceImpl extends BaseServiceImpl<YxStoreCombin
 
         storeCombinationVo.setStoreInfo(storeCombinationQueryVo);
 
-
+        //评价
         storeCombinationVo.setReply(replyService
                 .getReply(storeCombinationQueryVo.getProductId()));
         int replyCount = replyService.productReplyCount(storeCombinationQueryVo.getProductId());
+        //总条数
         storeCombinationVo.setReplyCount(replyCount);
+        //好评比例
         storeCombinationVo.setReplyChance(replyService.replyPer(storeCombinationQueryVo.getProductId()));
 
+        //获取运费模板名称
+        String storeFreePostage = RedisUtil.get("store_free_postage");
+        String tempName = "";
+        if(StrUtil.isBlank(storeFreePostage)
+                || !NumberUtil.isNumber(storeFreePostage)
+                || Integer.valueOf(storeFreePostage) == 0){
+            tempName = "全国包邮";
+        }else{
+            YxShippingTemplates shippingTemplates = shippingTemplatesService.getById(storeCombination.getTempId());
+            if(ObjectUtil.isNotNull(shippingTemplates)){
+                tempName = shippingTemplates.getName();
+            }else {
+                throw new BadRequestException("请配置运费模板");
+            }
+
+        }
+        storeCombinationVo.setTempName(tempName);
+
         PinkAllDto pinkAllDto = storePinkService.getPinkAll(id);
         storeCombinationVo.setPindAll(pinkAllDto.getPindAll());
         storeCombinationVo.setPink(pinkAllDto.getList());
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreCombinationVo.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreCombinationVo.java
index f325399b..41d14d74 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreCombinationVo.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreCombinationVo.java
@@ -36,6 +36,7 @@ public class StoreCombinationVo implements Serializable {
 
     private Boolean userCollect = false;
 
+    private String tempName;
 
 
 }