Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!658

mp-service/src/main/java/com/qs/mp/admin/domain/vo/TicketAwardsPrizeVO.java

@@ -103,12 +103,6 @@ public class TicketAwardsPrizeVO {
   @ApiModelProperty("奖品类型 1 实物商品 2优惠券 3平台代币")
   private String prizeType;
 
-  /**
-   * 优惠券类型: 1用户盲票购买优惠券、2用户门店消费优惠券、3经销商盲票采购优惠券
-   */
-  @ApiModelProperty("优惠券类型: 1用户盲票购买优惠券、2用户门店消费优惠券、3经销商盲票采购优惠券")
-  private String couponType;
-
   /**
    * 奖品价值
    */

mp-service/src/main/java/com/qs/mp/admin/service/impl/TicketBoxServiceImpl.java

@@ -588,7 +588,7 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
       }
       LogUtil.debug(logger, "prize：{0}，区间 d1:{1}, d2:{2}",
           JSONObject.toJSONString(prizes.get(i)), d1, d2);
-      if (randomNumber > d1 && randomNumber <= d2) {
+      if (randomNumber >= d1 && randomNumber < d2) {
         random = i;
         break;
       }