Przeglądaj źródła

[会员][修复]:会员筛选器接口问题

release_toaliyun_real
hupeng 7 lat temu
rodzic
commit
547a92aa94
4 zmienionych plików z 29 dodań i 1 usunięć
  1. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java
  2. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java
  3. +11
    -0
      mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java
  4. +14
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java

+ 2
- 1
mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java Wyświetl plik

@@ -8,6 +8,7 @@ import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.dto.WxCUserBasicInfoDto;
import com.iformall.domain.dto.WxCUserBasicInfoFilterDto;
import com.iformall.domain.po.*;
import com.iformall.enums.EnumAssignTagsTrigger;
@@ -486,7 +487,7 @@ public class WxCUserBasicInfoController extends BaseController {

@ApiOperation("获取会员过滤器")
@PostMapping("/listByFilter")
public ResultData listByFilter(@RequestBody List<WxCUserBasicInfoFilterDto> filterList) {
public ResultData listByFilter(@RequestParam List<WxCUserBasicInfoFilterDto> filterList) {
logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::listFilter");
return new ResultData(wxCUserBasicInfoService.listByFilter(getTenantId(),filterList));
}


+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java Wyświetl plik

@@ -10,6 +10,8 @@ public class UrlCheck {
|| url.contains("cimgUpload")
|| url.contains("ueditor/exec")
|| url.contains("/wxCUserBasicInfo/importTemplate")
|| url.contains("/wxCUserBasicInfo/countByFilter")
|| url.contains("/wxCUserBasicInfo/listByFilter")
|| url.contains("wxMsgCallback")
|| url.contains("notify")
|| url.contains("pvlog");


+ 11
- 0
mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java Wyświetl plik

@@ -59,6 +59,9 @@ public class WxCUserBasicInfoDto implements Serializable{
@Transient
protected String sortColumns;

@Transient
protected List<WxCUserBasicInfoFilterDto> filterList;

public Long getId() {
return id;
}
@@ -164,4 +167,12 @@ public class WxCUserBasicInfoDto implements Serializable{
public void setSortColumns(String sortColumns) {
this.sortColumns = sortColumns;
}

public List<WxCUserBasicInfoFilterDto> getFilterList() {
return filterList;
}

public void setFilterList(List<WxCUserBasicInfoFilterDto> filterList) {
this.filterList = filterList;
}
}

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

@@ -77,50 +77,62 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService {
private final static List<WxTags> memberTimeList = new ArrayList<WxTags>(
Arrays.asList(
new WxTags(){{
setTypeId(EnumTagType.ID_50.getCode());
setName(EnumTag.ID_1000.getMessage());
setId(EnumTag.ID_1000.getCode());
}},
new WxTags(){{
setTypeId(EnumTagType.ID_50.getCode());
setName(EnumTag.ID_1001.getMessage());
setId(EnumTag.ID_1001.getCode());
}},
new WxTags(){{
setTypeId(EnumTagType.ID_50.getCode());
setName(EnumTag.ID_1002.getMessage());
setId(EnumTag.ID_1002.getCode());
}},
new WxTags(){{
setTypeId(EnumTagType.ID_50.getCode());
setName(EnumTag.ID_1003.getMessage());
setId(EnumTag.ID_1003.getCode());
}},
new WxTags(){{
setTypeId(EnumTagType.ID_50.getCode());
setName(EnumTag.ID_1004.getMessage());
setId(EnumTag.ID_1004.getCode());
}},
new WxTags(){{
setTypeId(EnumTagType.ID_50.getCode());
setName(EnumTag.ID_1005.getMessage());
setId(EnumTag.ID_1005.getCode());
}},
new WxTags(){{
setTypeId(EnumTagType.ID_50.getCode());
setName(EnumTag.ID_1006.getMessage());
setId(EnumTag.ID_1006.getCode());
}},
new WxTags(){{
setTypeId(EnumTagType.ID_50.getCode());
setName(EnumTag.ID_1007.getMessage());
setId(EnumTag.ID_1007.getCode());
}},
new WxTags(){{
setTypeId(EnumTagType.ID_50.getCode());
setName(EnumTag.ID_1008.getMessage());
setId(EnumTag.ID_1008.getCode());
}},
new WxTags(){{
setTypeId(EnumTagType.ID_50.getCode());
setName(EnumTag.ID_1009.getMessage());
setId(EnumTag.ID_1009.getCode());
}},
new WxTags(){{
setTypeId(EnumTagType.ID_50.getCode());
setName(EnumTag.ID_1010.getMessage());
setId(EnumTag.ID_1010.getCode());
}},
new WxTags(){{
setTypeId(EnumTagType.ID_50.getCode());
setName(EnumTag.ID_1011.getMessage());
setId(EnumTag.ID_1011.getCode());
}}
@@ -281,6 +293,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService {

WxTags wxTagsBase = new WxTags();
wxTagsBase.setName("普通会员");
wxTagsBase.setTypeId(EnumTagType.ID_51.getCode());
wxTagsBase.setId(0L);
tagsMemberLevel.add(wxTagsBase);

@@ -288,6 +301,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService {
WxTags wxTags = new WxTags();
wxTags.setName(l.getLevel());
wxTags.setId(l.getId());
wxTags.setTypeId(EnumTagType.ID_51.getCode());
tagsMemberLevel.add(wxTags);
});



Ładowanie…
Anuluj
Zapisz