From 0b6ca60b5341cd8d2bef3f91c9388dbf7b8bb1af Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Wed, 21 Apr 2021 09:32:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=B4=BB=E5=8A=A8=E6=B5=81?=
 =?UTF-8?q?=E8=BD=AC=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/public/doll/index.html   | 10 +++++++---
 .../src/main/resources/public/draw/js/draw.js   |  1 +
 .../service/impl/DrawTaskNotifyServiceImpl.java | 17 ++++++++---------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/sino-act-web/src/main/resources/public/doll/index.html b/sino-act-web/src/main/resources/public/doll/index.html
index 967b1e8eb..b4bf3b5ee 100644
--- a/sino-act-web/src/main/resources/public/doll/index.html
+++ b/sino-act-web/src/main/resources/public/doll/index.html
@@ -82,11 +82,12 @@
 	</div>
 </div>
 <!--活动规则-->
-<div class="pop pop_role" style="display:none;">
+<div class="pop pop_role role" style="display:none;">
 	<div class="pop_bg">
 		<h3 class="title"></h3>
 		<span class="closed"></span>
-		<div class="contact drawRule">
+		<div class="contact drawRule contBox">
+
 		</div>
 	</div>
 </div>
@@ -108,10 +109,12 @@
 <script src="../../common/taglibs.js"></script>
 <script src="../../js/jsencrypt.min.js"></script>
 <script src="../../js/encryptUtil.js"></script>
-<script src="../../js/utils.js"></script>
+<script src="../draw/js/util.js"></script>
 <script src="../../js/mobile/login_register/login.js"></script>
 <script src="../../js/layui/layer.js"></script>
 <script src="../../js/layui/layerUtils.js"></script>
+<script src="../draw/js/draw.js"></script>
+<script src="/js/config.js"></script>
 <script src="js/main.js"></script>
 <script>
 	const DOLL = 'doll';
@@ -200,6 +203,7 @@
 	});
 	//活动规则
 	$('.lottery_role').click(function(){
+		drawrule();
 		$('.pop_role').show();
 	})
 	//关闭弹层
diff --git a/sino-act-web/src/main/resources/public/draw/js/draw.js b/sino-act-web/src/main/resources/public/draw/js/draw.js
index c96af1073..43a3e87b4 100644
--- a/sino-act-web/src/main/resources/public/draw/js/draw.js
+++ b/sino-act-web/src/main/resources/public/draw/js/draw.js
@@ -11,6 +11,7 @@ function rtn() {
 }
 function drawrule() {
     console.log('rule');
+    console.log(drawCode);
     $.ajax({
         type: "POST",
         url: contextRootPath+"/draw/describe",
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawTaskNotifyServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawTaskNotifyServiceImpl.java
index 304e194df..cd10295f2 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawTaskNotifyServiceImpl.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawTaskNotifyServiceImpl.java
@@ -8,6 +8,8 @@ import com.sinosoft.activity.mapper.*;
 import com.sinosoft.activity.service.IDrawTaskNotifyService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.DateUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -27,6 +29,8 @@ import java.util.Map;
 @Service
 public class DrawTaskNotifyServiceImpl implements IDrawTaskNotifyService
 {
+    private static final Logger log = LoggerFactory.getLogger(DrawTaskNotifyServiceImpl.class);
+
     @Autowired
     private DrawTaskNotifyMapper drawTaskNotifyMapper;
     @Autowired
@@ -148,21 +152,18 @@ public class DrawTaskNotifyServiceImpl implements IDrawTaskNotifyService
     /**
      * 1.鏌ヨ娲诲姩鐘舵��
      * 2.鏌ヨ璁板綍琛ㄦ槸鍚﹂噸澶�
-     *
+     * orther涓�澶╁彧鑳借皟鐢ㄤ竴娆¤瀹歯umber
      *
      * @param drawTaskNotify
      */
     @Override
     public Map<String, Object> addDrawNum(DrawTaskNotify drawTaskNotify) {
         HashMap<String, Object> response = new HashMap<>();
-        long start = System.currentTimeMillis();
-        long end = 0;
-        long proct = 0;
-        String exception = null;
         try {
             //璇锋眰绫诲瀷
             String taskType = drawTaskNotify.getTASKTYPE();
             int number = 0;
+            //褰撳墠鏃堕棿
             String currentDateString = new SimpleDateFormat("yyyyMMdd").format(new Date());
             String taskId = drawTaskNotify.getTASKID();
 //            String getNumber = requestBody.getGetNumber();
@@ -178,7 +179,7 @@ public class DrawTaskNotifyServiceImpl implements IDrawTaskNotifyService
             drawInfo.setDRAWCODE(drawCode);
             drawInfo.setSTATUS("1");
             List<DrawInfo> drawInfos = drawInfoMapper.selectDrawInfoList(drawInfo);
-            if (CollectionUtils.isNotEmpty(drawInfos)) {
+            if (CollectionUtils.isEmpty(drawInfos)) {
 //                response = response(request, WebServiceResult.EXCEPTION_000001, WebServiceResult.getReturnMessage(WebServiceResult.EXCEPTION_000001, "drawCode鍙傛暟閿欒"));
                 response.put("msg", "drawCode鍙傛暟閿欒");
                 response.put("code", "-1");
@@ -200,6 +201,7 @@ public class DrawTaskNotifyServiceImpl implements IDrawTaskNotifyService
                         }
                     }
                     // 鍙戞斁娆℃暟
+                    //todo 淇敼鍊�
                     if ("isLimited".equals("1")) {
                         //鏌ヨ璧犻�侀檺鍒舵鏁�
                         Map<String, String> drawNumberMap = drawTaskNotifyMapper.findAllCodeAndName("drawNumberLimit");
@@ -312,7 +314,6 @@ public class DrawTaskNotifyServiceImpl implements IDrawTaskNotifyService
                     }
                     drawCode = drawDiscConfig.getDRAWCODE();
                 }
-
             }
 
             if (number > 0) {
@@ -354,8 +355,6 @@ public class DrawTaskNotifyServiceImpl implements IDrawTaskNotifyService
 //            responseBody.setDrawCode(drawCode);
 //            responseBody.setTaskType(requestBody.getTaskType());
 //            response.setResponseBody(responseBody);
-            end = System.currentTimeMillis();
-            proct=end-start;
 //            logger.info("銆愪换鍔″畬鎴愰�氱煡鎺ュ彛璇锋眰鎶ユ枃銆�" + jsonBinder.toJson(request) + "銆愪换鍔″畬鎴愰�氱煡鎺ュ彛鍝嶅簲鎶ユ枃銆�" + jsonBinder.toJson(response) + "銆愬鐞嗘椂闂淬��" + proct);
             return response;
         } catch (NumberFormatException e) {