Просмотр исходного кода

init sql

release_toaliyun_real
xhxu 5 лет назад
Родитель
Сommit
b71ad9b4cd
3 измененных файлов: 21 добавлений и 6 удалений
  1. +17
    -0
      mallinkAdmin/src/main/resources/db/migration/V202101280001__wx_miniapp_theme.sql
  2. +0
    -4
      mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java
  3. +4
    -2
      mallinkService/src/main/resources/mapper/WxActivityMapper.xml

+ 17
- 0
mallinkAdmin/src/main/resources/db/migration/V202101280001__wx_miniapp_theme.sql Просмотреть файл

@@ -0,0 +1,17 @@
update wx_miniapp_theme_deploy set default_icon = ''https://formall.oss-accelerate.aliyuncs.com/cimg/new_kanjia.png'' where id = 4444;
update wx_miniapp_theme_deploy set default_icon = ''https://formall.oss-accelerate.aliyuncs.com/cimg/new_pintuan.png'' where id = 4455;
update wx_miniapp_theme_deploy set default_icon = ''https://formall.oss-accelerate.aliyuncs.com/cimg/zhibo.png'' where id = 4466;
update wx_miniapp_theme_deploy set default_icon = ''https://formall.oss-accelerate.aliyuncs.com/cimg/new_xiaofeika.png'' where id = 4477;
update wx_miniapp_theme_deploy set default_icon = ''https://formall.oss-accelerate.aliyuncs.com/cimg/jifen.png'' where id = 4488;

INSERT INTO `wx_miniapp_theme_deploy`(`id`, `name`, `remarks`, `theme_type`, `default_icon`, `default_style`) VALUES (4499, ''sy_qd'', ''首页签到图标'', 2, ''https://formall.oss-accelerate.aliyuncs.com/cimg/qiandao.png'', NULL);
INSERT INTO `wx_miniapp_theme_deploy`(`id`, `name`, `remarks`, `theme_type`, `default_icon`, `default_style`) VALUES (5500, ''sy_hd'', ''首页活动图标'', 2, ''https://formall.oss-accelerate.aliyuncs.com/cimg/huodong.png'', NULL);
INSERT INTO `wx_miniapp_theme_deploy`(`id`, `name`, `remarks`, `theme_type`, `default_icon`, `default_style`) VALUES (5511, ''sy_yx'', ''首页游戏图标'', 2, ''https://formall.oss-accelerate.aliyuncs.com/cimg/youxi.png'', NULL);

INSERT INTO `wx_miniapp_theme_value`(`id`, `miniapp_theme_id`, `miniapp_deploy_id`, `icon`, `style_class`) VALUES (1010, 2, 4499, NULL, NULL);
INSERT INTO `wx_miniapp_theme_value`(`id`, `miniapp_theme_id`, `miniapp_deploy_id`, `icon`, `style_class`) VALUES (1020, 2, 5500, NULL, NULL);
INSERT INTO `wx_miniapp_theme_value`(`id`, `miniapp_theme_id`, `miniapp_deploy_id`, `icon`, `style_class`) VALUES (1030, 2, 5511, NULL, NULL);

INSERT INTO `wx_miniapp_theme_value`(`id`, `miniapp_theme_id`, `miniapp_deploy_id`, `icon`, `style_class`) VALUES (3010, 3, 4499, NULL, NULL);
INSERT INTO `wx_miniapp_theme_value`(`id`, `miniapp_theme_id`, `miniapp_deploy_id`, `icon`, `style_class`) VALUES (3020, 3, 5500, NULL, NULL);
INSERT INTO `wx_miniapp_theme_value`(`id`, `miniapp_theme_id`, `miniapp_deploy_id`, `icon`, `style_class`) VALUES (3030, 3, 5511, NULL, NULL);

+ 0
- 4
mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java Просмотреть файл

@@ -1,18 +1,14 @@
package com.iformall.controller;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.RedisCache;
import com.iformall.annotation.TenantIgnore;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxMiniappTheme;
import com.iformall.domain.po.WxMiniappThemeValue;
import com.iformall.domain.po.WxThemeMall;
import com.iformall.enums.EnumThemeType;
import com.iformall.service.WxMiniappThemeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;


+ 4
- 2
mallinkService/src/main/resources/mapper/WxActivityMapper.xml Просмотреть файл

@@ -94,8 +94,10 @@
<!-- </if>-->

<if test=" null != startDate and null != endDate ">
and ((`activity_start_time` &gt;= #{startDate} and `activity_start_time` &lt;= #{endDate})
or (`activity_end_time` &gt;= #{startDate} and `activity_end_time` &lt;= #{endDate}))
and not(`activity_end_time` &lt; #{startDate} or `activity_start_time` &gt; #{endDate})
/*and ((`activity_start_time` &gt;= #{startDate} and `activity_start_time` &lt;= #{endDate})
or (`activity_end_time` &gt;= #{startDate} and `activity_end_time` &lt;= #{endDate})
or (`activity_start_time` &lt;= #{startDate} and `activity_end_time` &gt;= #{endDate}))*/
</if>
<if test=" null != sendMsg ">


Загрузка…
Отмена
Сохранить