From 24e998fc074ddaeab619d70e5ad961deddb035d1 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 13 Jan 2021 16:19:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Apom->prod?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E7=9A=84active=E9=94=99=E8=AF=AF=E7=9A=84?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=88=90=E4=BA=86test?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/epmet-point/epmet-point-server/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml
index 1b9ea82526..d582216f11 100644
--- a/epmet-module/epmet-point/epmet-point-server/pom.xml
+++ b/epmet-module/epmet-point/epmet-point-server/pom.xml
@@ -240,7 +240,7 @@
             </activation>-->
             <properties>
                 <server.port>8112</server.port>
-                <spring.profiles.active>test</spring.profiles.active>
+                <spring.profiles.active>prod</spring.profiles.active>
 
                 <!-- 数据库配置-->
                 <datasource.druid.url>

From 1708336fa200d0d8cd9380b088993c4aba21028b Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 13 Jan 2021 16:27:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E5=8F=91=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/SysSmsServiceImpl.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java
index f5c741a212..fe270e280c 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java
@@ -253,11 +253,13 @@ public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity>
         }
         Map<Boolean, List<CrmParameterResultDTO>> groupBySwitch = parameterResult.stream().collect(Collectors.groupingBy(CrmParameterResultDTO::getSwitchStatus));
         List<CrmParameterResultDTO> crmParameterTrue = groupBySwitch.get(true);
-        Map<Boolean, List<CrmParameterResultDTO>> groupByStatus = crmParameterTrue.stream().collect(Collectors.groupingBy(CrmParameterResultDTO::getBalanceStatus));
-        List<CrmParameterResultDTO> crmParameterResultDTOS = groupByStatus.get(true);
-        // 把参数开关打开的，已发送短信的客户更新余额
-        if (!CollectionUtils.isEmpty(crmParameterResultDTOS)){
-            operCrmOpenFeignClient.updateParamInfo(crmParameterResultDTOS);
+        if (!CollectionUtils.isEmpty(crmParameterTrue)){
+            Map<Boolean, List<CrmParameterResultDTO>> groupByStatus = crmParameterTrue.stream().collect(Collectors.groupingBy(CrmParameterResultDTO::getBalanceStatus));
+            List<CrmParameterResultDTO> crmParameterResultDTOS = groupByStatus.get(true);
+            // 把参数开关打开的，已发送短信的客户更新余额
+            if (!CollectionUtils.isEmpty(crmParameterResultDTOS)){
+                operCrmOpenFeignClient.updateParamInfo(crmParameterResultDTOS);
+            }
         }
     }