From c793746b59f10747a38f63c9bd01cb6fa35ad398 Mon Sep 17 00:00:00 2001 From: hupeng Date: Sat, 10 Nov 2018 16:43:22 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=97=AE=E5=88=B8][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=97=AE=E5=88=B8=E7=9A=84=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E6=A6=82=E7=8E=87=E9=85=8D=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxQuestionController.java | 3 +- .../iformall/domain/po/WxQuestionConfig.java | 29 ++++++++++++++----- .../mapper/WxQuestionConfigMapper.xml | 7 ++++- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java index 2d54b584e..76e590f98 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java @@ -68,7 +68,8 @@ public class WxQuestionController extends BaseController { q.remove(); } } - if (listQuestion.size() > 0) + if (listQuestion.size() > 0 && + (new Random().nextInt(100) < listConfig.get(0).getStrength())) return new ResultData(listQuestion.get(new Random().nextInt(listQuestion.size()))); } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionConfig.java index 8098d13da..73f24473b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionConfig.java @@ -57,18 +57,15 @@ public class WxQuestionConfig implements Serializable { @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") private Date updateTime; - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - /**状态**/ @io.swagger.annotations.ApiModelProperty(value="状态",name="status") private Integer status; + /**状态**/ + @io.swagger.annotations.ApiModelProperty(value="调查力度0-100",name="strength") + private Integer strength; + + public String getTenantId() { return tenantId; } @@ -109,6 +106,22 @@ public class WxQuestionConfig implements Serializable { this.updateTime = updateTime; } + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + + public Integer getStrength() { + return strength; + } + + public void setStrength(Integer strength) { + this.strength = strength; + } @Transient protected List questions; diff --git a/mallinkService/src/main/resources/mapper/WxQuestionConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxQuestionConfigMapper.xml index aa7f04e30..f8d6bb615 100644 --- a/mallinkService/src/main/resources/mapper/WxQuestionConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxQuestionConfigMapper.xml @@ -9,10 +9,11 @@ + - `id`,`tenant_id`,`question_list`,`coupon_type_list`,`create_time`,`update_time`,`status` + `id`,`tenant_id`,`question_list`,`coupon_type_list`,`create_time`,`update_time`,`status`,`strength` @@ -46,6 +47,10 @@ and `status` = #{status} + + and `strength` = #{strength} + + and id in