Commit cebc5417 by zhiwj

添加接口

parent 64e2cc1c
......@@ -3,9 +3,7 @@ package com.gic.auth.web.controller;
import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.dto.ChannelResourceDTO;
import com.gic.auth.dto.ResourceDTO;
import com.gic.auth.dto.SmsSignResourceDTO;
import com.gic.auth.service.ResourceApiService;
import com.gic.auth.web.qo.OrderResourceQO;
import com.gic.auth.web.qo.PageQO;
......@@ -135,13 +133,13 @@ public class ResourceController {
vo.setOrderResourceJSON(orderResourceList);
}
if (StringUtils.isNotBlank(dto.getSmsSignResourceJson())) {
SmsSignResourceDTO smsSignResourceDTO = JSON.parseObject(dto.getSmsSignResourceJson(),
SmsSignResourceDTO.class);
SmsSignResourceVO smsSignResourceDTO = JSON.parseObject(dto.getSmsSignResourceJson(),
SmsSignResourceVO.class);
vo.setSmsResourceJSON(smsSignResourceDTO);
}
if (StringUtils.isNotBlank(dto.getChannelResourceJson())) {
ChannelResourceDTO channelResourceDTO = JSON.parseObject(dto.getChannelResourceJson(),
ChannelResourceDTO.class);
ChannelResourceVO channelResourceDTO = JSON.parseObject(dto.getChannelResourceJson(),
ChannelResourceVO.class);
vo.setChannelResourceJSON(channelResourceDTO);
}
return RestResponse.success(vo);
......
package com.gic.auth.web.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serializable;
import java.util.List;
......@@ -11,8 +13,11 @@ import java.util.List;
public class ChannelResourceVO implements Serializable {
private static final long serialVersionUID = -7372101518056686792L;
@JsonFormat(shape = JsonFormat.Shape.STRING)
private List<Long> cardConfigIdList;
@JsonFormat(shape = JsonFormat.Shape.STRING)
private List<Long> appletConfigIdList;
@JsonFormat(shape = JsonFormat.Shape.STRING)
private List<Long> serviceConfigIdList;
public List<Long> getCardConfigIdList() {
......
package com.gic.auth.web.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serializable;
import java.util.List;
......@@ -21,10 +23,10 @@ public class OrderResourceVO implements Serializable {
/**
* channel:2 或者 channel:3时 传店铺ids,
*/
// @JsonFormat(shape = JsonFormat.Shape.STRING)
@JsonFormat(shape = JsonFormat.Shape.STRING)
private List<Long> storeContent;
// @JsonFormat(shape = JsonFormat.Shape.STRING)
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long storeWidgetId;
public Integer getChannel() {
......
package com.gic.auth.web.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.gic.auth.dto.ChannelResourceDTO;
import com.gic.auth.dto.SmsSignResourceDTO;
import java.io.Serializable;
import java.util.List;
......@@ -30,11 +28,13 @@ public class ResourceVO implements Serializable{
*/
private Integer enterpriseId;
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long userResource;
/**
* 门店资源
*/
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long storeResource;
/**
......@@ -42,13 +42,13 @@ public class ResourceVO implements Serializable{
*/
private List<OrderResourceVO> orderResourceJSON;
private SmsSignResourceDTO smsResourceJSON;
private SmsSignResourceVO smsResourceJSON;
private Integer userResourceCount;
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long goodsResourceId;
private ChannelResourceDTO channelResourceJSON;
private ChannelResourceVO channelResourceJSON;
public Integer getResourceId() {
return resourceId;
......@@ -98,11 +98,11 @@ public class ResourceVO implements Serializable{
this.orderResourceJSON = orderResourceJSON;
}
public SmsSignResourceDTO getSmsResourceJSON() {
public SmsSignResourceVO getSmsResourceJSON() {
return smsResourceJSON;
}
public void setSmsResourceJSON(SmsSignResourceDTO smsResourceJSON) {
public void setSmsResourceJSON(SmsSignResourceVO smsResourceJSON) {
this.smsResourceJSON = smsResourceJSON;
}
......@@ -122,11 +122,11 @@ public class ResourceVO implements Serializable{
this.goodsResourceId = goodsResourceId;
}
public ChannelResourceDTO getChannelResourceJSON() {
public ChannelResourceVO getChannelResourceJSON() {
return channelResourceJSON;
}
public void setChannelResourceJSON(ChannelResourceDTO channelResourceJSON) {
public void setChannelResourceJSON(ChannelResourceVO channelResourceJSON) {
this.channelResourceJSON = channelResourceJSON;
}
}
package com.gic.auth.web.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serializable;
import java.util.List;
/**
*
* @Description:
* @author zhiwj
* @date 2019-12-17 16:46
*/
public class SmsSignResourceVO implements Serializable {
private static final long serialVersionUID = -6009818220117316815L;
private String ids;
@JsonFormat(shape = JsonFormat.Shape.STRING)
private List<Long> idList;
// 1:全部 2:部分
private Integer type;
public String getIds() {
return ids;
}
public void setIds(String ids) {
this.ids = ids;
}
public List<Long> getIdList() {
return idList;
}
public void setIdList(List<Long> idList) {
this.idList = idList;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment