task--继续完善swagger文档

This commit is contained in:
taochengbo
2020-08-31 23:45:32 +08:00
parent a6970e4a89
commit 610cce7aa7
3 changed files with 24 additions and 1 deletions

View File

@ -209,7 +209,8 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl<YxStorePinkMapper, Y
pinkBool = PinkEnum.PINK_BOOL_MINUS_1.getValue();
isOk = PinkEnum.IS_OK_0.getValue();
}else{
if(count < 1){//组团完成
//组团完成
if(count < 1){
isOk = PinkEnum.IS_OK_1.getValue();
pinkBool = this.pinkComplete(uidAll,idAll,uid,pinkT);
}else{

View File

@ -2,6 +2,7 @@ package co.yixiang.modules.activity.vo;
import co.yixiang.modules.user.vo.YxUserQueryVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;
@ -16,15 +17,35 @@ import java.util.List;
@Data
@Builder
public class PinkInfoVo implements Serializable {
@ApiModelProperty(value = "还差几人成团")
private Integer count;
@ApiModelProperty(value = "当前拼团数据返回订单编号")
private String currentPinkOrder;
@ApiModelProperty(value = "是否完成 0未完成 1完成")
private Integer isOk = 0;
@ApiModelProperty(value = "拼团信息列表")
private List<YxStorePinkQueryVo> pinkAll;
@ApiModelProperty(value = "拼团状态 0未成功进行中 1已成功 -1拼团失败")
private Integer pinkBool = 0;
@ApiModelProperty(value = "拼团信息")
private YxStorePinkQueryVo pinkT;
@ApiModelProperty(value = "拼团内容信息")
private YxStoreCombinationQueryVo storeCombination;
@ApiModelProperty(value = "拼团内容")
private String storeCombinationHost;
@ApiModelProperty(value = "是否在团内 0不在 1在")
private Integer userBool = 0;
@ApiModelProperty(value = "拼团用户信息")
private YxUserQueryVo userInfo;
}

View File

@ -24,6 +24,7 @@ public abstract class QueryParam implements Serializable{
@ApiModelProperty(value = "搜索字符串")
private String keyword;
@ApiModelProperty(value = "当前第几页")
public void setCurrent(Integer current) {
if (current == null || current <= 0){
this.page = 1;