Przeglądaj źródła

bug

release_toaliyun_real
xhxu 5 lat temu
rodzic
commit
6265e55405
6 zmienionych plików z 31 dodań i 4 usunięć
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java
  2. +18
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMiniappThemeController.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMiniappTheme.java
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxMiniappThemeService.java
  5. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMiniappThemeServiceImpl.java
  6. +1
    -1
      mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml

+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java Wyświetl plik

@@ -153,8 +153,8 @@ public class ShiroConfig {
//配置退出 过滤器,其中的具体的退出代码Shiro已经替我们实现了 //配置退出 过滤器,其中的具体的退出代码Shiro已经替我们实现了
filterChainDefinitionMap.put("/logout", "authc"); filterChainDefinitionMap.put("/logout", "authc");


// filterChainDefinitionMap.put("/**", "corsFilter,token,authc");
filterChainDefinitionMap.put("/**", "anon");
filterChainDefinitionMap.put("/**", "corsFilter,token,authc");
// filterChainDefinitionMap.put("/**", "anon");




shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap);


+ 18
- 1
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMiniappThemeController.java Wyświetl plik

@@ -60,8 +60,25 @@ public class WxMiniappThemeController extends BaseController {
if(wxMiniappTheme.getType() == null){ if(wxMiniappTheme.getType() == null){
wxMiniappTheme.setType(EnumThemeType.C.getCode()); wxMiniappTheme.setType(EnumThemeType.C.getCode());
} }

PageInfo<WxMiniappTheme> page = wxMiniappThemeService.listAsPage(wxMiniappTheme, pageNum, pageSize); PageInfo<WxMiniappTheme> 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); return new ResultData(page);
}catch (Exception e){ }catch (Exception e){


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMiniappTheme.java Wyświetl plik

@@ -29,6 +29,9 @@ public class WxMiniappTheme implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate; private Date updateDate;


@TableField(exist = false)
private Integer status;

@TableField(exist = false) @TableField(exist = false)
private List<WxMiniappThemeValue> wxMiniappThemeValue; private List<WxMiniappThemeValue> wxMiniappThemeValue;




+ 2
- 0
mallinkService/src/main/java/com/iformall/service/WxMiniappThemeService.java Wyświetl plik

@@ -49,5 +49,7 @@ public interface WxMiniappThemeService {


List<WxMiniappThemeValue> findTheme(WxThemeMall wxThemeMall); List<WxMiniappThemeValue> findTheme(WxThemeMall wxThemeMall);


WxThemeMall findThemeMall(WxThemeMall wxThemeMall);

List<WxMiniappThemeValue> findDefaultList(Integer code); List<WxMiniappThemeValue> findDefaultList(Integer code);
} }

+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMiniappThemeServiceImpl.java Wyświetl plik

@@ -115,6 +115,11 @@ public class WxMiniappThemeServiceImpl implements WxMiniappThemeService {
return wxMiniappThemeMapper.finThemeByThemeMall(wxThemeMall); return wxMiniappThemeMapper.finThemeByThemeMall(wxThemeMall);
} }


@Override
public WxThemeMall findThemeMall(WxThemeMall wxThemeMall) {
return wxThemeMallMapper.findOne(wxThemeMall);
}

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


+ 1
- 1
mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml Wyświetl plik

@@ -29,7 +29,7 @@
<if test=" null != type"> <if test=" null != type">
and `type` = #{type} and `type` = #{type}
</if> </if>
order by create_date asc
order by id asc
</sql> </sql>


<select id="findList" parameterType="com.iformall.domain.po.WxMiniappTheme" resultMap="BaseResultMap"> <select id="findList" parameterType="com.iformall.domain.po.WxMiniappTheme" resultMap="BaseResultMap">


Ładowanie…
Anuluj
Zapisz