From 39d662fce3e49dfb5ff8606934f82dcfbdc03264 Mon Sep 17 00:00:00 2001
From: yovinchen <gzh298255@gmail.com>
Date: Wed, 20 Sep 2023 16:49:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=BC=98=E6=83=A0=E7=BC=96?=
 =?UTF-8?q?=E5=86=99=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                            |  13 +-
 .idea/dataSources.xml                         |   8 ++
 .idea/encodings.xml                           |   6 +
 .idea/misc.xml                                |   5 +
 .../atguigu/ssyx/enums/CouponRangeType.java   |   5 +-
 .../client/product/ProductFeignClient.java    |  23 ++-
 .../src/main/resources/application.yml        |   6 +-
 .../controller/CouponInfoController.java      |  86 +++++++++++-
 .../activity/mapper/CouponRangeMapper.java    |   2 +
 .../activity/service/CouponInfoService.java   |  45 ++++++
 .../service/impl/CouponInfoServiceImpl.java   | 132 ++++++++++++++++++
 .../src/main/resources/application.yml        |   6 +-
 .../product/api/ProductInnnerController.java  |   6 +
 .../src/main/resources/application.yml        |   4 +-
 .../src/main/resources/application.yml        |   4 +-
 .../src/main/resources/application.yml        |   4 +-
 16 files changed, 331 insertions(+), 24 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index e57d138..4cb390d 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -7,11 +7,15 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="service-sys" />
         <module name="common-util" />
+        <module name="service-product-client" />
+        <module name="rabbit_util" />
+        <module name="service-product" />
+        <module name="service-sys" />
+        <module name="service-search" />
         <module name="model" />
         <module name="service-util" />
-        <module name="service-product" />
+        <module name="service-activity" />
         <module name="service-acl" />
       </profile>
     </annotationProcessing>
@@ -20,9 +24,14 @@
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
       <module name="common-util" options="-parameters" />
       <module name="model" options="-parameters" />
+      <module name="rabbit_util" options="-parameters" />
       <module name="service" options="" />
       <module name="service-acl" options="-parameters" />
+      <module name="service-activity" options="-parameters" />
+      <module name="service-client" options="" />
       <module name="service-product" options="-parameters" />
+      <module name="service-product-client" options="-parameters" />
+      <module name="service-search" options="-parameters" />
       <module name="service-sys" options="-parameters" />
       <module name="service-util" options="-parameters" />
     </option>
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index 2187d97..226ecd6 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -9,5 +9,13 @@
       <jdbc-url>jdbc:mysql://82.157.68.223:3306/shequ-sys</jdbc-url>
       <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
+    <data-source source="LOCAL" name="shequ-activity" uuid="1c34518c-82bb-48b3-b7d8-91da7dfdba8d">
+      <driver-ref>mysql.8</driver-ref>
+      <synchronize>true</synchronize>
+      <remarks>shequ-activity</remarks>
+      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://82.157.68.223:3306/shequ-activity</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 9c036bc..171d535 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -2,12 +2,18 @@
 <project version="4">
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$/guigu-ssyx-parent/common/common-util/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/guigu-ssyx-parent/common/rabbit_util/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/guigu-ssyx-parent/common/service-util/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/guigu-ssyx-parent/common/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/guigu-ssyx-parent/common/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/guigu-ssyx-parent/model/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/guigu-ssyx-parent/service-client/service-product-client/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/guigu-ssyx-parent/service-client/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/guigu-ssyx-parent/service-client/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/guigu-ssyx-parent/service/service-acl/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/guigu-ssyx-parent/service/service-activity/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/guigu-ssyx-parent/service/service-product/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/guigu-ssyx-parent/service/service-search/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/guigu-ssyx-parent/service/service-sys/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/guigu-ssyx-parent/service/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/guigu-ssyx-parent/service/src/main/resources" charset="UTF-8" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 661e6c6..51f278f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,9 @@
 <project version="4">
+  <component name="EntryPointsManager">
+    <list size="1">
+      <item index="0" class="java.lang.String" itemvalue="org.springframework.beans.factory.annotation.Autowired" />
+    </list>
+  </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="FindBugsConfigurable">
     <option name="make" value="true" />
diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/CouponRangeType.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/CouponRangeType.java
index aaeb844..123f1a6 100644
--- a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/CouponRangeType.java
+++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/CouponRangeType.java
@@ -10,12 +10,11 @@ public enum CouponRangeType {
     CATEGORY(3, "分类");
 
     @EnumValue
-    private Integer code;
-    private String comment;
+    private final Integer code;
+    private final String comment;
 
     CouponRangeType(Integer code, String comment) {
         this.code = code;
         this.comment = comment;
     }
-
 }
diff --git a/guigu-ssyx-parent/service-client/service-product-client/src/main/java/com/atguigu/ssyx/client/product/ProductFeignClient.java b/guigu-ssyx-parent/service-client/service-product-client/src/main/java/com/atguigu/ssyx/client/product/ProductFeignClient.java
index 2063009..11a03ca 100644
--- a/guigu-ssyx-parent/service-client/service-product-client/src/main/java/com/atguigu/ssyx/client/product/ProductFeignClient.java
+++ b/guigu-ssyx-parent/service-client/service-product-client/src/main/java/com/atguigu/ssyx/client/product/ProductFeignClient.java
@@ -5,6 +5,7 @@ import com.atguigu.ssyx.model.product.SkuInfo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
@@ -18,10 +19,22 @@ import java.util.List;
  */
 @FeignClient(value = "service-product")
 public interface ProductFeignClient {
-
+    /**
+     * 根据分类id获取分类信息
+     * \
+     *
+     * @param categoryId
+     * @return
+     */
     @GetMapping("/api/product/inner/getCategory/{categoryId}")
     Category getCategory(@PathVariable("categoryId") Long categoryId);
 
+    /**
+     * 根据skuId获取sku信息
+     *
+     * @param skuId
+     * @return
+     */
     @GetMapping("/api/product/inner/getSkuInfo/{skuId}")
     SkuInfo getSkuInfo(@PathVariable("skuId") Long skuId);
 
@@ -43,4 +56,12 @@ public interface ProductFeignClient {
     @GetMapping("/api/product/inner/findSkuInfoList")
     List<SkuInfo> findSkuInfoList(@RequestBody List<Long> skuIdList);
 
+    /**
+     * 批量获取分类信息
+     *
+     * @param categoryIdList
+     * @return
+     */
+    @PostMapping("/api/product/inner/findCategoryList")
+    List<Category> findCategoryList(@RequestBody List<Long> categoryIdList);
 }
diff --git a/guigu-ssyx-parent/service/service-acl/src/main/resources/application.yml b/guigu-ssyx-parent/service/service-acl/src/main/resources/application.yml
index 74dd1d2..e9aa979 100644
--- a/guigu-ssyx-parent/service/service-acl/src/main/resources/application.yml
+++ b/guigu-ssyx-parent/service/service-acl/src/main/resources/application.yml
@@ -6,6 +6,6 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: localhost:8848
-      username: nacos
-      password: nacos
+        server-addr: 82.157.68.223:8848
+        username: nacos
+        password: nacos
diff --git a/guigu-ssyx-parent/service/service-activity/src/main/java/com/atguigu/ssyx/activity/controller/CouponInfoController.java b/guigu-ssyx-parent/service/service-activity/src/main/java/com/atguigu/ssyx/activity/controller/CouponInfoController.java
index a05ef13..2cf7c79 100644
--- a/guigu-ssyx-parent/service/service-activity/src/main/java/com/atguigu/ssyx/activity/controller/CouponInfoController.java
+++ b/guigu-ssyx-parent/service/service-activity/src/main/java/com/atguigu/ssyx/activity/controller/CouponInfoController.java
@@ -1,8 +1,17 @@
 package com.atguigu.ssyx.activity.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.atguigu.ssyx.activity.service.CouponInfoService;
+import com.atguigu.ssyx.common.result.Result;
+import com.atguigu.ssyx.model.activity.CouponInfo;
+import com.atguigu.ssyx.vo.activity.CouponRuleVo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,8 +22,79 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-09-17
  */
 @RestController
-@RequestMapping("/activity/coupon-info")
+@CrossOrigin
+@RequestMapping("/admin/activity/couponInfo")
 public class CouponInfoController {
 
+    @Autowired
+    private CouponInfoService couponInfoService;
+
+    @ApiOperation(value = "获取分页列表")
+    @GetMapping("{page}/{limit}")
+    public Result index(
+            @ApiParam(name = "page", value = "当前页码", required = true) @PathVariable Long page,
+            @ApiParam(name = "limit", value = "每页记录数", required = true) @PathVariable Long limit) {
+        IPage<CouponInfo> pageModel = couponInfoService.selectPage(page, limit);
+        return Result.ok(pageModel);
+    }
+
+    @ApiOperation(value = "根据ID查询优惠券")
+    @GetMapping("get/{id}")
+    public Result get(@PathVariable Long id) {
+        CouponInfo couponInfo = couponInfoService.getCouponInfo(id);
+        return Result.ok(couponInfo);
+    }
+
+    @ApiOperation(value = "新增优惠券")
+    @PostMapping("save")
+    public Result save(@RequestBody CouponInfo couponInfo) {
+        couponInfoService.save(couponInfo);
+        return Result.ok(null);
+    }
+
+    @ApiOperation(value = "修改优惠券")
+    @PutMapping("update")
+    public Result updateById(@RequestBody CouponInfo couponInfo) {
+        couponInfoService.updateById(couponInfo);
+        return Result.ok(null);
+    }
+
+    @ApiOperation(value = "删除优惠券")
+    @DeleteMapping("remove/{id}")
+    public Result remove(@PathVariable String id) {
+        couponInfoService.removeById(id);
+        return Result.ok(null);
+    }
+
+    @ApiOperation(value = "根据id列表删除优惠券")
+    @DeleteMapping("batchRemove")
+    public Result batchRemove(@RequestBody List<String> idList) {
+        couponInfoService.removeByIds(idList);
+        return Result.ok(null);
+    }
+
+    @ApiOperation(value = "获取优惠券信息")
+    @GetMapping("findCouponRuleList/{id}")
+    public Result findActivityRuleList(@PathVariable Long id) {
+        return Result.ok(couponInfoService.findCouponRuleList(id));
+    }
+
+    @ApiOperation(value = "新增优惠券")
+    @PostMapping("saveCouponRule")
+    public Result saveCouponRule(@RequestBody CouponRuleVo couponRuleVo) {
+        couponInfoService.saveCouponRule(couponRuleVo);
+        return Result.ok(null);
+    }
+
+    /**
+     * 根据关键字获取sku列表，活动使用
+     *
+     * @param keyword
+     * @return
+     */
+    @GetMapping("findCouponByKeyword/{keyword}")
+    public Result findCouponByKeyword(@PathVariable("keyword") String keyword) {
+        return Result.ok(couponInfoService.findCouponByKeyword(keyword));
+    }
 }
 
diff --git a/guigu-ssyx-parent/service/service-activity/src/main/java/com/atguigu/ssyx/activity/mapper/CouponRangeMapper.java b/guigu-ssyx-parent/service/service-activity/src/main/java/com/atguigu/ssyx/activity/mapper/CouponRangeMapper.java
index d5424be..a639fcc 100644
--- a/guigu-ssyx-parent/service/service-activity/src/main/java/com/atguigu/ssyx/activity/mapper/CouponRangeMapper.java
+++ b/guigu-ssyx-parent/service/service-activity/src/main/java/com/atguigu/ssyx/activity/mapper/CouponRangeMapper.java
@@ -2,6 +2,7 @@ package com.atguigu.ssyx.activity.mapper;
 
 import com.atguigu.ssyx.model.activity.CouponRange;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author atguigu
  * @since 2023-09-17
  */
+@Repository
 public interface CouponRangeMapper extends BaseMapper<CouponRange> {
 
 }
diff --git a/guigu-ssyx-parent/service/service-activity/src/main/java/com/atguigu/ssyx/activity/service/CouponInfoService.java b/guigu-ssyx-parent/service/service-activity/src/main/java/com/atguigu/ssyx/activity/service/CouponInfoService.java
index 2421889..e8c6e43 100644
--- a/guigu-ssyx-parent/service/service-activity/src/main/java/com/atguigu/ssyx/activity/service/CouponInfoService.java
+++ b/guigu-ssyx-parent/service/service-activity/src/main/java/com/atguigu/ssyx/activity/service/CouponInfoService.java
@@ -1,8 +1,13 @@
 package com.atguigu.ssyx.activity.service;
 
 import com.atguigu.ssyx.model.activity.CouponInfo;
+import com.atguigu.ssyx.vo.activity.CouponRuleVo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 优惠券信息 服务类
@@ -13,4 +18,44 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface CouponInfoService extends IService<CouponInfo> {
 
+
+    /**
+     * 获取分页列表
+     *
+     * @param page
+     * @param limit
+     * @return
+     */
+    IPage<CouponInfo> selectPage(Long page, Long limit);
+
+    /**
+     * 根据ID查询优惠券
+     *
+     * @param id
+     * @return
+     */
+    CouponInfo getCouponInfo(Long id);
+
+    /**
+     * 根据优惠卷id获取优惠券规则列表
+     *
+     * @param id
+     * @return
+     */
+    Map<String, Object> findCouponRuleList(Long id);
+
+    /**
+     * 新增优惠券规则
+     *
+     * @param couponRuleVo
+     */
+    void saveCouponRule(CouponRuleVo couponRuleVo);
+
+    /**
+     * 根据关键字获取sku列表，活动使用
+     *
+     * @param keyword
+     * @return
+     */
+    List<CouponInfo> findCouponByKeyword(String keyword);
 }
diff --git a/guigu-ssyx-parent/service/service-activity/src/main/java/com/atguigu/ssyx/activity/service/impl/CouponInfoServiceImpl.java b/guigu-ssyx-parent/service/service-activity/src/main/java/com/atguigu/ssyx/activity/service/impl/CouponInfoServiceImpl.java
index 3e01101..c0b7810 100644
--- a/guigu-ssyx-parent/service/service-activity/src/main/java/com/atguigu/ssyx/activity/service/impl/CouponInfoServiceImpl.java
+++ b/guigu-ssyx-parent/service/service-activity/src/main/java/com/atguigu/ssyx/activity/service/impl/CouponInfoServiceImpl.java
@@ -1,10 +1,27 @@
 package com.atguigu.ssyx.activity.service.impl;
 
 import com.atguigu.ssyx.activity.mapper.CouponInfoMapper;
+import com.atguigu.ssyx.activity.mapper.CouponRangeMapper;
 import com.atguigu.ssyx.activity.service.CouponInfoService;
+import com.atguigu.ssyx.client.product.ProductFeignClient;
+import com.atguigu.ssyx.enums.CouponRangeType;
 import com.atguigu.ssyx.model.activity.CouponInfo;
+import com.atguigu.ssyx.model.activity.CouponRange;
+import com.atguigu.ssyx.model.product.Category;
+import com.atguigu.ssyx.model.product.SkuInfo;
+import com.atguigu.ssyx.vo.activity.CouponRuleVo;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -17,4 +34,119 @@ import org.springframework.stereotype.Service;
 @Service
 public class CouponInfoServiceImpl extends ServiceImpl<CouponInfoMapper, CouponInfo> implements CouponInfoService {
 
+
+    @Autowired
+    CouponRangeMapper couponRangeMapper;
+
+    @Autowired
+    ProductFeignClient productFeignClient;
+
+    /**
+     * 获取分页列表
+     *
+     * @param page
+     * @param limit
+     * @return
+     */
+    @Override
+    public IPage<CouponInfo> selectPage(Long page, Long limit) {
+        Page<CouponInfo> pageParam = new Page<>(page, limit);
+        Page<CouponInfo> couponInfoPage = baseMapper.selectPage(pageParam, null);
+        List<CouponInfo> couponInfoList = couponInfoPage.getRecords();
+        couponInfoList.forEach(item -> {
+            item.setCouponTypeString(item.getCouponType()
+                                         .getComment());
+            CouponRangeType rangeType = item.getRangeType();
+            if (rangeType != null) {
+                item.setRangeTypeString(rangeType.getComment());
+            }
+        });
+        return couponInfoPage;
+    }
+
+    /**
+     * 根据ID查询优惠券
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public CouponInfo getCouponInfo(Long id) {
+        CouponInfo couponInfo = baseMapper.selectById(id);
+        couponInfo.setCouponTypeString(couponInfo.getCouponType()
+                                                 .getComment());
+        if (couponInfo.getRangeType() != null) {
+            couponInfo.setRangeTypeString(couponInfo.getRangeType()
+                                                    .getComment());
+        }
+        return couponInfo;
+    }
+
+    /**
+     * 根据优惠卷id获取优惠券规则列表
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public Map<String, Object> findCouponRuleList(Long id) {
+        //第一步 根据优惠卷id查询优惠卷基本信息  coupon_info表
+        CouponInfo couponInfo = baseMapper.selectById(id);
+
+        //第二步 根据优惠卷id查询coupon_range 查询里面对应range_id
+        List<CouponRange> couponRangeList = couponRangeMapper.selectList(new LambdaQueryWrapper<CouponRange>().eq(CouponRange::getCouponId, id));
+        //couponRangeList获取所有range_id
+        //// 如果规则类型 SKU      range_id就是skuId值
+        //// 如果规则类型 CATEGORY range_id就是分类Id值
+        List<Long> randIdList = couponRangeList.stream()
+                                               .map(CouponRange::getRangeId)
+                                               .collect(Collectors.toList());
+
+        Map<String, Object> result = new HashMap<>();
+        //第三步 分别判断封装不同数据
+        if (!CollectionUtils.isEmpty(randIdList)) {
+            if (couponInfo.getRangeType() == CouponRangeType.SKU) {
+                //// 如果规则类型是SKU ，得到skuId，
+                // 远程调用根据多个skuId值获取对应sku信息
+                List<SkuInfo> skuInfoList = productFeignClient.findSkuInfoList(randIdList);
+                result.put("skuInfoList", skuInfoList);
+
+            } else if (couponInfo.getRangeType() == CouponRangeType.CATEGORY) {
+                //// 如果规则类型是分类，得到分类Id，远程调用根据多个分类Id值获取对应分类信息
+                List<Category> categoryList = productFeignClient.findCategoryList(randIdList);
+                result.put("categoryList", categoryList);
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public void saveCouponRule(CouponRuleVo couponRuleVo) {
+        //优惠券couponInfo 与 couponRange 要一起操作：先删除couponRange ，更新couponInfo ，再新增couponRange ！
+
+        couponRangeMapper.delete(new LambdaQueryWrapper<CouponRange>().eq(CouponRange::getCouponId, couponRuleVo.getCouponId()));
+
+        //更新优惠卷基本信息
+        CouponInfo couponInfo = baseMapper.selectById(couponRuleVo.getCouponId());
+        couponInfo.setRangeType(couponRuleVo.getRangeType());
+        couponInfo.setConditionAmount(couponRuleVo.getConditionAmount());
+        couponInfo.setAmount(couponRuleVo.getAmount());
+        couponInfo.setConditionAmount(couponRuleVo.getConditionAmount());
+        couponInfo.setRangeDesc(couponRuleVo.getRangeDesc());
+        baseMapper.updateById(couponInfo);
+
+        //添加优惠卷新规则数据
+        List<CouponRange> couponRangeList = couponRuleVo.getCouponRangeList();
+        for (CouponRange couponRange : couponRangeList) {
+            //设置优惠卷id
+            couponRange.setCouponId(couponRuleVo.getCouponId());
+            //添加
+            couponRangeMapper.insert(couponRange);
+        }
+    }
+
+    @Override
+    public List<CouponInfo> findCouponByKeyword(String keyword) {
+        return baseMapper.selectList(new LambdaQueryWrapper<CouponInfo>().like(CouponInfo::getCouponName, keyword));
+    }
 }
diff --git a/guigu-ssyx-parent/service/service-activity/src/main/resources/application.yml b/guigu-ssyx-parent/service/service-activity/src/main/resources/application.yml
index 299f6bb..fdddbd1 100644
--- a/guigu-ssyx-parent/service/service-activity/src/main/resources/application.yml
+++ b/guigu-ssyx-parent/service/service-activity/src/main/resources/application.yml
@@ -6,6 +6,6 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: localhost:8848
-      username: nacos
-      password: nacos
+        server-addr: 82.157.68.223:8848
+        username: nacos
+        password: nacos
diff --git a/guigu-ssyx-parent/service/service-product/src/main/java/com/atguigu/ssyx/product/api/ProductInnnerController.java b/guigu-ssyx-parent/service/service-product/src/main/java/com/atguigu/ssyx/product/api/ProductInnnerController.java
index 3f4a25a..23226ac 100644
--- a/guigu-ssyx-parent/service/service-product/src/main/java/com/atguigu/ssyx/product/api/ProductInnnerController.java
+++ b/guigu-ssyx-parent/service/service-product/src/main/java/com/atguigu/ssyx/product/api/ProductInnnerController.java
@@ -45,6 +45,12 @@ public class ProductInnnerController {
         return skuInfoService.findSkuInfoList(skuIdList);
     }
 
+    @ApiOperation(value = "批量获取分类信息")
+    @PostMapping("inner/findCategoryList")
+    public List<Category> findCategoryList(@RequestBody List<Long> categoryIdList) {
+        return categoryService.listByIds(categoryIdList);
+    }
+
     @ApiOperation(value = "根据关键字获取sku列表")
     @GetMapping("inner/findSkuInfoByKeyword/{keyword}")
     public List<SkuInfo> findSkuInfoByKeyword(@PathVariable("keyword") String keyword) {
diff --git a/guigu-ssyx-parent/service/service-product/src/main/resources/application.yml b/guigu-ssyx-parent/service/service-product/src/main/resources/application.yml
index 15f2770..856ea6d 100644
--- a/guigu-ssyx-parent/service/service-product/src/main/resources/application.yml
+++ b/guigu-ssyx-parent/service/service-product/src/main/resources/application.yml
@@ -6,6 +6,4 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: localhost:8848
-      username: nacos
-      password: nacos
+        server-addr: 82.157.68.223:8848
diff --git a/guigu-ssyx-parent/service/service-search/src/main/resources/application.yml b/guigu-ssyx-parent/service/service-search/src/main/resources/application.yml
index e5f6453..3bec5db 100644
--- a/guigu-ssyx-parent/service/service-search/src/main/resources/application.yml
+++ b/guigu-ssyx-parent/service/service-search/src/main/resources/application.yml
@@ -6,6 +6,4 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: localhost:8848
-      username: nacos
-      password: nacos
+        server-addr: 82.157.68.223:8848
diff --git a/guigu-ssyx-parent/service/service-sys/src/main/resources/application.yml b/guigu-ssyx-parent/service/service-sys/src/main/resources/application.yml
index 980f10b..bbe8496 100644
--- a/guigu-ssyx-parent/service/service-sys/src/main/resources/application.yml
+++ b/guigu-ssyx-parent/service/service-sys/src/main/resources/application.yml
@@ -6,6 +6,4 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: localhost:8848
-      username: nacos
-      password: nacos
+        server-addr: 82.157.68.223:8848