From ecba33528958e819b6f1868c7a80889d91f9f074 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 26 Nov 2020 19:07:10 +0800 Subject: [PATCH] bug --- .../java/com/iformall/config/ShiroConfig.java | 4 +- .../basic/WxMiniappThemeController.java | 28 ++++++++----- .../controller/WxMiniappThemeController.java | 23 ++++------- .../iformall/domain/po/WxMiniappTheme.java | 4 +- .../domain/po/WxMiniappThemeDeploy.java | 3 ++ .../com/iformall/domain/po/WxThemeMall.java | 18 +++++++++ .../com/iformall/enums/EnumThemeType.java | 39 +++++++++++++++++++ .../iformall/mapper/WxMiniappThemeMapper.java | 11 ++---- .../iformall/mapper/WxThemeMallMapper.java | 20 ++++++++++ .../service/WxMiniappThemeService.java | 5 ++- .../impl/WxMiniappThemeServiceImpl.java | 24 +++++++++--- .../resources/mapper/WxMiniappThemeMapper.xml | 29 ++++++++------ .../resources/mapper/WxThemeMallMapper.xml | 19 +++++++++ 13 files changed, 173 insertions(+), 54 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/WxThemeMall.java create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumThemeType.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/WxThemeMallMapper.java create mode 100644 mallinkService/src/main/resources/mapper/WxThemeMallMapper.xml diff --git a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java index 43c9e2138..eaadb1510 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 5b74a1e8b..25b948865 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMiniappThemeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMiniappThemeController.java @@ -13,6 +13,7 @@ import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxWeappInfo; import com.iformall.enums.EnumGroupSupport; import com.iformall.enums.EnumInvestUserType; +import com.iformall.enums.EnumThemeType; import com.iformall.enums.EnumUserAdmin; import com.iformall.service.*; import com.iformall.shiro.PasswordHelper; @@ -56,11 +57,12 @@ public class WxMiniappThemeController extends BaseController { wxMiniappTheme = new WxMiniappTheme(); } wxMiniappTheme.setTenantId(getTenantInfo().getTenantId()); - PageInfo page = wxMiniappThemeService.listAsPage(wxMiniappTheme, pageNum, pageSize); - if(page.getTotal() == 0){ - wxMiniappTheme.setTenantId("1"); - page = wxMiniappThemeService.listAsPage(wxMiniappTheme, pageNum, pageSize); + if(wxMiniappTheme.getType() == null){ + wxMiniappTheme.setType(EnumThemeType.C.getCode()); } + + PageInfo page = wxMiniappThemeService.listAsPage(wxMiniappTheme, pageNum, pageSize); + return new ResultData(page); }catch (Exception e){ logger.error(e.getMessage(),e); @@ -69,17 +71,22 @@ public class WxMiniappThemeController extends BaseController { } @ApiOperation("根据id使之生效") - @GetMapping("/updateEffect") + @PostMapping("/updateEffect") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) @SystemControllerLog(description = "根据id使之生效") @TenantIgnore - public ResultData updateEffect(Long id) { + public ResultData updateEffect(@RequestBody WxThemeMall wxThemeMall) { logger.debug("[" + getIpAddr() + "] WxMiniappThemeController::updateEffect"); - if(id == null){ + if(wxThemeMall == null || wxThemeMall.getThemeId() == null){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - wxMiniappThemeService.updateEffect(id); - return new ResultData(Result.SUCCESS, "删除成功", null); + wxThemeMall.setTenantId(getTenantInfo().getTenantId()); + if(wxThemeMall.getThemeType() == null){ + wxThemeMall.setThemeType(EnumThemeType.C.getCode()); + } + + wxMiniappThemeService.updateEffect(wxThemeMall); + return new ResultData(Result.SUCCESS); } @ApiOperation("根据id删除接口") @@ -105,6 +112,9 @@ public class WxMiniappThemeController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } wxMiniappTheme.setTenantId(getTenantInfo().getTenantId()); + if(wxMiniappTheme.getType() == null){ + wxMiniappTheme.setType(EnumThemeType.C.getCode()); + } wxMiniappThemeService.saveOrUpdate(wxMiniappTheme); return new ResultData(); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java index 41f6ae8e0..7bb6f5f0c 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java @@ -7,6 +7,8 @@ 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; @@ -36,22 +38,13 @@ public class WxMiniappThemeController extends BaseController { public ResultData getOne() { logger.debug("[" + getIpAddr() + "] WxMiniappThemeController::getOne"); try { - WxMiniappTheme wxMiniappTheme = new WxMiniappTheme(); - wxMiniappTheme.setStatus(0); - wxMiniappTheme.setTenantId(getTenantInfo().getTenantId()); - List list = wxMiniappThemeService.findList(wxMiniappTheme); - if(list == null || list.size() == 0){ - wxMiniappTheme.setTenantId("1"); - list = wxMiniappThemeService.findList(wxMiniappTheme); - } - if(list == null || list.size() == 0){ - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); - } - WxMiniappTheme wxMiniappTheme1 = list.get(0); - List childList = wxMiniappThemeService.findChildList(wxMiniappTheme1.getId()); - wxMiniappTheme1.setWxMiniappThemeValue(childList); + WxThemeMall wxThemeMall = new WxThemeMall(); + wxThemeMall.setTenantId(getTenantInfo().getTenantId()); + wxThemeMall.setThemeType(EnumThemeType.C.getCode()); + List valueList = wxMiniappThemeService.findTheme(wxThemeMall); + Map map = new HashMap(); - for (WxMiniappThemeValue v:childList) { + for (WxMiniappThemeValue v:valueList) { map.put(v.getName(),v); } return new ResultData(map); 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 2d5bfb2cb..2ba559b47 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMiniappTheme.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMiniappTheme.java @@ -21,8 +21,8 @@ public class WxMiniappTheme implements Serializable { private String remarks; @io.swagger.annotations.ApiModelProperty(value="预览图片",name="previewUrl") private String previewUrl; - @io.swagger.annotations.ApiModelProperty(value="0:生效中,1:失效",name="status") - private Integer status; + @io.swagger.annotations.ApiModelProperty(value="EnumThemeType",name="type") + private Integer type; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMiniappThemeDeploy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMiniappThemeDeploy.java index 1a8cb765a..3327e8fa6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMiniappThemeDeploy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMiniappThemeDeploy.java @@ -17,6 +17,9 @@ public class WxMiniappThemeDeploy implements Serializable { @io.swagger.annotations.ApiModelProperty(value="说明",name="remarks") private String remarks; + @io.swagger.annotations.ApiModelProperty(value="EnumThemeType",name="type") + private Integer themeType; + @io.swagger.annotations.ApiModelProperty(value="图标",name="defaultIcon") private String defaultIcon; @io.swagger.annotations.ApiModelProperty(value="样式",name="defaultStyle") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxThemeMall.java b/mallinkService/src/main/java/com/iformall/domain/po/WxThemeMall.java new file mode 100644 index 000000000..ad654a74a --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxThemeMall.java @@ -0,0 +1,18 @@ +package com.iformall.domain.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +@TableName(value = "wx_theme_mall") +@Data +public class WxThemeMall implements Serializable { + + private String tenantId; + + private Long themeId; + + private Integer themeType; + +} diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumThemeType.java b/mallinkService/src/main/java/com/iformall/enums/EnumThemeType.java new file mode 100644 index 000000000..cba483833 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumThemeType.java @@ -0,0 +1,39 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumThemeType { + + // 1-B端, 2-C端, 3-服务号, 4-订阅号 + + A(0, "A端"), + B(1, "B端"), + C(2, "C端"), + ; + + public static EnumThemeType getEnum(Integer code) { + for (EnumThemeType value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumThemeType(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMiniappThemeMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMiniappThemeMapper.java index 6d2e6e1ad..81f3db36d 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMiniappThemeMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMiniappThemeMapper.java @@ -4,6 +4,7 @@ import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxMiniappTheme; import com.iformall.domain.po.WxMiniappThemeDeploy; import com.iformall.domain.po.WxMiniappThemeValue; +import com.iformall.domain.po.WxThemeMall; import java.util.List; @@ -16,12 +17,6 @@ public interface WxMiniappThemeMapper extends CommonMapper List findChildList(Long id); - /** - * 使生效 - * @param record - */ - void updateStatus(WxMiniappTheme record); - /** * 伪删除 * @param record @@ -32,7 +27,7 @@ public interface WxMiniappThemeMapper extends CommonMapper * 查配置 * @return */ - List findDeployList(); + List findDeployList(Integer type); /** * 删value @@ -45,4 +40,6 @@ public interface WxMiniappThemeMapper extends CommonMapper * @param record */ void insertValue(WxMiniappThemeValue record); + + List finThemeByThemeMall(WxThemeMall wxThemeMall); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxThemeMallMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxThemeMallMapper.java new file mode 100644 index 000000000..44caf0c27 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxThemeMallMapper.java @@ -0,0 +1,20 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxMiniappTheme; +import com.iformall.domain.po.WxMiniappThemeDeploy; +import com.iformall.domain.po.WxMiniappThemeValue; +import com.iformall.domain.po.WxThemeMall; + +import java.util.List; + +/** + * @author + */ +public interface WxThemeMallMapper extends CommonMapper { + + void updateType(WxThemeMall record); + + WxThemeMall findOne(WxThemeMall record); + +} diff --git a/mallinkService/src/main/java/com/iformall/service/WxMiniappThemeService.java b/mallinkService/src/main/java/com/iformall/service/WxMiniappThemeService.java index e876a55b2..a6482d51f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMiniappThemeService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMiniappThemeService.java @@ -19,7 +19,7 @@ public interface WxMiniappThemeService { * @param id * @return */ - void updateEffect(Long id); + void updateEffect(WxThemeMall record); /** * 伪删除 @@ -31,7 +31,7 @@ public interface WxMiniappThemeService { * 查配置 * @return */ - List findDeployList(); + List findDeployList(Integer type); void saveOrUpdate(WxMiniappTheme record); @@ -47,4 +47,5 @@ public interface WxMiniappThemeService { */ void insertValue(WxMiniappThemeValue record); + List findTheme(WxThemeMall wxThemeMall); } 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 d6af2240e..6c3395a1f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMiniappThemeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMiniappThemeServiceImpl.java @@ -6,7 +6,9 @@ import com.iformall.common.IdWorker; import com.iformall.domain.po.WxMiniappTheme; import com.iformall.domain.po.WxMiniappThemeDeploy; import com.iformall.domain.po.WxMiniappThemeValue; +import com.iformall.domain.po.WxThemeMall; import com.iformall.mapper.WxMiniappThemeMapper; +import com.iformall.mapper.WxThemeMallMapper; import com.iformall.service.WxMiniappThemeService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,6 +26,9 @@ public class WxMiniappThemeServiceImpl implements WxMiniappThemeService { @Autowired WxMiniappThemeMapper wxMiniappThemeMapper; + @Autowired + WxThemeMallMapper wxThemeMallMapper; + @Override public List findList(WxMiniappTheme record) { return wxMiniappThemeMapper.findList(record); @@ -48,9 +53,13 @@ public class WxMiniappThemeServiceImpl implements WxMiniappThemeService { } @Override - public void updateEffect(Long id) { - WxMiniappTheme wxMiniappTheme = wxMiniappThemeMapper.selectById(id); - wxMiniappThemeMapper.updateStatus(wxMiniappTheme); + public void updateEffect(WxThemeMall record) { + WxThemeMall one = wxThemeMallMapper.findOne(record); + if(one == null){ + wxThemeMallMapper.insert(record); + }else{ + wxThemeMallMapper.updateType(record); + } } @Override @@ -61,8 +70,8 @@ public class WxMiniappThemeServiceImpl implements WxMiniappThemeService { } @Override - public List findDeployList() { - return wxMiniappThemeMapper.findDeployList(); + public List findDeployList(Integer type) { + return wxMiniappThemeMapper.findDeployList(type); } @Override @@ -101,4 +110,9 @@ public class WxMiniappThemeServiceImpl implements WxMiniappThemeService { wxMiniappThemeMapper.insertValue(record); } + @Override + public List findTheme(WxThemeMall wxThemeMall) { + return wxMiniappThemeMapper.finThemeByThemeMall(wxThemeMall); + } + } diff --git a/mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml b/mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml index 60cf39aa3..d101b866c 100644 --- a/mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml @@ -8,7 +8,7 @@ - + @@ -23,11 +23,11 @@ where del_status = 0 and `id` = #{id} - and `tenant_id` = #{tenantId} + and (`tenant_id` = 0 or`tenant_id` = #{tenantId}) and `name` like concat('%', #{name},'%') - - and `status` = #{status} + + and `type` = #{type} order by create_date asc @@ -46,19 +46,14 @@ 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 `status` = 0, update_date = now() where id = #{id} and del_status = 0; - update wx_miniapp_theme set `status` = 1, update_date = now() where tenant_id = #{tenantId} and id <> #{id} and `status` = 0 and del_status = 0 ; - - update wx_miniapp_theme set `del_status` = 1, update_date = now() where id = #{id}; - + SELECT id,`name`,remarks,theme_type themeType,default_icon defaultIcon,default_style defaultStyle + FROM wx_miniapp_theme_deploy where theme_type = #{themeType}; @@ -72,4 +67,14 @@ + + + diff --git a/mallinkService/src/main/resources/mapper/WxThemeMallMapper.xml b/mallinkService/src/main/resources/mapper/WxThemeMallMapper.xml new file mode 100644 index 000000000..aab55fa7a --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxThemeMallMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + update wx_theme_mall set theme_id = #{themeId} where tenant_id = #{tenantId} and theme_type = #{themeType}; + + + + +