From 6c1a535a157864b177c17aa14afcda9ad92a2a9b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 25 Aug 2021 15:08:23 +0800
Subject: [PATCH] 20210825

---
 gc-sys/src/main/java/com/xzx/gc/system/controller/ApiBannerNewsController.java |    2 +-
 gc-shop/src/main/resources/sql                                                 |   15 ++++++++++++++-
 gc-sys/src/main/resources/mapper/system/SysPopupMapper.xml                     |    5 +++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/gc-shop/src/main/resources/sql b/gc-shop/src/main/resources/sql
index 6d65312..0ae06e8 100644
--- a/gc-shop/src/main/resources/sql
+++ b/gc-shop/src/main/resources/sql
@@ -80,7 +80,20 @@
 MODIFY COLUMN `rule_type`  varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '规则类型:1:红包规则,2:分享分利规则 3阶梯 4推广 5重量返利  7提成 8提佣 9积分规则 10邀请奖励规则' AFTER `share_ratio`;
 
 
-
+CREATE TABLE `xzx_sys_popup` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `area` int(11) DEFAULT NULL COMMENT '广告区域 1:首页2:其他',
+  `name` varchar(100) DEFAULT NULL COMMENT '广告名称',
+  `aims` int(11) DEFAULT NULL COMMENT '弹窗人群:1:新用戶 2:老用戶',
+  `rules` int(11) DEFAULT NULL COMMENT '弹窗规则:1:每日首次登录 2:每次登录',
+  `is_out` int(11) DEFAULT NULL COMMENT '是否跳转 1:是 2:否',
+  `out_text` varchar(500) DEFAULT NULL COMMENT '内容链接',
+  `start_time` varchar(100) DEFAULT NULL COMMENT '开始日期',
+  `end_time` varchar(100) DEFAULT NULL COMMENT '结束日期',
+  `img` varchar(500) DEFAULT NULL COMMENT '上传图片',
+  `state` int(11) DEFAULT NULL COMMENT '是否上架 1:是2:否',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COMMENT='首页弹窗表';
 
 
 
diff --git a/gc-sys/src/main/java/com/xzx/gc/system/controller/ApiBannerNewsController.java b/gc-sys/src/main/java/com/xzx/gc/system/controller/ApiBannerNewsController.java
index 8dcb3a5..36bcd98 100644
--- a/gc-sys/src/main/java/com/xzx/gc/system/controller/ApiBannerNewsController.java
+++ b/gc-sys/src/main/java/com/xzx/gc/system/controller/ApiBannerNewsController.java
@@ -67,7 +67,7 @@
     @ApiResponses({
             @ApiResponse(code = 200, message = "success", response = ApiSysPopupVo.class)
     })
-    @PostMapping(value = "/news/newsInfo")
+    @PostMapping(value = "/news/sysPopupInfo")
     public JsonResult<ApiSysPopupVo> sysPopupInfo(@RequestBody ApiSysPopupDto apiSysPopupDto, HttpServletRequest request) {
         apiSysPopupDto.setUserId(getUserId(request));
         return JsonResult.success(sysNewsService.sysPopupInfo(apiSysPopupDto));
diff --git a/gc-sys/src/main/resources/mapper/system/SysPopupMapper.xml b/gc-sys/src/main/resources/mapper/system/SysPopupMapper.xml
new file mode 100644
index 0000000..684d41e
--- /dev/null
+++ b/gc-sys/src/main/resources/mapper/system/SysPopupMapper.xml
@@ -0,0 +1,5 @@
+<?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.xzx.gc.system.mapper.SysPopupMapper">
+
+</mapper>

--
Gitblit v1.9.1