From ef71e86874e182aa4d49a32d991ab8b5e82bf9c4 Mon Sep 17 00:00:00 2001
From: taozi <552920369@qq.com>
Date: Thu, 17 Dec 2020 21:44:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=BA=E4=B8=B0=E8=BD=A8=E8=BF=B9=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/config/application-prod.yml    |  2 --
 .../service/impl/YxStoreProductServiceImpl.java       | 11 -----------
 2 files changed, 13 deletions(-)

diff --git a/yshop-admin/src/main/resources/config/application-prod.yml b/yshop-admin/src/main/resources/config/application-prod.yml
index 14d2f22c..884c8d2d 100644
--- a/yshop-admin/src/main/resources/config/application-prod.yml
+++ b/yshop-admin/src/main/resources/config/application-prod.yml
@@ -92,5 +92,3 @@ file:
   # 文件大小 /M
   maxSize: 100
   avatarMaxSize: 5
-
-
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
index cec4b18f..db1d60e6 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
@@ -235,7 +235,6 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
         LambdaQueryWrapper<YxStoreProduct> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(YxStoreProduct::getIsShow, CommonEnum.SHOW_STATUS_1.getValue());
         wrapper.eq(YxStoreProduct::getIsDel, CommonEnum.DEL_STATUS_0.getValue());
-//        wrapper.eq(YxStoreProduct::getIsIntegral, CommonEnum.SHOW_STATUS_1.getValue());
 
         //多字段模糊查询分类搜索
         if (StrUtil.isNotBlank(productQueryParam.getSid()) &&
@@ -412,7 +411,6 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
 
        LambdaQueryWrapper<YxStoreProduct> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(YxStoreProduct::getIsShow, ShopCommonEnum.SHOW_1.getValue())
-//                .eq(YxStoreProduct::getIsIntegral,CommonEnum.SHOW_STATUS_1.getValue())
                 .orderByDesc(YxStoreProduct::getSort);
 
         // order
@@ -681,7 +679,6 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
             valueMap.put("seckill_price", 0);
             valueMap.put("pink_stock", 0);
             valueMap.put("seckill_stock", 0);
-            valueMap.put("integral", 0);
             if (id > 0) {
                 YxStoreProductAttrValue storeProductAttrValue = yxStoreProductAttrValueService
                         .getOne(Wrappers.<YxStoreProductAttrValue>lambdaQuery()
@@ -702,7 +699,6 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
                     valueMap.put("seckill_price", storeProductAttrValue.getSeckillPrice());
                     valueMap.put("pink_stock", storeProductAttrValue.getPinkStock());
                     valueMap.put("seckill_stock", storeProductAttrValue.getSeckillStock());
-                    valueMap.put("integral", storeProductAttrValue.getIntegral());
                 }
             }
 
@@ -834,13 +830,6 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
         headerMap.put("slot", "volume");
         headerMap.put("align", align);
         headerMap.put("minWidth", 140);
-        headerMapList.add(ObjectUtil.clone(headerMap));
-
-        headerMap.put("title", "所需兑换积分");
-        headerMap.put("slot", "integral");
-        headerMap.put("align", align);
-        headerMap.put("minWidth", 140);
-        headerMapList.add(ObjectUtil.clone(headerMap));
 
         if (isActivity) {
             headerMap.put("title", "拼团价");