From 610cce7aa726343294610281516fe5b4d7780e29 Mon Sep 17 00:00:00 2001
From: taochengbo <552920369@qq.com>
Date: Mon, 31 Aug 2020 23:45:32 +0800
Subject: [PATCH] =?UTF-8?q?task--=E7=BB=A7=E7=BB=AD=E5=AE=8C=E5=96=84swagg?=
 =?UTF-8?q?er=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/YxStorePinkServiceImpl.java  |  3 ++-
 .../modules/activity/vo/PinkInfoVo.java       | 21 +++++++++++++++++++
 .../yixiang/common/web/param/QueryParam.java  |  1 +
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java
index 00bca533..53b77572 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java
@@ -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{
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/PinkInfoVo.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/PinkInfoVo.java
index e762fb10..cfa9e916 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/PinkInfoVo.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/PinkInfoVo.java
@@ -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;
 
 }
diff --git a/yshop-mproot/src/main/java/co/yixiang/common/web/param/QueryParam.java b/yshop-mproot/src/main/java/co/yixiang/common/web/param/QueryParam.java
index 4f0540a8..4da701a3 100644
--- a/yshop-mproot/src/main/java/co/yixiang/common/web/param/QueryParam.java
+++ b/yshop-mproot/src/main/java/co/yixiang/common/web/param/QueryParam.java
@@ -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;