From eba06ca89ea03e6e33dc8999878c99ee1c77a36e Mon Sep 17 00:00:00 2001
From: ck <851316342@qq.com>
Date: Wed, 2 Dec 2020 10:18:56 +0800
Subject: [PATCH] up

---
 .../jingcheng/template/model/AwardRule.java   |  4 +++
 .../service/impl/AwardRecordServiceImpl.java  | 25 +++++++++++--------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/jingcheng/template/model/AwardRule.java b/src/main/java/com/jingcheng/template/model/AwardRule.java
index b802cf0..0cd7e75 100644
--- a/src/main/java/com/jingcheng/template/model/AwardRule.java
+++ b/src/main/java/com/jingcheng/template/model/AwardRule.java
@@ -19,4 +19,8 @@ public class AwardRule extends BaseEntity {
      */
     private Integer isHaveBigAward;
 
+    /**
+     * 奖品数
+     */
+    private Integer awardNum;
 }
diff --git a/src/main/java/com/jingcheng/template/service/impl/AwardRecordServiceImpl.java b/src/main/java/com/jingcheng/template/service/impl/AwardRecordServiceImpl.java
index 12cec8c..00248bf 100644
--- a/src/main/java/com/jingcheng/template/service/impl/AwardRecordServiceImpl.java
+++ b/src/main/java/com/jingcheng/template/service/impl/AwardRecordServiceImpl.java
@@ -111,21 +111,26 @@ public class AwardRecordServiceImpl extends BaseServiceImpl<AwardRecordMapper, A
         }else {
             int range =  (int) (1 / awardRate);
             int num = 1 + (int)(Math.random()*(range - 1 + 1));
-            System.out.println("range" + range);
-            System.out.println("num" + num);
+            Integer awardNum = awardRule.getAwardNum();
             if ( 0 == isHaveBigAward){
                 //无大奖
-                if (1 == num){
-                    //中小奖
-                    isAward = true;
-                }else {
-                    logger.info("未中奖");
+                if (awardNum > 0){
+                    if (1 == num){
+                        //中小奖
+                        isAward = true;
+                    }else {
+                        logger.info("未中奖");
+                    }
                 }
             }else {
                 //有大奖
-                if (1 == num){
-                    isAward = true;
-                }else if (2 == num){
+                if (awardNum > 0){
+                    if (1 == num){
+                        //中小奖
+                        isAward = true;
+                    }
+                }
+                if (2 == num){
                     isAward = true;
                     isBigAward = true;
                 }else {