From 8606bbf2cd141c6a9a88a458ca6d796ff8d91f30 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 27 Nov 2020 10:08:49 +0800 Subject: [PATCH 1/8] bug --- .../iformall/controller/WxMiniappThemeController.java | 3 +++ .../com/iformall/mapper/WxMiniappThemeMapper.java | 7 +++++++ .../com/iformall/service/WxMiniappThemeService.java | 2 ++ .../service/impl/WxMiniappThemeServiceImpl.java | 5 +++++ .../main/resources/mapper/WxMiniappThemeMapper.xml | 11 +++++++++-- 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java index 7bb6f5f0c..f89dcb10f 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java @@ -42,6 +42,9 @@ public class WxMiniappThemeController extends BaseController { wxThemeMall.setTenantId(getTenantInfo().getTenantId()); wxThemeMall.setThemeType(EnumThemeType.C.getCode()); List valueList = wxMiniappThemeService.findTheme(wxThemeMall); + if(valueList == null || valueList.size() == 0){ + valueList = wxMiniappThemeService.findDefaultList(EnumThemeType.C.getCode()); + } Map map = new HashMap(); for (WxMiniappThemeValue v:valueList) { diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMiniappThemeMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMiniappThemeMapper.java index 81f3db36d..83569a7e1 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMiniappThemeMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMiniappThemeMapper.java @@ -17,6 +17,13 @@ public interface WxMiniappThemeMapper extends CommonMapper List findChildList(Long id); + /** + * 默认主题 + * @param type + * @return + */ + List findDefaultList(Integer type); + /** * 伪删除 * @param record diff --git a/mallinkService/src/main/java/com/iformall/service/WxMiniappThemeService.java b/mallinkService/src/main/java/com/iformall/service/WxMiniappThemeService.java index a6482d51f..2ef8f2ef4 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMiniappThemeService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMiniappThemeService.java @@ -48,4 +48,6 @@ public interface WxMiniappThemeService { void insertValue(WxMiniappThemeValue record); List findTheme(WxThemeMall wxThemeMall); + + List findDefaultList(Integer code); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMiniappThemeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMiniappThemeServiceImpl.java index 6c3395a1f..2f37e7967 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMiniappThemeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMiniappThemeServiceImpl.java @@ -115,4 +115,9 @@ public class WxMiniappThemeServiceImpl implements WxMiniappThemeService { return wxMiniappThemeMapper.finThemeByThemeMall(wxThemeMall); } + @Override + public List findDefaultList(Integer code) { + return wxMiniappThemeMapper.findDefaultList(code); + } + } diff --git a/mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml b/mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml index d101b866c..3b61d17f7 100644 --- a/mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml @@ -23,7 +23,7 @@ where del_status = 0 and `id` = #{id} - and (`tenant_id` = 0 or`tenant_id` = #{tenantId}) + and (`tenant_id` = 1 or`tenant_id` = #{tenantId}) and `name` like concat('%', #{name},'%') @@ -46,6 +46,12 @@ left join wx_miniapp_theme_value mtv on mtv.miniapp_deploy_id = mtd.id and mtv.miniapp_theme_id = #{id}; + + update wx_miniapp_theme set `del_status` = 1, update_date = now() where id = #{id}; @@ -73,7 +79,8 @@ FROM wx_miniapp_theme_deploy mtd left join wx_miniapp_theme_value mtv on mtv.miniapp_deploy_id = mtd.id left join wx_theme_mall tm on tm.theme_id = mtv.miniapp_theme_id and tm.theme_type = mtd.theme_type - where mtd.theme_type = #{themeType} and tm.tenant_id = #{tenantId} + left join wx_miniapp_theme mt on tm.id = tm.theme_id + where mtd.theme_type = #{themeType} and mt.del_status = 0 and tm.tenant_id = #{tenantId} From f484982b5332b2421b8f009d99a01795bbc810f8 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 27 Nov 2020 10:16:48 +0800 Subject: [PATCH 2/8] bug --- .../src/main/resources/mapper/WxMiniappThemeMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml b/mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml index 3b61d17f7..52ec56678 100644 --- a/mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml @@ -16,7 +16,7 @@ - `id`,`tenant_id`,`name`,`remarks`,`preview_url`,`status`,`create_date`,`update_date` + `id`,`tenant_id`,`name`,`remarks`,`preview_url`,`type`,`create_date`,`update_date` @@ -79,7 +79,7 @@ FROM wx_miniapp_theme_deploy mtd left join wx_miniapp_theme_value mtv on mtv.miniapp_deploy_id = mtd.id left join wx_theme_mall tm on tm.theme_id = mtv.miniapp_theme_id and tm.theme_type = mtd.theme_type - left join wx_miniapp_theme mt on tm.id = tm.theme_id + left join wx_miniapp_theme mt on mt.id = tm.theme_id where mtd.theme_type = #{themeType} and mt.del_status = 0 and tm.tenant_id = #{tenantId} From 6265e554051745ce795e9f9da0d3826bd141c950 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 27 Nov 2020 11:02:17 +0800 Subject: [PATCH 3/8] bug --- .../java/com/iformall/config/ShiroConfig.java | 4 ++-- .../basic/WxMiniappThemeController.java | 19 ++++++++++++++++++- .../iformall/domain/po/WxMiniappTheme.java | 3 +++ .../service/WxMiniappThemeService.java | 2 ++ .../impl/WxMiniappThemeServiceImpl.java | 5 +++++ .../resources/mapper/WxMiniappThemeMapper.xml | 2 +- 6 files changed, 31 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java index eaadb1510..43c9e2138 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java @@ -153,8 +153,8 @@ public class ShiroConfig { //配置退出 过滤器,其中的具体的退出代码Shiro已经替我们实现了 filterChainDefinitionMap.put("/logout", "authc"); -// filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); - filterChainDefinitionMap.put("/**", "anon"); + filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); +// filterChainDefinitionMap.put("/**", "anon"); shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMiniappThemeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMiniappThemeController.java index c74addc02..764f6c017 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMiniappThemeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMiniappThemeController.java @@ -60,8 +60,25 @@ public class WxMiniappThemeController extends BaseController { if(wxMiniappTheme.getType() == null){ wxMiniappTheme.setType(EnumThemeType.C.getCode()); } - PageInfo page = wxMiniappThemeService.listAsPage(wxMiniappTheme, pageNum, pageSize); + WxThemeMall wxThemeMall = new WxThemeMall(); + wxThemeMall.setTenantId(getTenantInfo().getTenantId()); + wxThemeMall.setThemeType(EnumThemeType.C.getCode()); + WxThemeMall themeMall = wxMiniappThemeService.findThemeMall(wxThemeMall); + boolean updateStatus = true; + if(themeMall != null){ + for (WxMiniappTheme theme:page.getList()) { + if(theme.getId().equals(themeMall.getThemeId())){ + theme.setStatus(0); + updateStatus = false; + }else{ + theme.setStatus(1); + } + } + } + if(updateStatus){ + page.getList().get(0).setStatus(0); + } return new ResultData(page); }catch (Exception e){ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMiniappTheme.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMiniappTheme.java index 2ba559b47..fa3397120 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMiniappTheme.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMiniappTheme.java @@ -29,6 +29,9 @@ public class WxMiniappTheme implements Serializable { @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; + @TableField(exist = false) + private Integer status; + @TableField(exist = false) private List wxMiniappThemeValue; diff --git a/mallinkService/src/main/java/com/iformall/service/WxMiniappThemeService.java b/mallinkService/src/main/java/com/iformall/service/WxMiniappThemeService.java index 2ef8f2ef4..e996123ee 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMiniappThemeService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMiniappThemeService.java @@ -49,5 +49,7 @@ public interface WxMiniappThemeService { List findTheme(WxThemeMall wxThemeMall); + WxThemeMall findThemeMall(WxThemeMall wxThemeMall); + List findDefaultList(Integer code); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMiniappThemeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMiniappThemeServiceImpl.java index 2f37e7967..1166f34a1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMiniappThemeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMiniappThemeServiceImpl.java @@ -115,6 +115,11 @@ public class WxMiniappThemeServiceImpl implements WxMiniappThemeService { return wxMiniappThemeMapper.finThemeByThemeMall(wxThemeMall); } + @Override + public WxThemeMall findThemeMall(WxThemeMall wxThemeMall) { + return wxThemeMallMapper.findOne(wxThemeMall); + } + @Override public List findDefaultList(Integer code) { return wxMiniappThemeMapper.findDefaultList(code); diff --git a/mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml b/mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml index 52ec56678..74d7753d8 100644 --- a/mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml @@ -29,7 +29,7 @@ and `type` = #{type} - order by create_date asc + order by id asc