From db6e3801edd11e48990cb04d91d6bf0dadef4224 Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Sun, 20 Dec 2020 21:53:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=85=91=E6=8D=A2=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E5=BC=80=E5=90=AF=E3=80=82=E5=8F=8A=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=20todo=20=E4=B8=8B=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=B1=BB=E5=9E=8B=EF=BC=8C=E6=98=AF=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E7=A7=AF=E5=88=86=E3=80=82=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7=EF=BC=8C=E4=B8=8D=E8=BF=94=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E8=AE=A1=E7=AE=97=E4=BD=A3=E9=87=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/YxStoreProductServiceImpl.java       | 11 +++++++++++
 1 file changed, 11 insertions(+)

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 db1d60e6..cec4b18f 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,6 +235,7 @@ 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()) &&
@@ -411,6 +412,7 @@ 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
@@ -679,6 +681,7 @@ 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()
@@ -699,6 +702,7 @@ 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());
                 }
             }
 
@@ -830,6 +834,13 @@ 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", "拼团价");