diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
index 9cc42e154b..9f1c5f87b9 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-heart-server:
     container_name: epmet-heart-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.31
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.32
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
index a2a079992c..c599ce9459 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.31</version>
+    <version>0.0.32</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>
diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml
index f06ae5ae1a..e5eb396fc1 100644
--- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-point-server:
     container_name: epmet-point-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.22
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.23
     ports:
       - "8112:8112"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml
index ef7c14771a..208af44b10 100644
--- a/epmet-module/epmet-point/epmet-point-server/pom.xml
+++ b/epmet-module/epmet-point/epmet-point-server/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.22</version>
+    <version>0.0.23</version>
     <parent>
         <artifactId>epmet-point</artifactId>
         <groupId>com.epmet</groupId>
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
index 763bc831c4..600e6aba28 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
@@ -212,7 +212,8 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
             }
             //校验是否达到上限
             if(ruleInfo.getUpLimit() > NumConstant.ZERO){
-                Integer sum = baseDao.selectSumByEvent(event.getUserId(),eventCode,event.getSourceId(),event.getCustomerId(),dateCheck);
+                //不按照sourceId查询，查询指定日期内的相关积分规则的总和
+                Integer sum = baseDao.selectSumByEvent(event.getUserId(),eventCode,null,event.getCustomerId(),dateCheck);
                 if(null == sum) sum = NumConstant.ZERO;
                 if(StringUtils.equals(ModuleConstant.OPERATION_TYPE_PLUS,ruleInfo.getOperateType())){
                    if(ruleInfo.getPoint() < NumConstant.ZERO){
diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
index 73010e453f..7a77861e44 100644
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.93
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.96
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml
index 571cad941d..ff744344b3 100644
--- a/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.93</version>
+    <version>0.0.96</version>
 
     <parent>
         <groupId>com.epmet</groupId>
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
index 67bcddbac0..b61183c60a 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
@@ -416,17 +416,22 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
         String authAppId = authorizationInfoResultDTO.getAuthorizer_appid();
         List<FixationAppIdResultDTO> fixationAppIdResultDTOS = fixationAppIdDao.selectFixationInfos();
         String finalCustomerId = customerId;//
+        log.info("新customerId为："+customerId);
+        log.info("新finalCustomerId为："+finalCustomerId);
         fixationAppIdResultDTOS.forEach(fixationAppId -> {
             if (fixationAppId.getAppId().equals(authAppId)){
                 // TODO 是城阳项目或者党群e事通
                 //  crm表中的customerId【原customerId】
                 String masterCustomerId = fixationAppId.getMasterCustomerId();
+                log.info("老customerId为："+masterCustomerId);
                 formDTO.setCustomerId(masterCustomerId);
                 authCodeDao.deleteCustomerAuthCode(finalCustomerId,clientType);
                 authCodeDao.insertRedirectAuthCode(formDTO);
                 //authCode存缓存
                 redisThird.setAuthCode(formDTO);
 
+                log.info("=======================公众号的客户id为："+finalCustomerId);
+
                 ModifyCustomerFormDTO modifyCustomer = new ModifyCustomerFormDTO();
                 modifyCustomer.setOldCustomerId(finalCustomerId);
                 modifyCustomer.setNewCustomerId(masterCustomerId);
@@ -434,6 +439,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
 
                 // 管理员授权
                 CustomerManagerFormDTO customerManager = paUserDao.selectManagerInfo(finalCustomerId);
+                log.info("=======================公众号的客户id为："+finalCustomerId);
                 customerManager.setCustomerId(finalCustomerId);
                 operCrmOpenFeignClient.addManager(customerManager);
             }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml
index f8f3d37ff6..6291b43941 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml
@@ -147,7 +147,7 @@
 
     <update id="updateCustomerId">
         UPDATE customer_mp
-        SET customer_id = #{newCustonerId}
+        SET customer_id = #{newCustomerId}
         WHERE
             del_flag = '0'
         AND customer_id = #{oldCustomerId}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerAgencyDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerAgencyDao.xml
index 752fb6081a..eb2d4aa257 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerAgencyDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerAgencyDao.xml
@@ -84,7 +84,7 @@
 
     <update id="updateCustomerId">
         UPDATE pa_customer_agency
-        SET customer_id = #{newCustonerId}
+        SET customer_id = #{newCustomerId}
         WHERE
             del_flag = '0'
         AND customer_id = #{oldCustomerId}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml
index f56a663a07..7d4c8e69ef 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml
@@ -81,7 +81,7 @@
 
     <update id="updateIdById">
         UPDATE pa_customer
-        SET id = #{newCustonerId}
+        SET id = #{newCustomerId}
         WHERE
             del_flag = '0'
         AND id = #{oldCustomerId}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerUserAgencyDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerUserAgencyDao.xml
index dee9a80f90..ae368b8eef 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerUserAgencyDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerUserAgencyDao.xml
@@ -36,7 +36,7 @@
 
     <update id="updateCustomerId">
         UPDATE pa_customer_user_agency
-        SET customer_id = #{newCustonerId}
+        SET customer_id = #{newCustomerId}
         WHERE
             del_flag = '0'
         AND customer_id = #{oldCustomerId}