Merge remote-tracking branch 'origin/feature_v20240912' into feature_v20240912

fengliang
2 parents d803981b 5fb3f442
Showing 7 changed files with 220 additions and 1 deletions
etrade-admin/src/main/java/com/diligrp/etrade/admin/dao/BannerContentMapper.java
etrade-admin/src/main/java/com/diligrp/etrade/admin/model/BannerContent.java
etrade-admin/src/main/java/com/diligrp/etrade/admin/service/BannerContentService.java
etrade-admin/src/main/java/com/diligrp/etrade/admin/service/impl/BannerContentServiceImpl.java
etrade-admin/src/main/resources/com/diligrp/etrade/dao/mapper/BannerContentMapper.xml
scripts/etrade-admin/etrade_admin.sql
scripts/upgrade/v1.0.25/xtrade-order_v20240913.sql
+package com.diligrp.etrade.admin.dao;
+
+
+import com.diligrp.etrade.core.mybatis.MybatisMapperSupport;
+import org.springframework.stereotype.Repository;
+
+/**
+* @author dili
+* @description 针对表【banner_content(内容管理-轮播图)】的数据库操作Mapper
+* @createDate 2024-09-13 16:09:46
+* @Entity com.diligrp.etrade.admin.domain.BannerContent
+*/
+@Repository
+public interface BannerContentMapper extends MybatisMapperSupport {
+}
+
+
+
+
+package com.diligrp.etrade.admin.model;
+
+import com.diligrp.etrade.core.domain.BaseDo;
+
+import java.io.Serializable;
+
+/**
+ * 内容管理-轮播图
+ * @TableName banner_content
+ */
+public class BannerContent extends BaseDo implements Serializable {
+    /**
+     * 自增ID
+     */
+    private Long id;
+
+    /**
+     * 轮播图ID
+     */
+    private Long bannerId;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 图片链接
+     */
+    private String picUrl;
+
+    /**
+     * 市场ID
+     */
+    private Long marketId;
+
+    /**
+     * 自增ID
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * 自增ID
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 轮播图ID
+     */
+    public Long getBannerId() {
+        return bannerId;
+    }
+
+    /**
+     * 轮播图ID
+     */
+    public void setBannerId(Long bannerId) {
+        this.bannerId = bannerId;
+    }
+
+    /**
+     * 内容
+     */
+    public String getContent() {
+        return content;
+    }
+
+    /**
+     * 内容
+     */
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    /**
+     * 图片链接
+     */
+    public String getPicUrl() {
+        return picUrl;
+    }
+
+    /**
+     * 图片链接
+     */
+    public void setPicUrl(String picUrl) {
+        this.picUrl = picUrl;
+    }
+
+    /**
+     * 市场ID
+     */
+    public Long getMarketId() {
+        return marketId;
+    }
+
+    /**
+     * 市场ID
+     */
+    public void setMarketId(Long marketId) {
+        this.marketId = marketId;
+    }
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", bannerId=").append(bannerId);
+        sb.append(", content=").append(content);
+        sb.append(", picUrl=").append(picUrl);
+        sb.append(", marketId=").append(marketId);
+        sb.append("]");
+        return sb.toString();
+    }
+}
 \ No newline at end of file
+package com.diligrp.etrade.admin.service;
+
+/**
+* @author dili
+* @description 针对表【banner_content(内容管理-轮播图)】的数据库操作Service
+* @createDate 2024-09-13 16:09:46
+*/
+public interface BannerContentService {
+
+}
+package com.diligrp.etrade.admin.service.impl;
+
+import com.diligrp.etrade.admin.dao.BannerContentMapper;
+import com.diligrp.etrade.admin.service.BannerContentService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+* @author dili
+* @description 针对表【banner_content(内容管理-轮播图)】的数据库操作Service实现
+* @createDate 2024-09-13 16:09:46
+*/
+@Service
+public class BannerContentServiceImpl implements BannerContentService{
+    private final Logger LOG = LoggerFactory.getLogger(BannerContentServiceImpl.class);
+
+    @Autowired
+    private BannerContentMapper bannerContentMapper;
+
+}
+
+
+
+
+<?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.diligrp.etrade.admin.dao.BannerContentMapper">
+
+    <resultMap id="BaseResultMap" type="com.diligrp.etrade.admin.model.BannerContent">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="bannerId" column="banner_id" jdbcType="BIGINT"/>
+            <result property="content" column="content" jdbcType="VARCHAR"/>
+            <result property="picUrl" column="pic_url" jdbcType="VARCHAR"/>
+            <result property="marketId" column="market_id" jdbcType="BIGINT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,banner_id,content,
+        pic_url,market_id
+    </sql>
+</mapper>
@@ -13,6 +13,7 @@ CREATE TABLE `banner`  (
     `banner_type_id` bigint NOT NULL COMMENT '轮播图所属类型ID',
     `title` varchar(25) NOT NULL COMMENT '标题',
     `pic_url` varchar(255) NOT NULL COMMENT '图片链接',
+    `link_type` int NULL DEFAULT NULL COMMENT '链接类型(枚举)',
     `link` varchar(255) NULL DEFAULT NULL COMMENT '链接',
     `remark` varchar(255) NULL DEFAULT NULL COMMENT '备注',
     `state` tinyint(1) NOT NULL COMMENT '状态：禁用0，启用1',
@@ -293,4 +294,15 @@ CREATE TABLE `dili_etrade`.`setting_shop_common`
     PRIMARY KEY (`id`) USING BTREE,
     UNIQUE KEY `unq_s_t_m` (`shop_id`, `type`, `market_id`) USING BTREE COMMENT '店铺唯一'
 ) ENGINE = InnoDB
-  AUTO_INCREMENT = 1 COMMENT ='店铺公共设置';
 \ No newline at end of file
+  AUTO_INCREMENT = 1 COMMENT ='店铺公共设置';
+
+DROP TABLE IF EXISTS `dili_xtrade`.`banner_content`;
+CREATE TABLE `dili_xtrade`.`banner_content` (
+                                                `id` bigint NOT NULL AUTO_INCREMENT COMMENT '自增ID',
+                                                `banner_id` bigint DEFAULT NULL COMMENT '轮播图ID',
+                                                `content` text  COMMENT '内容',
+                                                `pic_url` varchar(255) DEFAULT NULL COMMENT '图片链接',
+                                                `market_id` bigint NOT NULL COMMENT '市场ID',
+                                                PRIMARY KEY (`id`) USING BTREE,
+                                                UNIQUE INDEX `unq_banner_id`(`banner_id`, `market_id`) USING BTREE
+) ENGINE=InnoDB ROW_FORMAT=DYNAMIC COMMENT='内容管理-轮播图';
 \ No newline at end of file
+ALTER TABLE `dili_xtrade`.`banner`
+ADD COLUMN `link_type` int NULL DEFAULT NULL COMMENT '链接类型(枚举)' AFTER `pic_url`;
+
+DROP TABLE IF EXISTS `dili_xtrade`.`banner_content`;
+CREATE TABLE `dili_xtrade`.`banner_content` (
+    `id` bigint NOT NULL AUTO_INCREMENT COMMENT '自增ID',
+    `banner_id` bigint DEFAULT NULL COMMENT '轮播图ID',
+    `content` text  COMMENT '内容',
+    `pic_url` varchar(255) DEFAULT NULL COMMENT '图片链接',
+    `market_id` bigint NOT NULL COMMENT '市场ID',
+    PRIMARY KEY (`id`) USING BTREE,
+    UNIQUE INDEX `unq_banner_id`(`banner_id`, `market_id`) USING BTREE
+) ENGINE=InnoDB ROW_FORMAT=DYNAMIC COMMENT='内容管理-轮播图';
 \ No newline at end of file