Quellcode durchsuchen

Merge branch 'release_toaliyun_real_202112' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202112

release_toaliyun_real
xiaohanzi vor 4 Jahren
Ursprung
Commit
7a5123ed47
5 geänderte Dateien mit 45 neuen und 18 gelöschten Zeilen
  1. +36
    -10
      mallinkAdmin/src/main/resources/db/migration/V2021120900001__add_type.sql
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/mapper/WxMiniappThemeMapper.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxMiniappThemeService.java
  4. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxMiniappThemeServiceImpl.java
  5. +4
    -3
      mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml

+ 36
- 10
mallinkAdmin/src/main/resources/db/migration/V2021120900001__add_type.sql Datei anzeigen

@@ -35,18 +35,44 @@ UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 4, 5, 6, 50, 105, 110, 2
UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 251, 299, 300, 307, 308, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 686, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 714, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 60701, 60702]' WHERE `id` = 1035001036;




INSERT INTO `mallink`.`wx_miniapp_theme`(`id`, `tenant_id`, `name`, `remarks`, `preview_url`, `type`, `mould_type`, `create_date`, `update_date`, `del_status`) VALUES (5, '1', '新版默认主题', NULL, 'https://formall.oss-accelerate.aliyuncs.com/cimg/newstyle/style-3.png', 2, 1, '2020-12-18 15:53:09', '2020-12-18 15:53:09', 0);

delete from wx_miniapp_theme_deploy where id in (4444,4455,4466,4477,4488,4499,5500,5511);
delete from wx_miniapp_theme_value where miniapp_deploy_id in (4444,4455,4466,4477,4488,4499,5500,5511);

INSERT INTO `mallink`.`wx_customize_module`(`id`, `tenant_id`, `parent_tenant_id`, `theme_id`, `name`, `remarks`, `theme_type`, `icon`, `style`, `link_type`, `link_url`, `out_link_appid`, `sort`, `is_using`, `del_status`, `create_date`, `update_date`) VALUES (41, '0', NULL, 5, '砍价', NULL, 2, 'https://formall.oss-accelerate.aliyuncs.com/1026/malinkadmin/2021-12-14/77c7079fe3af4a14b5ad4e0b7506f0e6.png', NULL, 1, '/pages/bargain/bargain', NULL, 1, 1, 0, '2021-12-01 13:38:32', '2021-12-01 13:38:35');
INSERT INTO `mallink`.`wx_customize_module`(`id`, `tenant_id`, `parent_tenant_id`, `theme_id`, `name`, `remarks`, `theme_type`, `icon`, `style`, `link_type`, `link_url`, `out_link_appid`, `sort`, `is_using`, `del_status`, `create_date`, `update_date`) VALUES (42, '0', NULL, 5, '拼团', NULL, 2, 'https://formall.oss-accelerate.aliyuncs.com/1026/malinkadmin/2021-12-14/b3edb50a154a4ee58ec3a945e7d34f3c.png', NULL, 1, '/pages/spellGroup/spellGroup', NULL, 2, 1, 0, '2021-12-01 13:39:36', '2021-12-01 13:39:39');
INSERT INTO `mallink`.`wx_customize_module`(`id`, `tenant_id`, `parent_tenant_id`, `theme_id`, `name`, `remarks`, `theme_type`, `icon`, `style`, `link_type`, `link_url`, `out_link_appid`, `sort`, `is_using`, `del_status`, `create_date`, `update_date`) VALUES (43, '0', NULL, 5, '消费卡', NULL, 2, 'https://formall.oss-accelerate.aliyuncs.com/1026/malinkadmin/2021-12-14/494f99c4c57844d7b8b2bbb3ad0bf704.png', NULL, 1, '/pages/discountCardList/discountCardList', NULL, 3, 1, 0, '2021-12-01 13:40:34', '2021-12-01 13:40:37');
INSERT INTO `mallink`.`wx_customize_module`(`id`, `tenant_id`, `parent_tenant_id`, `theme_id`, `name`, `remarks`, `theme_type`, `icon`, `style`, `link_type`, `link_url`, `out_link_appid`, `sort`, `is_using`, `del_status`, `create_date`, `update_date`) VALUES (44, '0', NULL, 5, '我的卷包', NULL, 2, 'https://formall.oss-accelerate.aliyuncs.com/1026/malinkadmin/2021-12-14/24644b2189fa46ceaf5f9e4879efecb4.png', NULL, 1, '/pages/game/index', NULL, 4, 1, 0, '2021-12-01 13:41:57', '2021-12-01 13:42:00');
INSERT INTO `mallink`.`wx_customize_module`(`id`, `tenant_id`, `parent_tenant_id`, `theme_id`, `name`, `remarks`, `theme_type`, `icon`, `style`, `link_type`, `link_url`, `out_link_appid`, `sort`, `is_using`, `del_status`, `create_date`, `update_date`) VALUES (45, '0', NULL, 5, '每日签到', NULL, 2, 'https://formall.oss-accelerate.aliyuncs.com/1026/malinkadmin/2021-12-14/cceadb8763f149608b551d1eb4d81fa3.png', NULL, 1, '/pages/activityCalendar/activityCalendar', NULL, 5, 1, 0, '2021-12-01 13:42:50', '2021-12-01 13:42:53');
INSERT INTO `mallink`.`wx_customize_module`(`id`, `tenant_id`, `parent_tenant_id`, `theme_id`, `name`, `remarks`, `theme_type`, `icon`, `style`, `link_type`, `link_url`, `out_link_appid`, `sort`, `is_using`, `del_status`, `create_date`, `update_date`) VALUES (46, '0', NULL, 5, '活动日历', NULL, 2, 'https://formall.oss-accelerate.aliyuncs.com/1026/malinkadmin/2021-12-14/741827da43204dbcbcf9d2570497eee1.png', NULL, 1, '/pages/dateLsit/dateLsit', NULL, 6, 1, 0, '2021-12-01 13:43:57', '2021-12-01 13:44:00');
INSERT INTO `mallink`.`wx_customize_module`(`id`, `tenant_id`, `parent_tenant_id`, `theme_id`, `name`, `remarks`, `theme_type`, `icon`, `style`, `link_type`, `link_url`, `out_link_appid`, `sort`, `is_using`, `del_status`, `create_date`, `update_date`) VALUES (47, '0', NULL, 5, '积分商城', NULL, 2, 'https://formall.oss-accelerate.aliyuncs.com/1026/malinkadmin/2021-12-14/9e60741507cc40e18a9725537e513b00.png', NULL, 1, '/pages/integralmall/index', NULL, 7, 1, 0, '2021-12-01 13:44:45', '2021-12-01 13:44:48');
INSERT INTO `mallink`.`wx_customize_module`(`id`, `tenant_id`, `parent_tenant_id`, `theme_id`, `name`, `remarks`, `theme_type`, `icon`, `style`, `link_type`, `link_url`, `out_link_appid`, `sort`, `is_using`, `del_status`, `create_date`, `update_date`) VALUES (48, '0', NULL, 5, '直播厅', NULL, 2, 'https://formall.oss-accelerate.aliyuncs.com/1026/malinkadmin/2021-12-14/6ad1409e8e6f481db26ce3e9a22f0a04.png', NULL, 1, '/pages2/live/livelist/index', NULL, 8, 1, 0, '2021-12-01 13:45:25', '2021-12-01 13:45:28');

ALTER TABLE `mallink`.`wx_miniapp_theme_deploy`
DROP INDEX `name_un`,
ADD UNIQUE INDEX `name_un`(`name`, `mould_type`) USING BTREE;

INSERT INTO `mallink`.`wx_miniapp_theme_deploy`(`id`, `name`, `remarks`, `theme_type`, `mould_type`, `default_icon`, `default_style`) VALUES (11111, 'sy_top', '首页顶部', 2, 1, NULL, '#F4F5F9;');
INSERT INTO `mallink`.`wx_miniapp_theme_deploy`(`id`, `name`, `remarks`, `theme_type`, `mould_type`, `default_icon`, `default_style`) VALUES (11112, 'sy_top_f', '首页顶部字体', 2, 1, NULL, '#000;');
INSERT INTO `mallink`.`wx_miniapp_theme_deploy`(`id`, `name`, `remarks`, `theme_type`, `mould_type`, `default_icon`, `default_style`) VALUES (12222, 'sy_xxb', '首页个人信息块', 2, 1, NULL, 'background: #FFF;');
INSERT INTO `mallink`.`wx_miniapp_theme_deploy`(`id`, `name`, `remarks`, `theme_type`, `mould_type`, `default_icon`, `default_style`) VALUES (12223, 'sy_xxb_nf', '首页个人信息名字', 2, 1, NULL, 'color:#000;');
INSERT INTO `mallink`.`wx_miniapp_theme_deploy`(`id`, `name`, `remarks`, `theme_type`, `mould_type`, `default_icon`, `default_style`) VALUES (12224, 'sy_xxb_cf', '首页个人信息成长值', 2, 1, NULL, 'color:#999999;');
INSERT INTO `mallink`.`wx_miniapp_theme_deploy`(`id`, `name`, `remarks`, `theme_type`, `mould_type`, `default_icon`, `default_style`) VALUES (13333, 'sy_qrc', '首页二维码快', 2, 1, 'https://formall.oss-accelerate.aliyuncs.com/cimg/lqcbarcode.png', 'background: #FFF;');
INSERT INTO `mallink`.`wx_miniapp_theme_deploy`(`id`, `name`, `remarks`, `theme_type`, `mould_type`, `default_icon`, `default_style`) VALUES (13344, 'sy_bbg', '首页banner背景', 2, 1, NULL, 'background: initial;');
INSERT INTO `mallink`.`wx_miniapp_theme_deploy`(`id`, `name`, `remarks`, `theme_type`, `mould_type`, `default_icon`, `default_style`) VALUES (14433, 'sy_mbg', '首页中岛背景', 2, 1, NULL, 'background: initial;');
INSERT INTO `mallink`.`wx_miniapp_theme_deploy`(`id`, `name`, `remarks`, `theme_type`, `mould_type`, `default_icon`, `default_style`) VALUES (15555, 'sy_bkzq', '首页爆款专区', 2, 1, NULL, 'color:#000;');
INSERT INTO `mallink`.`wx_miniapp_theme_deploy`(`id`, `name`, `remarks`, `theme_type`, `mould_type`, `default_icon`, `default_style`) VALUES (16666, 'sy_lmyt', '首页类目业态', 2, 1, NULL, 'color:#000;');
INSERT INTO `mallink`.`wx_miniapp_theme_deploy`(`id`, `name`, `remarks`, `theme_type`, `mould_type`, `default_icon`, `default_style`) VALUES (17700, 't_uc', '导航我的', 2, 1, 'https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_czl_wd.png', '#999;');
INSERT INTO `mallink`.`wx_miniapp_theme_deploy`(`id`, `name`, `remarks`, `theme_type`, `mould_type`, `default_icon`, `default_style`) VALUES (17701, 't_uc_std', '导航我的(选中)', 2, 1, 'https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_czl_wd1.png', '#E9D8C0;');
INSERT INTO `mallink`.`wx_miniapp_theme_deploy`(`id`, `name`, `remarks`, `theme_type`, `mould_type`, `default_icon`, `default_style`) VALUES (17777, 't_in', '导航首页', 2, 1, 'https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_czl_sy.png', '#999;');
INSERT INTO `mallink`.`wx_miniapp_theme_deploy`(`id`, `name`, `remarks`, `theme_type`, `mould_type`, `default_icon`, `default_style`) VALUES (17778, 't_in_std', '导航首页(选中)', 2, 1, 'https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_czl_sy1.png', '#E9D8C0;');
INSERT INTO `mallink`.`wx_miniapp_theme_deploy`(`id`, `name`, `remarks`, `theme_type`, `mould_type`, `default_icon`, `default_style`) VALUES (17788, 't_md', '导航门店', 2, 1, 'https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_czl_md.png', '#999;');
INSERT INTO `mallink`.`wx_miniapp_theme_deploy`(`id`, `name`, `remarks`, `theme_type`, `mould_type`, `default_icon`, `default_style`) VALUES (17789, 't_md_std', '导航门店(选中)', 2, 1, 'https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_czl_md1.png', '#E9D8C0;');
INSERT INTO `mallink`.`wx_miniapp_theme_deploy`(`id`, `name`, `remarks`, `theme_type`, `mould_type`, `default_icon`, `default_style`) VALUES (17799, 't_tc', '导航停车', 2, 1, 'https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_czl_tc.png', '#999;');
INSERT INTO `mallink`.`wx_miniapp_theme_deploy`(`id`, `name`, `remarks`, `theme_type`, `mould_type`, `default_icon`, `default_style`) VALUES (17800, 't_tc_std', '导航停车(选中)', 2, 1, 'https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_czl_tc1.png', '#E9D8C0;');



INSERT INTO `mallink`.`wx_customize_module`(`id`, `tenant_id`, `parent_tenant_id`, `theme_id`, `name`, `remarks`, `theme_type`, `icon`, `style`, `link_type`, `link_url`, `out_link_appid`, `sort`, `is_using`, `del_status`, `create_date`, `update_date`) VALUES (41, '0', NULL, 5, '砍价', NULL, 2, 'https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_ic_jgq_kj.png', NULL, 1, '/pages/bargain/bargain', NULL, 1, 1, 0, '2021-12-01 13:38:32', '2021-12-01 13:38:35');
INSERT INTO `mallink`.`wx_customize_module`(`id`, `tenant_id`, `parent_tenant_id`, `theme_id`, `name`, `remarks`, `theme_type`, `icon`, `style`, `link_type`, `link_url`, `out_link_appid`, `sort`, `is_using`, `del_status`, `create_date`, `update_date`) VALUES (42, '0', NULL, 5, '拼团', NULL, 2, 'https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_ic_jgq_pt.png', NULL, 1, '/pages/spellGroup/spellGroup', NULL, 2, 1, 0, '2021-12-01 13:39:36', '2021-12-01 13:39:39');
INSERT INTO `mallink`.`wx_customize_module`(`id`, `tenant_id`, `parent_tenant_id`, `theme_id`, `name`, `remarks`, `theme_type`, `icon`, `style`, `link_type`, `link_url`, `out_link_appid`, `sort`, `is_using`, `del_status`, `create_date`, `update_date`) VALUES (43, '0', NULL, 5, '消费卡', NULL, 2, 'https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_ic_jgq_xfk.png', NULL, 1, '/pages/discountCardList/discountCardList', NULL, 3, 1, 0, '2021-12-01 13:40:34', '2021-12-01 13:40:37');
INSERT INTO `mallink`.`wx_customize_module`(`id`, `tenant_id`, `parent_tenant_id`, `theme_id`, `name`, `remarks`, `theme_type`, `icon`, `style`, `link_type`, `link_url`, `out_link_appid`, `sort`, `is_using`, `del_status`, `create_date`, `update_date`) VALUES (44, '0', NULL, 5, '积分商城', NULL, 2, 'https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_ic_jgq_jfsc.png', NULL, 1, '/pages/integralmall/index', NULL, 4, 1, 0, '2021-12-01 13:44:45', '2021-12-01 13:44:48');
INSERT INTO `mallink`.`wx_customize_module`(`id`, `tenant_id`, `parent_tenant_id`, `theme_id`, `name`, `remarks`, `theme_type`, `icon`, `style`, `link_type`, `link_url`, `out_link_appid`, `sort`, `is_using`, `del_status`, `create_date`, `update_date`) VALUES (45, '0', NULL, 5, '每日签到', NULL, 2, 'https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_ic_jgq_qd.png', NULL, 1, '/pages/activityCalendar/activityCalendar', NULL, 5, 1, 0, '2021-12-01 13:42:50', '2021-12-01 13:42:53');
INSERT INTO `mallink`.`wx_customize_module`(`id`, `tenant_id`, `parent_tenant_id`, `theme_id`, `name`, `remarks`, `theme_type`, `icon`, `style`, `link_type`, `link_url`, `out_link_appid`, `sort`, `is_using`, `del_status`, `create_date`, `update_date`) VALUES (46, '0', NULL, 5, '活动日历', NULL, 2, 'https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_ic_jgq_hdrl.png', NULL, 1, '/pages/dateLsit/dateLsit', NULL, 6, 1, 0, '2021-12-01 13:43:57', '2021-12-01 13:44:00');
INSERT INTO `mallink`.`wx_customize_module`(`id`, `tenant_id`, `parent_tenant_id`, `theme_id`, `name`, `remarks`, `theme_type`, `icon`, `style`, `link_type`, `link_url`, `out_link_appid`, `sort`, `is_using`, `del_status`, `create_date`, `update_date`) VALUES (47, '0', NULL, 5, '直播厅', NULL, 2, 'https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_ic_jgq_zbt.png', NULL, 1, '/pages2/live/livelist/index', NULL, 7, 1, 0, '2021-12-01 13:45:25', '2021-12-01 13:45:28');
INSERT INTO `mallink`.`wx_customize_module`(`id`, `tenant_id`, `parent_tenant_id`, `theme_id`, `name`, `remarks`, `theme_type`, `icon`, `style`, `link_type`, `link_url`, `out_link_appid`, `sort`, `is_using`, `del_status`, `create_date`, `update_date`) VALUES (48, '0', NULL, 5, '玩游戏', NULL, 2, 'https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_ic_jgq_wyx.png', NULL, 1, '/pages/game/index', NULL, 8, 1, 0, '2021-12-01 13:41:57', '2021-12-01 13:42:00');



+ 2
- 2
mallinkService/src/main/java/com/iformall/mapper/WxMiniappThemeMapper.java Datei anzeigen

@@ -20,10 +20,10 @@ public interface WxMiniappThemeMapper extends CommonMapper<WxMiniappTheme, Long>

/**
* 默认主题
* @param type
* @param
* @return
*/
List<WxMiniappThemeValue> findDefaultList(@Param("type") Integer type, @Param("mouldType")Integer mouldType);
List<WxMiniappThemeValue> findDefaultList(@Param("themeType") Integer themeType, @Param("mouldType")Integer mouldType);

/**
* 伪删除


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxMiniappThemeService.java Datei anzeigen

@@ -47,5 +47,5 @@ public interface WxMiniappThemeService {

WxThemeMall findThemeMall(WxThemeMall wxThemeMall);

List<WxMiniappThemeValue> findDefaultList(Integer code,Integer mouldType);
List<WxMiniappThemeValue> findDefaultList(Integer themeType,Integer mouldType);
}

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxMiniappThemeServiceImpl.java Datei anzeigen

@@ -120,8 +120,8 @@ public class WxMiniappThemeServiceImpl implements WxMiniappThemeService {
}

@Override
public List<WxMiniappThemeValue> findDefaultList(Integer code,Integer mouldType) {
return wxMiniappThemeMapper.findDefaultList(code,mouldType);
public List<WxMiniappThemeValue> findDefaultList(Integer themeType,Integer mouldType) {
return wxMiniappThemeMapper.findDefaultList(themeType,mouldType);
}

}

+ 4
- 3
mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml Datei anzeigen

@@ -56,9 +56,10 @@
</update>


<select id="findDeployList" parameterType="Integer" resultType="com.iformall.domain.po.WxMiniappThemeDeploy">
SELECT id,`name`,remarks,theme_type themeType,default_icon defaultIcon,default_style defaultStyle
FROM wx_miniapp_theme_deploy where theme_type = #{themeType} and mould_type = #{mouldType};
<select id="findDefaultList" resultType="com.iformall.domain.po.WxMiniappThemeValue">
SELECT `name`, remarks,default_icon icon,default_style styleClass
FROM wx_miniapp_theme_deploy
where theme_type = #{themeType} and mould_type = #{mouldType};
</select>




Laden…
Abbrechen
Speichern