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 b86c424cf9..b6e8d3f329 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.38
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.39
     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 c2eb2f4bd0..e5cf1cc84f 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.38</version>
+    <version>0.0.39</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/controller/TestController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/TestController.java
index b3cbf19d45..59437dcff3 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/TestController.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/TestController.java
@@ -4,8 +4,12 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.entity.PointVerificationStatisticalDailyEntity;
 import com.epmet.entity.UserPointStatisticalDailyEntity;
+import com.epmet.entity.UserPointTotalEntity;
+import com.epmet.service.PointVerificationStatisticalDailyService;
 import com.epmet.service.UserPointStatisticalDailyService;
+import com.epmet.service.UserPointTotalService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +33,10 @@ public class TestController {
     private LoginUserUtil loginUserUtil;
     @Autowired
     private UserPointStatisticalDailyService userPointStatisticalDailyService;
+    @Autowired
+    private PointVerificationStatisticalDailyService pointVerificationStatisticalDailyService;
+    @Autowired
+    private UserPointTotalService userPointTotalService;
     @GetMapping("test")
     public Result test(@LoginUser TokenDto tokenDto){
         Map map=new HashMap<>();
@@ -49,5 +57,15 @@ public class TestController {
         userPointStatisticalDailyService.test(entity);
         return new Result();
     }
+    @PostMapping("testunixkeyverification")
+    public Result testUnixKeyVerification(@RequestBody PointVerificationStatisticalDailyEntity entity){
+        pointVerificationStatisticalDailyService.testUnixKey(entity);
+        return new Result();
+    }
+    @PostMapping("testtotal")
+    public Result testTotal(@RequestBody UserPointTotalEntity entity){
+        userPointTotalService.testInsertOrUpdate(entity);
+        return new Result();
+    }
 }
 
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointVerificationStatisticalDailyDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointVerificationStatisticalDailyDao.java
index 5880d4bc3e..4ad495b7e4 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointVerificationStatisticalDailyDao.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointVerificationStatisticalDailyDao.java
@@ -39,4 +39,6 @@ public interface PointVerificationStatisticalDailyDao extends BaseDao<PointVerif
      * @date 2020.07.27 17:37
     **/
     PointVerificationStatisticalDailyEntity selectIfExisted(@Param("createdBy") String createdBy, @Param("dateId") String dateId);
+
+    void insertOrUpdate(PointVerificationStatisticalDailyEntity entity);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointTotalDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointTotalDao.java
index 9d5ebca3f6..36b2540ac1 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointTotalDao.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointTotalDao.java
@@ -62,4 +62,6 @@ public interface UserPointTotalDao extends BaseDao<UserPointTotalEntity> {
     **/
     UserPointTotalEntity selectIfExisted(@Param("userId") String userId);
 
+
+    void insertOrUpdate(UserPointTotalEntity userPointTotalEntity);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointVerificationStatisticalDailyService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointVerificationStatisticalDailyService.java
index d48e70529b..a87601131d 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointVerificationStatisticalDailyService.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointVerificationStatisticalDailyService.java
@@ -101,4 +101,6 @@ public interface PointVerificationStatisticalDailyService extends BaseService<Po
      * @date 2020.07.27 17:28
     **/
     void insertOrUpdate(PointVerificationStatisticalDailyEntity entity);
+
+    void testUnixKey(PointVerificationStatisticalDailyEntity entity);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java
index c6ca4a0c3d..62c2f823c4 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java
@@ -123,4 +123,6 @@ public interface UserPointTotalService extends BaseService<UserPointTotalEntity>
      * @date 2020.07.27 16:45
     **/
     void insertOrUpdate(UserPointTotalEntity entity);
+
+    void testInsertOrUpdate(UserPointTotalEntity entity);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java
index 14194f057f..f8f3974e80 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java
@@ -330,6 +330,7 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl<PointVerifi
         statistical.setMonthId(dim.getMonthId());
         statistical.setQuarterId(dim.getQuarterId());
         statistical.setYearId(dim.getYearId());
+        statistical.setCreatedBy(verificationParam.getOperatorId());
         pointVerificationStatisticalDailyService.insertOrUpdate(statistical);
         //5.更新用户总积分表
         UserPointTotalEntity userPoint = new UserPointTotalEntity();
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationStatisticalDailyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationStatisticalDailyServiceImpl.java
index 195d5fe3d8..677cc9cd23 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationStatisticalDailyServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationStatisticalDailyServiceImpl.java
@@ -106,13 +106,20 @@ public class PointVerificationStatisticalDailyServiceImpl extends BaseServiceImp
      **/
     @Override
     public void insertOrUpdate(PointVerificationStatisticalDailyEntity entity) {
+        baseDao.insertOrUpdate(entity);
+        /*
         PointVerificationStatisticalDailyEntity existed = baseDao.selectIfExisted(entity.getCreatedBy(),entity.getDateId());
         if(null != existed && StringUtils.isNotBlank(existed.getId())){
             existed.setVerificatedPoint(null == existed.getVerificatedPoint() ? entity.getVerificatedPoint() : existed.getVerificatedPoint() + entity.getVerificatedPoint());
             updateById(existed);
         }else{
             insert(entity);
-        }
+        }*/
+    }
+
+    @Override
+    public void testUnixKey(PointVerificationStatisticalDailyEntity entity) {
+        baseDao.insertOrUpdate(entity);
     }
 
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java
index bf87baacc4..e7dde53b14 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java
@@ -226,6 +226,8 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
      **/
     @Override
     public void insertOrUpdate(UserPointTotalEntity entity) {
+        baseDao.insertOrUpdate(entity);
+        /*
         UserPointTotalEntity existed = baseDao.selectIfExisted(entity.getUserId());
         if(null != existed && StringUtils.isNotBlank(existed.getId())){
             existed.setUsedPoint(null == existed.getUsedPoint() ? entity.getUsedPoint() : entity.getUsedPoint() + existed.getUsedPoint());
@@ -234,7 +236,12 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
             updateById(existed);
         }else{
             insert(entity);
-        }
+        }*/
+    }
+
+    @Override
+    public void testInsertOrUpdate(UserPointTotalEntity entity) {
+        baseDao.insertOrUpdate(entity);
     }
 
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.3__unixKeyOnStatisticalAndTotal.sql b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.3__unixKeyOnStatisticalAndTotal.sql
new file mode 100644
index 0000000000..4eda6716dc
--- /dev/null
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.3__unixKeyOnStatisticalAndTotal.sql
@@ -0,0 +1,5 @@
+
+ALTER TABLE point_verification_statistical_daily ADD UNIQUE STAFF_DATE_AGENCY(CREATED_BY,DATE_ID,AGENCY_ID,CUSTOMER_ID);
+
+
+ALTER TABLE USER_POINT_TOTAL ADD UNIQUE USR(USER_ID,CUSTOMER_ID);
\ No newline at end of file
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointVerificationStatisticalDailyDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointVerificationStatisticalDailyDao.xml
index df61f4dc2d..b1eed6d837 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointVerificationStatisticalDailyDao.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointVerificationStatisticalDailyDao.xml
@@ -38,4 +38,49 @@
             created_by = #{createdBy}
     </select>
 
+
+
+    <insert id="insertOrUpdate" useGeneratedKeys="true" keyColumn="id" keyProperty="id" parameterType="com.epmet.entity.PointVerificationStatisticalDailyEntity">
+        <selectKey keyProperty="id" resultType="java.lang.String" order="BEFORE">
+            SELECT replace(uuid(),'-','') AS ID
+        </selectKey>
+        INSERT INTO point_verification_statistical_daily
+        (
+            id,
+            date_id,
+            week_id,
+            month_id,
+            quarter_id,
+            year_id,
+            customer_id,
+            verificated_point,
+            agency_id,
+            pid,
+            pids,
+            created_by,
+            created_time,
+            updated_by,
+            updated_time
+        ) VALUE (
+            #{id},
+            #{dateId},
+            #{weekId},
+            #{monthId},
+            #{quarterId},
+            #{yearId},
+            #{customerId},
+            #{verificatedPoint},
+            #{agencyId},
+            #{pid},
+            #{pids},
+            #{createdBy},
+            now(),
+            #{createdBy},
+            now()
+        ) ON DUPLICATE KEY UPDATE
+        VERIFICATED_POINT = (VERIFICATED_POINT + #{verificatedPoint}),
+        UPDATED_TIME = NOW(),
+        UPDATED_BY = #{createdBy}
+    </insert>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
index 45470e58d9..9bb759ed72 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
@@ -116,7 +116,7 @@
                 #{actionFlag},
                 #{customerId},
                 #{pointChange},
-                '1',
+                '0',
                 0,
                 #{createdBy},
                 now(),
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml
index db72188a9e..d84b1b02ed 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml
@@ -59,4 +59,39 @@
              user_id = #{userId}
     </select>
 
+    <insert id="insertOrUpdate" useGeneratedKeys="true" keyColumn="id" keyProperty="id" parameterType="com.epmet.entity.UserPointTotalEntity">
+        <selectKey keyProperty="id" resultType="java.lang.String" order="BEFORE">
+            SELECT replace(uuid(),'-','') AS ID
+        </selectKey>
+        INSERT INTO user_point_total
+        (
+            id,
+            user_id,
+            customer_id,
+            used_point,
+            usable_point,
+            total_point,
+            created_by,
+            created_time,
+            updated_by,
+            updated_time
+        ) VALUE (
+            #{id},
+            #{userId},
+            #{customerId},
+            #{usedPoint},
+            #{usablePoint},
+            #{totalPoint},
+            #{createdBy},
+            now(),
+            #{createdBy},
+            now()
+        ) ON DUPLICATE KEY UPDATE
+        USED_POINT = (USED_POINT + #{usedPoint}),
+        USABLE_POINT = (USABLE_POINT + #{usablePoint}),
+        TOTAL_POINT = (TOTAL_POINT + #{totalPoint}),
+        UPDATED_TIME = NOW(),
+        UPDATED_BY = #{createdBy}
+    </insert>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/DingResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/DingResultDTO.java
new file mode 100644
index 0000000000..e90a581f3b
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/DingResultDTO.java
@@ -0,0 +1,25 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/12 9:35 上午
+ */
+@Data
+public class DingResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 160205553553352808L;
+
+    /**
+     * 代码版本号
+     */
+    private String userVersion;
+
+    /**
+     * 客户名称
+     */
+    private String customerName;
+}
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 35fe6cdf05..15b06dbbb3 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.121
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.123
     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 30fc886a6a..10d75a3848 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.121</version>
+    <version>0.0.123</version>
 
     <parent>
         <groupId>com.epmet</groupId>
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java
index de55530200..544e4da23e 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java
@@ -95,6 +95,10 @@ public interface ModuleConstant {
     String TO_USER_NAME = "ToUserName";
     String FROM_USER_NAME = "FromUserName";
     String RESI = "resi";
+    String SUCC_TIME = "SuccTime";
+    String FAIL_TIME = "FailTime";
+    String DELAY_TIME = "DelayTime";
+    String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
 
     /**
      * 微信模推送给第三方平台方 Content固定格式
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeCustomerDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeCustomerDao.java
index 7ff7c5114e..e7ba21153c 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeCustomerDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeCustomerDao.java
@@ -20,6 +20,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.CodeCustomerDTO;
 import com.epmet.dto.form.UploadListFormDTO;
+import com.epmet.dto.result.DingResultDTO;
 import com.epmet.dto.result.UploadListResultDTO;
 import com.epmet.dto.form.CodeAuditRecordFormDTO;
 import com.epmet.dto.result.TemplateAndAppIdResultDTO;
@@ -144,4 +145,12 @@ public interface CodeCustomerDao extends BaseDao<CodeCustomerEntity> {
 	 * @return void
 	 */
 	void updateVersion(@Param("codeId") String codeId);
+
+	/**
+	 * 查询客户名称 和 代码版本号
+	 * @param customerId
+	 * @param clientType
+	 * @Author zxc
+	 */
+	DingResultDTO selectCustomerNameAndVersion(@Param("customerId") String customerId, @Param("clientType") String clientType);
 }
\ No newline at end of file
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 e0c59f0f0d..7377950f1f 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
@@ -3,10 +3,7 @@ package com.epmet.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.nacos.client.config.utils.IOUtils;
-import com.dingtalk.api.DefaultDingTalkClient;
-import com.dingtalk.api.DingTalkClient;
 import com.dingtalk.api.request.OapiRobotSendRequest;
-import com.dingtalk.api.response.OapiRobotSendResponse;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -26,7 +23,6 @@ import com.epmet.mpaes.WXXmlToMapUtil;
 import com.epmet.redis.RedisThird;
 import com.epmet.service.ComponentVerifyTicketService;
 import com.epmet.wxapi.constant.WxMaCodeConstant;
-import com.taobao.api.ApiException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
index 85b15f296d..8e1d2bfcc7 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
@@ -7,8 +7,8 @@ import com.dingtalk.api.request.OapiRobotSendRequest;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.HttpClientManager;
-import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.ModuleConstant;
 import com.epmet.constant.ThirdRedisKeyConstant;
 import com.epmet.constant.ThirdRunTimeInfoConstant;
@@ -17,6 +17,7 @@ import com.epmet.dto.form.CodeAuditRecordFormDTO;
 import com.epmet.dto.form.MessagePushTextFormDTO;
 import com.epmet.dto.result.AuthorizationInfoResultDTO;
 import com.epmet.dto.result.CustomerIdAndClientResultDTO;
+import com.epmet.dto.result.DingResultDTO;
 import com.epmet.dto.result.TemplateAndAppIdResultDTO;
 import com.epmet.mpaes.AesException;
 import com.epmet.mpaes.WXBizMsgCrypt;
@@ -25,7 +26,6 @@ import com.epmet.redis.RedisThird;
 import com.epmet.service.WarrantService;
 import com.epmet.wxapi.constant.WxMaCodeConstant;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
 import org.dom4j.DocumentException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,14 +33,11 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
-import java.net.URLEncoder;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -55,8 +52,6 @@ public class WarrantServiceImpl implements WarrantService {
 
     @Value("${third.platform.appId}")
     private String componentAppId;
-    @Value("${third.platform.appSecret}")
-    private String appSecret;
     @Value("${third.platform.aesKey}")
     private String aesKey;
     @Value("${third.platform.token}")
@@ -72,11 +67,7 @@ public class WarrantServiceImpl implements WarrantService {
     @Autowired
     private ComponentVerifyTicketServiceImpl componentVerifyTicketServiceImpl;
     @Autowired
-    private MessagePushTextDao messagePushTextDao;
-    @Autowired
     private RedisThird redisThird;
-    @Autowired
-    private PaCustomerDao paCustomerDao;
 
     /**
      * @Description  1.保存代码审核结果 2.更新代码上传结果
@@ -143,27 +134,35 @@ public class WarrantServiceImpl implements WarrantService {
                 codeAuditRecord.setCustomerId(customerId);
                 codeAuditRecord.setAuthAppId(authAppId);
                 codeAuditRecord.setTemplateId(templateId);
-                String customerName = paCustomerDao.selectCustomerName(customerId);
                 String client = clientType.equals(ModuleConstant.RESI) ? "居民端" : "工作端";
-                //插入 代码审核 记录
-                log.info(String.format(ThirdRunTimeInfoConstant.CODE_AUDIT_RESULT, xml));
-                codeAuditRecordDao.insertCodeAuditRecord(codeAuditRecord);
-                // 修改 code_audit_result 中的代码审核结果
-                String reason = codeAuditRecord.getReason();
                 String codeResult = null;
                 switch (event) {
                     case ModuleConstant.WEAPP_AUDIT_SUCCESS:
                         codeResult = ModuleConstant.AUDIT_SUCCESS;
+                        Long successTime = Long.valueOf(xml.get(ModuleConstant.SUCC_TIME).toString());
+                        codeAuditRecord.setSuccTime(componentVerifyTicketServiceImpl.sToDate(successTime.toString()));
                         break;
                     case ModuleConstant.WEAPP_AUDIT_FAIL:
                         codeResult = ModuleConstant.AUDIT_FAILED;
+                        Long failTime = Long.valueOf(xml.get(ModuleConstant.FAIL_TIME).toString());
+                        codeAuditRecord.setFailTime(componentVerifyTicketServiceImpl.sToDate(failTime.toString()));
                         break;
                     case ModuleConstant.WEAPP_AUDIT_DELAY:
                         codeResult = ModuleConstant.DELAY;
+                        Long delayTime = Long.valueOf(xml.get(ModuleConstant.DELAY_TIME).toString());
+                        codeAuditRecord.setDelayTime(componentVerifyTicketServiceImpl.sToDate(delayTime.toString()));
                         break;
+                    default:
+                        codeResult = ModuleConstant.AUDIT_FAILED;
                 }
+                //插入 代码审核 记录
+                log.info(String.format(ThirdRunTimeInfoConstant.CODE_AUDIT_RESULT, xml));
+                codeAuditRecordDao.insertCodeAuditRecord(codeAuditRecord);
+                // 修改 code_audit_result 中的代码审核结果
+                String reason = codeAuditRecord.getReason();
                 log.info("开始寻找机器人发送消息");
-                this.dingDingRobot(reason,event,customerName,client);
+                DingResultDTO dingResultDTO = codeCustomerDao.selectCustomerNameAndVersion(customerId, clientType);
+                this.dingDingRobot(reason,event,dingResultDTO,client,codeAuditRecord);
                 log.info("已找到robot，并发送消息......");
                 String codeCustomerId = codeCustomerDao.selectCodeCustomerId(codeAuditRecord);
                 codeAuditResultDao.updateAuditResult(customerId, codeCustomerId, codeResult);
@@ -201,38 +200,57 @@ public class WarrantServiceImpl implements WarrantService {
         }
     }
 
+    /*public static void main(String[] args) {
+        WarrantServiceImpl w = new WarrantServiceImpl();
+        DingResultDTO ding = new DingResultDTO();
+        ding.setUserVersion("1.1.1");
+        ding.setCustomerName("阿里巴巴");
+        CodeAuditRecordFormDTO dto = new CodeAuditRecordFormDTO();
+        String format = DateUtils.format(new Date(),ModuleConstant.DATE_FORMAT);
+        System.out.println(format);
+        dto.setFailTime(new Date());
+        w.dingDingRobot("再次失败","weapp_audit_fail",ding,"支付宝",dto);
+    }*/
+
     /**
      * @Description  钉钉机器人报警
      * @author zxc
      * @date 2020/8/5 4:33 下午
      */
-    public void dingDingRobot(String result,String event,String customerName,String clientType){
+    public void dingDingRobot(String result,String event,DingResultDTO dingResultDTO,String clientType,CodeAuditRecordFormDTO codeAuditRecord){
         OapiRobotSendRequest request = new OapiRobotSendRequest();
         request.setMsgtype("markdown");
         OapiRobotSendRequest.Markdown markdown = new OapiRobotSendRequest.Markdown();
         markdown.setTitle("代码审核结果");
+        String customerName = dingResultDTO.getCustomerName();
+        String userVersion = dingResultDTO.getUserVersion();
         switch (event){
             case ModuleConstant.WEAPP_AUDIT_SUCCESS:
                 markdown.setText("代码审核结果: 审核成功\n"+
                         "> 客户名称：" + customerName +"\n\n"+
-                        "> 客户端："+clientType+"\n");
+                        "> 客户端："+clientType+"\n\n"+
+                        "> 审核成功时间："+DateUtils.format(codeAuditRecord.getSuccTime(),ModuleConstant.DATE_FORMAT)+"\n\n"+
+                        "> 版本号："+userVersion);
                 break;
             case ModuleConstant.WEAPP_AUDIT_FAIL:
                 markdown.setText("代码审核结果: 审核不通过\n"+
                         "> 客户名称：" + customerName +"\n\n"+
                         "> 客户端："+clientType+"\n\n"+
+                        "> 审核失败时间："+DateUtils.format(codeAuditRecord.getFailTime(),ModuleConstant.DATE_FORMAT)+"\n\n"+
+                        "> 版本号："+userVersion+"\n\n"+
                         "> 不通过原因："+result);
                 break;
             case ModuleConstant.WEAPP_AUDIT_DELAY:
                 markdown.setText("代码审核结果: 审核延时\n"+
                         "> 客户名称：" + customerName +"\n\n"+
                         "> 客户端："+clientType+"\n\n"+
+                        "> 审核延时时间："+DateUtils.format(codeAuditRecord.getDelayTime(),ModuleConstant.DATE_FORMAT)+"\n\n"+
+                        "> 版本号："+userVersion+"\n\n"+
                         "> 延时原因："+result);
                 break;
             default:
                 markdown.setText("机器人生病了......");
                 log.info("event为："+event);
-                break;
         }
         request.setMarkdown(markdown);
         log.info("robot需要发送的内容为："+markdown.getText());
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java
index 4711ac11b7..ce18ca880c 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java
@@ -188,7 +188,7 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
 	public WxResult release(String accessToken) {
 		WxResult result = new WxResult();
 		String url = WxMaCodeConstant.RELEASE_URL + "?" + "access_token=" + accessToken;
-		Result<String> releaseResult = HttpClientManager.getInstance().sendPostByJSON(url, null);
+		Result<String> releaseResult = HttpClientManager.getInstance().sendPostByJSON(url, "{}");
 		if (!releaseResult.success()) {
 			result.setErrorCode(releaseResult.getCode());
 			result.setErrorMsg(releaseResult.getMsg());
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeCustomerDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeCustomerDao.xml
index 366e15e889..cce9cbc767 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeCustomerDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeCustomerDao.xml
@@ -170,6 +170,21 @@
         ORDER BY RELEASE_TIME DESC
         LIMIT 1
     </select>
+
+    <!-- 查询客户名称 和 代码版本号 -->
+    <select id="selectCustomerNameAndVersion" resultType="com.epmet.dto.result.DingResultDTO">
+        SELECT
+            user_version AS userVersion,
+            customer_name AS customerName
+        FROM
+            code_customer
+        WHERE
+            del_flag = '0'
+            AND customer_id = #{customerId}
+            AND client_type = #{clientType}
+            ORDER BY created_time DESC
+            LIMIT 1
+    </select>
     <update id="updateVersion">
         UPDATE code_customer
         SET