From 16fdd206765775404ead2b83e2e17dc30dc86a07 Mon Sep 17 00:00:00 2001
From: mzr <mzr123456>
Date: Mon, 29 Apr 2024 16:20:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E5=88=99=E6=9F=A5=E8=AF=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/thread/records/RecordsThread.java  | 54 ++++++++++---------
 .../system/PrizeGoodsRuleMapper.xml           |  4 ++
 2 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/crm-admin/src/main/java/com/yb/lb/webapp/thread/records/RecordsThread.java b/crm-admin/src/main/java/com/yb/lb/webapp/thread/records/RecordsThread.java
index 4431030..268f2dc 100644
--- a/crm-admin/src/main/java/com/yb/lb/webapp/thread/records/RecordsThread.java
+++ b/crm-admin/src/main/java/com/yb/lb/webapp/thread/records/RecordsThread.java
@@ -40,34 +40,38 @@ public class RecordsThread implements Runnable {
                     Map<String, Object> addMap = new HashMap<>();
                     addMap.put("status", "1");
                     addMap.put("ruleType", "1");
+                    addMap.put("currentTime", DateUtil.getDay());
+                    //日期在当前活动时间内的规则
                     CrmPrizeGoodsRule activityRules = prizeGoodsRuleService.oneById(addMap, ".findPrizeGoodsRuleByCondition");
-                    addMap.clear();
-                    addMap.put("id", IdUtil.simpleUUID());
-                    addMap.put("qrCode", map.get("qrCode"));
-                    addMap.put("clientId", map.get("clientId"));
-                    addMap.put("clientName", map.get("clientName"));
-                    // 记录类型 1.收入 2.支出
-                    addMap.put("recordType", "1");
-                    addMap.put("createUser", map.get("createUser") + "");
-                    addMap.put("createName", map.get("createUserName") + "");
-                    addMap.put("createTime", DateUtil.getTime());
-                    addMap.put("companyId", map.get("companyId"));
-                    Double dealerPrize = 0d;
-                    String source = "";
-                    if ("3".equals(type)) {
-                        source = "1"; // 经销商扫码入库
-                        if (StringUtil.isNotEmpty(activityRules) && StringUtil.isNotEmpty(activityRules.getDealerInPrize())) {
-                            dealerPrize = activityRules.getDealerInPrize();
-                        }
-                    } else if ("4".equals(type)) {
-                        source = "2";// 经销商扫码出库
-                        if (StringUtil.isNotEmpty(activityRules) && StringUtil.isNotEmpty(activityRules.getDealerOutPrize())) {
-                            dealerPrize = activityRules.getDealerOutPrize();
+                    if (StringUtil.isNotEmpty(activityRules)) {
+                        addMap.clear();
+                        addMap.put("id", IdUtil.simpleUUID());
+                        addMap.put("qrCode", map.get("qrCode"));
+                        addMap.put("clientId", map.get("clientId"));
+                        addMap.put("clientName", map.get("clientName"));
+                        // 记录类型 1.收入 2.支出
+                        addMap.put("recordType", "1");
+                        addMap.put("createUser", map.get("createUser") + "");
+                        addMap.put("createName", map.get("createUserName") + "");
+                        addMap.put("createTime", DateUtil.getTime());
+                        addMap.put("companyId", map.get("companyId"));
+                        Double dealerPrize = 0d;
+                        String source = "";
+                        if ("3".equals(type)) {
+                            source = "1"; // 经销商扫码入库
+                            if (StringUtil.isNotEmpty(activityRules) && StringUtil.isNotEmpty(activityRules.getDealerInPrize())) {
+                                dealerPrize = activityRules.getDealerInPrize();
+                            }
+                        } else if ("4".equals(type)) {
+                            source = "2";// 经销商扫码出库
+                            if (StringUtil.isNotEmpty(activityRules) && StringUtil.isNotEmpty(activityRules.getDealerOutPrize())) {
+                                dealerPrize = activityRules.getDealerOutPrize();
+                            }
                         }
+                        addMap.put("exchangeAmount", dealerPrize);
+                        addMap.put("source", source);
+                        prizeClientService.addInfo(addMap, ".addCrmPrizeClient");
                     }
-                    addMap.put("exchangeAmount", dealerPrize);
-                    addMap.put("source", source);
-                    prizeClientService.addInfo(addMap, ".addCrmPrizeClient");
                 }
                 Map<String, Object> map1 = new HashMap<>();
                 map1.put("type", type);
diff --git a/crm-common/src/main/resources/mapper/mapper_oracle/system/PrizeGoodsRuleMapper.xml b/crm-common/src/main/resources/mapper/mapper_oracle/system/PrizeGoodsRuleMapper.xml
index 63547db..2bf06ae 100644
--- a/crm-common/src/main/resources/mapper/mapper_oracle/system/PrizeGoodsRuleMapper.xml
+++ b/crm-common/src/main/resources/mapper/mapper_oracle/system/PrizeGoodsRuleMapper.xml
@@ -35,6 +35,10 @@
         <if test="prizeType != null and prizeType != ''">
             AND a.prize_type = #{prizeType}
         </if>
+        <if test="currentTime != null and currentTime != ''">
+            AND  to_date(#{currentTime},'yyyy-MM-dd')  &gt;= to_date(a.start_time,'yyyy-MM-dd')
+            AND  to_date(#{currentTime},'yyyy-MM-dd')  &lt;= to_date(a.end_time,'yyyy-MM-dd')
+        </if>
         <if test="companyId != null and companyId != ''">
             AND a.company_id = #{companyId}
         </if>