From 10d4db2163e448853edbbb69ff507038a4d05874 Mon Sep 17 00:00:00 2001
From: rh <3462644232@qq.com>
Date: Mon, 2 Dec 2024 20:44:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96-=E6=8F=90=E4=BA=A41?=
 =?UTF-8?q?2.02?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 muyu-gateway/src/main/resources/bootstrap.yml            | 2 +-
 .../muyu/service/impl/ActivityTeamInfoServiceImpl.java   | 3 ++-
 .../impl/ActivityTeamProductSkuInfoServiceImpl.java      | 2 --
 .../domain/model/TemplateAttributeGroupModel.java        | 1 -
 .../product/service/impl/AttributeGroupServiceImpl.java  | 1 +
 .../muyu/shop/cart/service/impl/CartInfoServiceImpl.java | 9 +--------
 6 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/muyu-gateway/src/main/resources/bootstrap.yml b/muyu-gateway/src/main/resources/bootstrap.yml
index c2866f8..2b05616 100644
--- a/muyu-gateway/src/main/resources/bootstrap.yml
+++ b/muyu-gateway/src/main/resources/bootstrap.yml
@@ -35,7 +35,7 @@ spring:
       datasource:
         ds1:
           nacos:
-            server-addr: 127.0.0.1:8848
+            server-addr: 60.204.152.212:8848
             dataId: sentinel-muyu-gateway
             groupId: DEFAULT_GROUP
             data-type: json
diff --git a/muyu-modules/muyu-actives/active-server/src/main/java/com/muyu/service/impl/ActivityTeamInfoServiceImpl.java b/muyu-modules/muyu-actives/active-server/src/main/java/com/muyu/service/impl/ActivityTeamInfoServiceImpl.java
index 1972ea9..cb71531 100644
--- a/muyu-modules/muyu-actives/active-server/src/main/java/com/muyu/service/impl/ActivityTeamInfoServiceImpl.java
+++ b/muyu-modules/muyu-actives/active-server/src/main/java/com/muyu/service/impl/ActivityTeamInfoServiceImpl.java
@@ -35,7 +35,8 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
                 ActivityTeamInfo::getName,
                 activityTeamInfoQueryModel.getKeyWord()
         );
-        queryWrapper.like(StringUtils.isNotEmpty(activityTeamInfoQueryModel.getStatus()),
+        queryWrapper.like(StringUtils.isNotEmpty(
+                activityTeamInfoQueryModel.getStatus()),
                 ActivityTeamInfo::getStatus,
                 activityTeamInfoQueryModel.getStatus()
                 );
diff --git a/muyu-modules/muyu-actives/active-server/src/main/java/com/muyu/service/impl/ActivityTeamProductSkuInfoServiceImpl.java b/muyu-modules/muyu-actives/active-server/src/main/java/com/muyu/service/impl/ActivityTeamProductSkuInfoServiceImpl.java
index 9902f75..353a66e 100644
--- a/muyu-modules/muyu-actives/active-server/src/main/java/com/muyu/service/impl/ActivityTeamProductSkuInfoServiceImpl.java
+++ b/muyu-modules/muyu-actives/active-server/src/main/java/com/muyu/service/impl/ActivityTeamProductSkuInfoServiceImpl.java
@@ -1,5 +1,4 @@
 package com.muyu.service.impl;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.active.domain.ActivityTeamProductSkuInfo;
@@ -13,7 +12,6 @@ import com.muyu.service.ActivityTeamProductSkuInfoService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Optional;
diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/TemplateAttributeGroupModel.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/TemplateAttributeGroupModel.java
index 3258cc8..abd2061 100644
--- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/TemplateAttributeGroupModel.java
+++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/TemplateAttributeGroupModel.java
@@ -37,7 +37,6 @@ public class TemplateAttributeGroupModel extends BaseEntity {
 
     /**
      * 是否有效
-     * @return
      */
     public boolean isEffective(){
         return StringUtils.isNotEmpty(groupName) && attributeList != null && !attributeList.isEmpty();
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java
index 441776e..5f9981d 100644
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java
@@ -118,6 +118,7 @@ public class AttributeGroupServiceImpl extends ServiceImpl<AttributeGroupMapper,
         queryWrapper.eq(AsAttributeGroup::getGroupId, id);
 
         List<AsAttributeGroup> asAttributeGroupList = asAttributeGroupService.list(queryWrapper);
+
         List<Long> attributeIdList = asAttributeGroupList.stream()
                 .map(AsAttributeGroup::getAttributeId)
                 .toList();
diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/service/impl/CartInfoServiceImpl.java b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/service/impl/CartInfoServiceImpl.java
index 1c672e3..105ed81 100644
--- a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/service/impl/CartInfoServiceImpl.java
+++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/service/impl/CartInfoServiceImpl.java
@@ -73,27 +73,21 @@ public class CartInfoServiceImpl extends ServiceImpl<CartInfoMapper, CartInfo>
     public List<CartInfo> list(CartInfo cartInfo) {
         LambdaQueryWrapper<CartInfo> queryWrapper = new LambdaQueryWrapper<>();
 
-
         if (ObjUtils.notNull(cartInfo.getProjectId())){
             queryWrapper.eq(CartInfo::getProjectId, cartInfo.getProjectId());
         }
-
         if (ObjUtils.notNull(cartInfo.getProjectSku())){
             queryWrapper.eq(CartInfo::getProjectSku, cartInfo.getProjectSku());
         }
-
         if (ObjUtils.notNull(cartInfo.getUserId())){
             queryWrapper.eq(CartInfo::getUserId, cartInfo.getUserId());
         }
-
-        if (ObjUtils.notNull(cartInfo.getNum())){
+        if (ObjUtils.notNull(cartInfo.getNum())) {
             queryWrapper.eq(CartInfo::getNum, cartInfo.getNum());
         }
-
         if (ObjUtils.notNull(cartInfo.getIsSelected())){
             queryWrapper.eq(CartInfo::getIsSelected, cartInfo.getIsSelected());
         }
-
         return list(queryWrapper);
     }
 
@@ -145,7 +139,6 @@ public class CartInfoServiceImpl extends ServiceImpl<CartInfoMapper, CartInfo>
 
     /**
      * 获取购物车详情
-     *
      * @return 购物车详情
      */
     @Override