task--继续完善swagger文档
This commit is contained in:
@ -209,7 +209,8 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl<YxStorePinkMapper, Y
|
|||||||
pinkBool = PinkEnum.PINK_BOOL_MINUS_1.getValue();
|
pinkBool = PinkEnum.PINK_BOOL_MINUS_1.getValue();
|
||||||
isOk = PinkEnum.IS_OK_0.getValue();
|
isOk = PinkEnum.IS_OK_0.getValue();
|
||||||
}else{
|
}else{
|
||||||
if(count < 1){//组团完成
|
//组团完成
|
||||||
|
if(count < 1){
|
||||||
isOk = PinkEnum.IS_OK_1.getValue();
|
isOk = PinkEnum.IS_OK_1.getValue();
|
||||||
pinkBool = this.pinkComplete(uidAll,idAll,uid,pinkT);
|
pinkBool = this.pinkComplete(uidAll,idAll,uid,pinkT);
|
||||||
}else{
|
}else{
|
||||||
|
@ -2,6 +2,7 @@ package co.yixiang.modules.activity.vo;
|
|||||||
|
|
||||||
|
|
||||||
import co.yixiang.modules.user.vo.YxUserQueryVo;
|
import co.yixiang.modules.user.vo.YxUserQueryVo;
|
||||||
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -16,15 +17,35 @@ import java.util.List;
|
|||||||
@Data
|
@Data
|
||||||
@Builder
|
@Builder
|
||||||
public class PinkInfoVo implements Serializable {
|
public class PinkInfoVo implements Serializable {
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "还差几人成团")
|
||||||
private Integer count;
|
private Integer count;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "当前拼团数据返回订单编号")
|
||||||
private String currentPinkOrder;
|
private String currentPinkOrder;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "是否完成 0未完成 1完成")
|
||||||
private Integer isOk = 0;
|
private Integer isOk = 0;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "拼团信息列表")
|
||||||
private List<YxStorePinkQueryVo> pinkAll;
|
private List<YxStorePinkQueryVo> pinkAll;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "拼团状态 0未成功,进行中 1已成功 -1拼团失败")
|
||||||
private Integer pinkBool = 0;
|
private Integer pinkBool = 0;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "拼团信息")
|
||||||
private YxStorePinkQueryVo pinkT;
|
private YxStorePinkQueryVo pinkT;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "拼团内容信息")
|
||||||
private YxStoreCombinationQueryVo storeCombination;
|
private YxStoreCombinationQueryVo storeCombination;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "拼团内容")
|
||||||
private String storeCombinationHost;
|
private String storeCombinationHost;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "是否在团内 0不在 1在")
|
||||||
private Integer userBool = 0;
|
private Integer userBool = 0;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "拼团用户信息")
|
||||||
private YxUserQueryVo userInfo;
|
private YxUserQueryVo userInfo;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -24,6 +24,7 @@ public abstract class QueryParam implements Serializable{
|
|||||||
@ApiModelProperty(value = "搜索字符串")
|
@ApiModelProperty(value = "搜索字符串")
|
||||||
private String keyword;
|
private String keyword;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "当前第几页")
|
||||||
public void setCurrent(Integer current) {
|
public void setCurrent(Integer current) {
|
||||||
if (current == null || current <= 0){
|
if (current == null || current <= 0){
|
||||||
this.page = 1;
|
this.page = 1;
|
||||||
|
Reference in New Issue
Block a user