新增微服务,生成实体类

muyu-modules/muyu-goods/pom.xml

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.muyu</groupId>
+        <artifactId>muyu-modules</artifactId>
+        <version>3.6.3</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>muyu-goods</artifactId>
+
+    <description>
+        muyu-modules-goods系统模块
+    </description>
+
+    <dependencies>
+
+        <!-- SpringCloud Alibaba Nacos -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Nacos Config -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Sentinel -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+
+        <!-- SpringBoot Actuator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <!-- Swagger UI -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger.fox.version}</version>
+        </dependency>
+
+        <!-- Mysql Connector -->
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+        </dependency>
+
+        <!-- MuYu Common DataSource -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-datasource</artifactId>
+        </dependency>
+
+        <!-- MuYu Common DataScope -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-datascope</artifactId>
+        </dependency>
+
+        <!-- MuYu Common Log -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-log</artifactId>
+        </dependency>
+
+        <!-- MuYu Common Swagger -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-swagger</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.dtflys.forest</groupId>
+            <artifactId>forest-spring-boot-starter</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- 加入maven deploy插件，当在deploy时，忽略些model-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

muyu-modules/muyu-goods/src/main/java/com/muyu/goods/MuYuGoodsApplication.java

@@ -0,0 +1,22 @@
+package com.muyu.goods;
+
+import com.muyu.common.security.annotation.EnableCustomConfig;
+import com.muyu.common.security.annotation.EnableMyFeignClients;
+import com.muyu.common.swagger.annotation.EnableCustomSwagger2;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * 系统模块
+ *
+ * @author muyu
+ */
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableMyFeignClients
+@SpringBootApplication
+public class MuYuGoodsApplication {
+    public static void main (String[] args) {
+        SpringApplication.run(MuYuGoodsApplication.class, args);
+    }
+}

muyu-modules/muyu-goods/src/main/java/com/muyu/goods/controller/GoodsController.java

@@ -0,0 +1,22 @@
+package com.muyu.goods.controller;
+
+import com.muyu.common.core.web.controller.BaseController;
+import com.muyu.goods.service.GoodsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 参数配置 信息操作处理
+ *
+ * @author muyu
+ */
+@RestController
+@RequestMapping("/goods")
+public class GoodsController extends BaseController {
+
+    @Autowired
+    private GoodsService configService;
+
+
+}

muyu-modules/muyu-goods/src/main/java/com/muyu/goods/domain/Goods.java

@@ -0,0 +1,11 @@
+package com.muyu.goods.domain;
+
+/**
+ * @Author：尚志豪
+ * @Package：com.muyu.goods.domain
+ * @Project：cloud-server
+ * @name：SysConfig
+ * @Date：2024/11/18 16:57
+ */
+public class Goods {
+}

muyu-modules/muyu-goods/src/main/java/com/muyu/goods/forest/gaode/api/resp/District.java

@@ -0,0 +1,32 @@
+package com.muyu.goods.forest.gaode.api.resp;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class District {
+
+    /** 名称 */
+    private String name;
+
+    /** 编码 */
+    @JSONField(name = "citycode")
+    private String code;
+
+    /** 级别 */
+    private String level;
+
+    /** 区域编码 */
+    @JSONField(name = "adcode")
+    private String areaCode;
+
+    /** 中心经纬度 */
+    private String center;
+
+    /**
+     * 子
+     */
+    private List<District> districts;
+}

muyu-modules/muyu-goods/src/main/java/com/muyu/goods/forest/gaode/api/resp/DistrictResult.java

@@ -0,0 +1,40 @@
+package com.muyu.goods.forest.gaode.api.resp;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author DongZl
+ * @description: 行政区接口返回结果集
+ * @Date 2024/4/11 下午2:31
+ */
+@Data
+public class DistrictResult {
+
+    /**
+     * 返回结果状态值
+     * 值为0或1，0表示失败；1表示成功
+     */
+    private String status;
+
+    /**
+     * 返回状态说明
+     * 返回状态说明，status为0时，info返回错误原因，否则返回“OK”。
+     */
+    private String info;
+
+    /**
+     * 状态码
+     * 返回状态说明，10000代表正确，详情参阅info状态表
+     */
+    @JSONField(name = "infocode")
+    private String infoCode;
+
+    /**
+     * 行政区列表
+     */
+    private List<District> districts;
+}
+

muyu-modules/muyu-goods/src/main/java/com/muyu/goods/mapper/GoodsMapper.java

@@ -0,0 +1,13 @@
+package com.muyu.goods.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muyu.goods.domain.Goods;
+
+/**
+ * @author DongZl
+ * @description: 配置mybatis配置
+ * @Date 2023-11-13 上午 10:05
+ */
+public interface GoodsMapper extends BaseMapper<Goods> {
+}

muyu-modules/muyu-goods/src/main/java/com/muyu/goods/service/GoodsService.java

@@ -0,0 +1,14 @@
+package com.muyu.goods.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.goods.domain.Goods;
+
+/**
+ * @author DongZl
+ * @description: 配置plus业务层
+ * @Date 2023-11-13 上午 10:06
+ */
+public interface GoodsService extends IService<Goods> {
+
+}

muyu-modules/muyu-goods/src/main/java/com/muyu/goods/service/impl/GoodsServiceImpl.java

@@ -0,0 +1,21 @@
+package com.muyu.goods.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.goods.domain.Goods;
+import com.muyu.goods.mapper.GoodsMapper;
+import com.muyu.goods.service.GoodsService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author DongZl
+ * @description: 配置plus业务实现层
+ * @Date 2023-11-13 上午 10:06
+ */
+@Service
+public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements GoodsService {
+
+
+
+
+}

muyu-modules/muyu-goods/src/main/resources/banner.txt

@@ -0,0 +1,2 @@
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}

muyu-modules/muyu-goods/src/main/resources/bootstrap.yml

@@ -0,0 +1,30 @@
+# Tomcat
+server:
+  port: 9204
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: muyu-goods
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 150.158.86.96:8848
+        namespace: 2204a
+      config:
+        # 配置中心地址
+        server-addr: 150.158.86.96:8848
+        namespace: 2204a
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+logging:
+  level:
+    com.muyu.goods.mapper: DEBUG

muyu-modules/muyu-goods/src/main/resources/logback.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <!-- 日志存放路径 -->
+    <property name="log.path" value="logs/muyu-goods"/>
+    <!-- 日志输出格式 -->
+    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
+
+    <!-- 控制台输出 -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- 系统日志输出 -->
+    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/info.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/error.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 系统模块日志级别控制  -->
+    <logger name="com.muyu" level="info"/>
+    <!-- Spring日志级别控制  -->
+    <logger name="org.springframework" level="warn"/>
+
+    <root level="info">
+        <appender-ref ref="console"/>
+    </root>
+
+    <!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="file_info"/>
+        <appender-ref ref="file_error"/>
+    </root>
+</configuration>

muyu-modules/muyu-goods/src/main/resources/mapper/system/GoodsMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.muyu.goods.mapper.SysConfigMapper">
+
+
+
+</mapper>

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectInfo.java

@@ -91,6 +91,7 @@ public class ProjectInfo extends BaseEntity {
     @ApiModelProperty(name = "品牌", value = "品牌")
     private Long brandId;
 
+
     /**
     * 查询构造器
     */

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectUpdInfo.java

@@ -0,0 +1,100 @@
+package com.muyu.product.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.common.core.web.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.List;
+
+/**
+ * @Author：尚志豪
+ * @Package：com.muyu.product.domain
+ * @Project：cloud-server
+ * @name：ProjectUpdInfo
+ * @Date：2024/11/17 14:31
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("project_info")
+@EqualsAndHashCode()
+@ApiModel(value = "ProjectInfo", description = "商品信息")
+public class ProjectUpdInfo extends BaseEntity  {
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id",type = IdType.AUTO)
+    @ApiModelProperty(name = "主键", value = "主键")
+    private Long id;
+
+    /** 商品名称 */
+    @Excel(name = "商品名称")
+    @ApiModelProperty(name = "商品名称", value = "商品名称")
+    private String name;
+
+    /** 商品描述 */
+    @Excel(name = "商品描述")
+    @ApiModelProperty(name = "商品描述", value = "商品描述")
+    private String introduction;
+
+    /** 主类型 */
+    @Excel(name = "主类型")
+    @ApiModelProperty(name = "主类型", value = "主类型")
+    private Long mianType;
+
+    /** 父类型 */
+    @Excel(name = "父类型")
+    @ApiModelProperty(name = "父类型", value = "父类型")
+    private Long parentType;
+
+    /** 商品类型 */
+    @Excel(name = "商品类型")
+    @ApiModelProperty(name = "商品类型", value = "商品类型")
+    private Long type;
+
+    /** 商品图片 */
+    @Excel(name = "商品图片")
+    @ApiModelProperty(name = "商品图片", value = "商品图片")
+    private String image;
+
+    /** 商品轮播图 */
+    @Excel(name = "商品轮播图")
+    @ApiModelProperty(name = "商品轮播图", value = "商品轮播图")
+    private String carouselImages;
+
+    /** 商品状态 */
+    @Excel(name = "商品状态")
+    @ApiModelProperty(name = "商品状态", value = "商品状态")
+    private String status;
+
+    /** 规格 */
+    @Excel(name = "规格")
+    @ApiModelProperty(name = "规格", value = "规格")
+    private Long ruleId;
+
+    /** 品牌 */
+    @Excel(name = "品牌")
+    @ApiModelProperty(name = "品牌", value = "品牌")
+    private Long brandId;
+
+    /**
+     * 属性集合
+     */
+    private List<AttributeInfo> attrValueList;
+
+    private List<CategoryInfo> categoryInfoList;
+
+    private List<RuleInfo> ruleInfoList;
+
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/CategoryParentCommonElementResp.java

@@ -1,8 +1,13 @@
 package com.muyu.product.domain.resp;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.muyu.common.core.annotation.Excel;
 import com.muyu.product.domain.AttributeGroup;
 import com.muyu.product.domain.AttributeInfo;
 import com.muyu.product.domain.BrandInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -21,6 +26,42 @@ import java.util.List;
 @AllArgsConstructor
 public class CategoryParentCommonElementResp {
 
+    /**
+     * 主表
+     */
+    @TableId(value = "id",type = IdType.AUTO)
+    @ApiModelProperty(name = "主表",value = "主键")
+    private Long id;
+
+    /**
+     * 品类名称
+     */
+    @Excel(name = "品类名称")
+    @ApiModelProperty(name = "品类名称", value = "品类名称", required = true)
+    private String name;
+
+    /**
+     * 图片
+     */
+    @Excel(name = "图片")
+    @ApiModelProperty(name = "图片", value = "图片", required = true)
+    private String image;
+
+    /**
+     * 是否启用
+     */
+    @Excel(name = "是否启用")
+    @ApiModelProperty(name = "是否启用", value = "是否启用", required = true)
+    private String start;
+
+    /**
+     * 介绍
+     */
+    @Excel(name = "介绍")
+    @ApiModelProperty(name = "介绍",value = "介绍")
+    private String introduction;
+
+    private Long parentId;
     /**
      * 属性集合
      */

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/RuleInfoResp.java

@@ -37,6 +37,8 @@ public class RuleInfoResp extends BaseEntity {
      */
     private List<RuleAttrAddModel> ruleAttrList;
 
+    private Integer state = 0;
+
     public static RuleInfoResp infoBuild (RuleInfo ruleInfo, Function<Long, List<RuleAttrAddModel>> ruleAttrList) {
         return RuleInfoResp.builder()
                 .id(ruleInfo.getId())

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java

@@ -5,9 +5,7 @@ import java.util.function.Supplier;
 import javax.servlet.http.HttpServletResponse;
 
 import com.muyu.common.security.utils.SecurityUtils;
-import com.muyu.product.domain.AttributeGroup;
+import com.muyu.product.domain.*;
-import com.muyu.product.domain.AttributeInfo;
-import com.muyu.product.domain.BrandInfo;
 import com.muyu.product.domain.model.CategoryInfoSaveModel;
 import com.muyu.product.domain.req.CategoryInfoUpdEditReq;
 import com.muyu.product.domain.resp.CategoryCommonElementResp;
@@ -30,7 +28,6 @@ import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
 import com.muyu.common.security.annotation.RequiresPermissions;
-import com.muyu.product.domain.CategoryInfo;
 import com.muyu.product.domain.req.CategoryInfoQueryReq;
 import com.muyu.product.domain.req.CategoryInfoSaveReq;
 import com.muyu.product.domain.req.CategoryInfoEditReq;
@@ -80,8 +77,9 @@ public class CategoryInfoController extends BaseController {
     @RequiresPermissions("product:category:query")
     @GetMapping(value = "/{id}")
     @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class)
-    public Result<CategoryInfo> getInfo(@PathVariable("id") Long id) {
+    public Result<CategoryParentCommonElementResp> getInfo(@PathVariable("id") Long id) {
-        return Result.success(categoryInfoService.getById(id));
+        CategoryParentCommonElementResp categoryById = categoryInfoService.getCategoryById(id);
+        return Result.success(categoryById);
     }
 
     /**
@@ -143,7 +141,13 @@ public class CategoryInfoController extends BaseController {
         System.out.println("否存在下一级:"+categoryInfo);
         // 判断没有下一删除
         if (null == categoryInfo){
-            return toAjax(categoryInfoService.removeById(ids));
+            // 查询是否与商品有关
+            List<AsCategoryBrand> asCategoryBrand = categoryInfoService.InquireAboutGoods(ids);
+            // 判断有没有和商品有关
+            if(0 == asCategoryBrand.size()){
+                return toAjax(categoryInfoService.removeById(ids));
+            }
+            return Result.error("与商品有关能进行删除");
         }
        return Result.error("含有子集不能进行删除");
     }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.muyu.product.cache.ProjectInfoCache;
+import com.muyu.product.domain.ProjectUpdInfo;
 import com.muyu.product.domain.resp.ProjectDetailResp;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -76,8 +77,12 @@ public class ProjectInfoController extends BaseController {
     @RequiresPermissions("product:info:query")
     @GetMapping(value = "/{id}")
     @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class)
-    public Result<ProjectInfo> getInfo(@PathVariable("id") Long id) {
+//    public Result<ProjectInfo> getInfo(@PathVariable("id") Long id) {
-        return Result.success(projectInfoCache.get(id));
+//        return Result.success(projectInfoCache.get(id));
+//    }
+    public Result<ProjectUpdInfo> getInfo(@PathVariable("id") Long id) {
+        ProjectUpdInfo projectUpdInfo = projectInfoService.get(id);
+        return Result.success(projectUpdInfo);
     }
 
     /**

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java

@@ -56,6 +56,7 @@ public class RuleInfoController extends BaseController {
         }
         TableDataInfo<RuleInfoResp> tableDataInfo = ruleInfoService.queryList(ruleInfoQueryReq);
         return isPage ? Result.success(tableDataInfo) : Result.success(tableDataInfo.getRows());
+
     }
 
     /**

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryInfoMapper.java

@@ -2,7 +2,7 @@ package com.muyu.product.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.muyu.product.domain.CategoryInfo;
+import com.muyu.product.domain.*;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -36,5 +36,32 @@ public interface CategoryInfoMapper extends BaseMapper<CategoryInfo> {
      * @return
      */
     CategoryInfo QueryBelowOneLevel(@Param("ids") Long ids);
+    /**
+     * 查询是否与商品有关
+     * @param ids
+     * @return
+     */
+    List<AsCategoryBrand> InquireAboutGoods(@Param("ids") Long ids);
+
+    /**
+     * 品类属性中间表
+     * @param aLong
+     * @return
+     */
+    AttributeInfo selectCateById(@Param("aLong") Long aLong);
+
+    /**
+     * 品类属性组中间表
+     * @param aLong
+     * @return
+     */
+    AttributeGroup selectGroup(@Param("aLong") Long aLong);
+    /**
+     * 品类品牌中间表
+     * @param aLong
+     * @return
+     */
+    BrandInfo seleteBrand(@Param("aLong") Long aLong);
+
 
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProjectInfoMapper.java

@@ -2,7 +2,9 @@ package com.muyu.product.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muyu.product.domain.AttributeInfo;
 import com.muyu.product.domain.ProjectInfo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 商品信息Mapper接口
@@ -11,5 +13,10 @@ import com.muyu.product.domain.ProjectInfo;
  * @date 2024-02-27
  */
 public interface ProjectInfoMapper extends BaseMapper<ProjectInfo> {
-
+    /**
+     * 商品属性表中间表
+     * @param aLong
+     * @return
+     */
+    AttributeInfo selectProject(@Param("aLong") Long aLong);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CategoryInfoService.java

@@ -2,10 +2,7 @@ package com.muyu.product.service;
 
 import java.util.List;
 
-import com.muyu.product.domain.AttributeGroup;
+import com.muyu.product.domain.*;
-import com.muyu.product.domain.AttributeInfo;
-import com.muyu.product.domain.BrandInfo;
-import com.muyu.product.domain.CategoryInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.product.domain.model.CategoryInfoSaveModel;
 import com.muyu.product.domain.resp.CategoryCommonElementResp;
@@ -94,4 +91,15 @@ public interface CategoryInfoService extends IService<CategoryInfo> {
      * @return
      */
     CategoryInfo QueryBelowOneLevel(Long ids);
+
+    /**
+     * 查询是否与商品有关
+     * @param ids
+     * @return
+     */
+    List<AsCategoryBrand> InquireAboutGoods(Long ids);
+    /**
+     * 获取品类信息详细信息
+     */
+    CategoryParentCommonElementResp getCategoryById(Long id);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectInfoService.java

@@ -3,6 +3,7 @@ package com.muyu.product.service;
 import java.util.List;
 import com.muyu.product.domain.ProjectInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.product.domain.ProjectUpdInfo;
 import com.muyu.product.domain.req.ProjectInfoSaveReq;
 import com.muyu.product.domain.resp.ProjectDetailResp;
 
@@ -34,4 +35,8 @@ public interface ProjectInfoService extends IService<ProjectInfo> {
      * @return 商品详情
      */
     ProjectDetailResp getDetailInfo (Long id);
+    /**
+     * 获取商品信息详细信息
+     */
+    ProjectUpdInfo get(Long id);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryInfoServiceImpl.java

@@ -308,6 +308,65 @@ public class CategoryInfoServiceImpl extends ServiceImpl<CategoryInfoMapper, Cat
         return categoryInfoMapper.QueryBelowOneLevel(ids);
     }
 
+    /**
+     * 查询是否与商品有关
+     * @param ids
+     * @return
+     */
+    @Override
+    public List<AsCategoryBrand> InquireAboutGoods(Long ids) {
+        return categoryInfoMapper.InquireAboutGoods(ids);
+    }
+    /**
+     * 获取品类信息详细信息
+     */
+    @Override
+    public CategoryParentCommonElementResp getCategoryById(Long id) {
+        //品类信息
+        CategoryInfo info = this.getById(id);
+        // 品类属性中间表
+        LambdaQueryWrapper<AsCategoryAttribute> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AsCategoryAttribute::getCategoryId,id);
+        List<AsCategoryAttribute> attributeList = asCategoryAttributeService.list(queryWrapper);
+        List<Long> longs = attributeList.stream().map(AsCategoryAttribute::getAttributeId).toList();
+        ArrayList<AttributeInfo> arrayList = new ArrayList<>();
+        for (Long aLong : longs) {
+            AttributeInfo attribute = categoryInfoMapper.selectCateById(aLong);
+            arrayList.add(attribute);
+        }
+        // 品类属性组中间表
+        LambdaQueryWrapper<AsCategoryAttributeGroup> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(AsCategoryAttributeGroup::getCategoryId,id);
+        List<AsCategoryAttributeGroup> list = asCategoryAttributeGroupService.list(wrapper);
+        List<Long> toList = list.stream().map(AsCategoryAttributeGroup::getAttributeGroupId).toList();
+        ArrayList<AttributeGroup> groupArrayList = new ArrayList<>();
+        for (Long aLong : toList) {
+            AttributeGroup attributeGroup = categoryInfoMapper.selectGroup(aLong);
+            groupArrayList.add(attributeGroup);
+        }
+        // 品类品牌中间表
+        LambdaQueryWrapper<AsCategoryBrand> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(AsCategoryBrand::getCategoryId,id);
+        List<AsCategoryBrand> asCategoryBrands = asCategoryBrandService.list(lambdaQueryWrapper);
+        List<Long> longList = asCategoryBrands.stream().map(AsCategoryBrand::getBrandId).toList();
+        ArrayList<BrandInfo> brandArrayList = new ArrayList<>();
+        for (Long aLong : longList) {
+            BrandInfo brands = categoryInfoMapper.seleteBrand(aLong);
+            brandArrayList.add(brands);
+        }
+        return CategoryParentCommonElementResp.builder()
+                .id(info.getId())
+                .name(info.getName())
+                .image(info.getImage())
+                .start(info.getStart())
+                .introduction(info.getIntroduction())
+                .parentId(info.getParentId())
+                .attributeInfoList(arrayList)
+                .attributeGroupList(groupArrayList)
+                .brandInfoList(brandArrayList)
+                .build();
+    }
+
     /**
      * 通过品类ID获取父级以上的属性、属性组、品牌集合
      *

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java

@@ -47,6 +47,8 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
 
     @Autowired
     private AttributeInfoService attributeInfoService;
+    @Autowired
+    private ProjectInfoMapper projectInfoMapper;
 
     /**
      * 查询商品信息列表
@@ -125,7 +127,7 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
                     .map(attrValueModel -> AsProductAttributeInfo.attrValueModelBuild(attrValueModel, projectInfo::getId))
                     .toList();
             if (!asProductAttributeInfoList.isEmpty()){
-                asProductAttributeInfoService.saveBatch(asProductAttributeInfoList);
+               asProductAttributeInfoService.saveBatch(asProductAttributeInfoList);
             }
             // sku ProductSkuModel -》 ProjectSkuInfo
             List<ProductSkuModel> productSkuModelList = projectInfoSaveReq.getProductSkuList();
@@ -206,13 +208,11 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
             List<Long> attrIdList = productAttributeList.stream()
                     .map(AsProductAttributeInfo::getAttributeId)
                     .toList();
-            projectAttributeList = attributeInfoService.list(
+            projectAttributeList = attributeInfoService.list(new LambdaQueryWrapper<>() {{
-                                            new LambdaQueryWrapper<>() {{
+                in(AttributeInfo::getId, attrIdList);
-                                                in(AttributeInfo::getId, attrIdList);
+            }}).stream()
-                                            }}
+                    .map(TemplateAttributeModel::attributeInfoBuild)
-                                        ).stream()
+                    .toList();
-                                        .map(TemplateAttributeModel::attributeInfoBuild)
-                                        .toList();
         }
         // 把自有属性添加到商品属性的集合当中，进行合并
         if (!projectAttributeList.isEmpty()){
@@ -229,4 +229,41 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
                 .attributeGroupList(templateAttributeGroupList)
                 .build();
     }
+    /**
+     * 获取商品信息详细信息
+     */
+    @Override
+    public ProjectUpdInfo get(Long id) {
+//        CategoryInfo;
+//        RuleInfo;
+
+        // 商品信息
+        ProjectInfo info = this.getById(id);
+        // 商品属性表中间表
+        LambdaQueryWrapper<AsProductAttributeInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AsProductAttributeInfo::getProductId,id);
+        List<AsProductAttributeInfo> attributeInfoList = asProductAttributeInfoService.list(queryWrapper);
+        List<Long> longs = attributeInfoList.stream().map(AsProductAttributeInfo::getAttributeId).toList();
+        ArrayList<AttributeInfo> arrayList = new ArrayList<>();
+        for (Long aLong : longs) {
+            AttributeInfo attributeInfo = projectInfoMapper.selectProject(aLong);
+            arrayList.add(attributeInfo);
+        }
+
+//
+        return ProjectUpdInfo.builder()
+                .id(info.getId())
+                .name(info.getName())
+                .introduction(info.getIntroduction())
+                .mianType(info.getMianType())
+                .parentType(info.getParentType())
+                .type(info.getType())
+                .image(info.getImage())
+                .carouselImages(info.getCarouselImages())
+                .status(info.getStatus())
+                .ruleId(info.getRuleId())
+                .brandId(info.getBrandId())
+                .attrValueList(arrayList)
+                .build();
+    }
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleInfoServiceImpl.java

@@ -12,6 +12,7 @@ import com.muyu.common.core.text.Convert;
 import com.muyu.common.core.utils.ObjUtils;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.security.utils.SecurityUtils;
+import com.muyu.product.domain.ProjectInfo;
 import com.muyu.product.domain.RuleAttrInfo;
 import com.muyu.product.domain.model.RuleAttrAddModel;
 import com.muyu.product.domain.model.RuleInfoAddModel;
@@ -28,6 +29,7 @@ import com.muyu.product.domain.RuleInfo;
 import com.muyu.product.service.RuleInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.springframework.util.CollectionUtils;
 
 /**
  * 商品规格Service业务层处理
@@ -43,6 +45,8 @@ public class RuleInfoServiceImpl extends ServiceImpl<RuleInfoMapper, RuleInfo>
     private RuleAttrInfoService ruleAttrInfoService;
     @Autowired
     private RuleAttrInfoMapper ruleAttrInfoMapper;
+    @Autowired
+    private ProjectInfoServiceImpl projectInfoService;
 
     /**
      * 查询商品规格列表
@@ -105,7 +109,14 @@ public class RuleInfoServiceImpl extends ServiceImpl<RuleInfoMapper, RuleInfo>
                     }))
                 .toList();
         boolean isPage = ruleInfoQueryReq.getParams().get("isPage") == null || Convert.toBool(ruleInfoQueryReq.getParams().get("isPage"), true);
-
+              ruleInfoRespList.forEach(ruleInfoResp -> {
+                  LambdaQueryWrapper<ProjectInfo> wrapper = new LambdaQueryWrapper<>();
+                  wrapper.eq(ProjectInfo::getRuleId,ruleInfoResp.getId());
+                  List<ProjectInfo> projectInfoList = projectInfoService.list(wrapper);
+                  if (!CollectionUtils.isEmpty(projectInfoList) && projectInfoList.size()>0){
+                      ruleInfoResp.setState(1);
+                  }
+              });
         return TableDataInfo.<RuleInfoResp>builder()
                 .rows(ruleInfoRespList)
                 .total(isPage ? new PageInfo<>(list).getTotal() : 0)

muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/CategoryInfoMapper.xml

@@ -37,4 +37,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="QueryBelowOneLevel" resultType="com.muyu.product.domain.CategoryInfo">
         select * from category_info where parent_id =#{ids}
     </select>
+<!--    查询是否与商品有关-->
+    <select id="InquireAboutGoods" resultType="com.muyu.product.domain.AsCategoryBrand"
+            parameterType="java.lang.Long">
+        select * from as_category_brand where category_id =#{ids}
+    </select>
+<!--    品类属性中间表-->
+    <select id="selectCateById" resultType="com.muyu.product.domain.AttributeInfo"
+            parameterType="java.lang.Long">
+        select *from  attribute_info where id=#{aLong}
+    </select>
+<!--    品类属性组中间表-->
+    <select id="selectGroup" resultType="com.muyu.product.domain.AttributeGroup"
+            parameterType="java.lang.Long">
+        select * from  attribute_group where id=#{aLong}
+    </select>
+<!--    品类品牌中间表-->
+    <select id="seleteBrand" resultType="com.muyu.product.domain.BrandInfo" parameterType="java.lang.Long">
+        select *from  brand_info where id=#{aLong}
+    </select>
 </mapper>

muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ProjectInfoMapper.xml

@@ -26,4 +26,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectProjectInfoVo">
         select id, name, introduction, mian_type, parent_type, type, image, carousel_images, status, rule_id, brand_id, remark, create_by, create_time, update_by, update_time from project_info
     </sql>
+<!--    商品属性表中间表-->
+    <select id="selectProject" resultType="com.muyu.product.domain.AttributeInfo">
+        select * from attribute_info where id = #{aLong}
+    </select>
 </mapper>

muyu-modules/pom.xml

@@ -15,6 +15,7 @@
         <module>muyu-file</module>
         <module>muyu-product</module>
         <module>muyu-shop-cart</module>
+        <module>muyu-goods</module>
     </modules>
 
     <artifactId>muyu-modules</artifactId>