From 2d456983b67e1a51f43ff1c58431055549fb3c03 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 21 Jul 2020 10:41:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=8C=E7=94=9F=E4=BA=BA=E6=90=9C=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/feign/EpmetThirdFeignClient.java   | 3 ++-
 .../main/java/com/epmet/controller/CustomerMpController.java   | 2 +-
 .../java/com/epmet/service/impl/CustomerMpServiceImpl.java     | 3 ++-
 .../src/main/resources/mapper/CustomerMpDao.xml                | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java
index ce37bcdaac..5a91825392 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java
@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  *
  * @Author zxc
  * @CreateTime 2020/7/5 14:45
+ * ,url="localhost:8110"
  */
 @FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = EpmetThirdFeignClientFallback.class)
 
@@ -103,6 +104,6 @@ public interface EpmetThirdFeignClient {
      * @Author sun
      * @Description 根据appId查询公众号注册的客户信息
      **/
-    @PostMapping(value = "third/customermp/getcustomermsg")
+    @PostMapping(value = "third/customermp/getcustomermsg/{appId}")
     Result<PublicCustomerResultDTO> getCustomerMsg(@PathVariable("appId") String appId);
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CustomerMpController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CustomerMpController.java
index 4abc2f22f1..d338789f03 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CustomerMpController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CustomerMpController.java
@@ -111,7 +111,7 @@ public class CustomerMpController {
      * @Author sun
      * @Description 根据appId查询公众号注册的客户信息
      **/
-    @PostMapping("getcustomermsg")
+    @PostMapping("getcustomermsg/{appId}")
     public Result<PublicCustomerResultDTO> getCustomerMsg(@PathVariable("appId") String appId) {
         return new Result<PublicCustomerResultDTO>().ok(customerMpService.getCustomerMsg(appId));
     }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CustomerMpServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CustomerMpServiceImpl.java
index 3f13d5e4dc..b716dff1b9 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CustomerMpServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CustomerMpServiceImpl.java
@@ -156,7 +156,8 @@ public class CustomerMpServiceImpl extends BaseServiceImpl<CustomerMpDao, Custom
         PublicCustomerResultDTO resultDTO = new PublicCustomerResultDTO();
         //1.根据appid查询客户信息
         PaCustomerDTO paCustomerDTO = baseDao.selectCustomerByAppId(appId);
-        if(null==paCustomerDTO){
+        if (null == paCustomerDTO) {
+            logger.error("根据小程序appId未查询到已授权并且已完成客户初始化的客户信息，appId->" + appId);
             throw new RenException(PaConstant.SELECT_CUSTOMER_EXCEPTION);
         }
         resultDTO.setCustomer(paCustomerDTO);
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 a0c2b11a55..245761becf 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
@@ -110,6 +110,8 @@
         WHERE
             cm.del_flag = '0'
         AND pc.del_flag = '0'
+        AND pc.is_initialize = '1' <!-- 已完成客户初始化 -->
+        AND cm.authorization_flag = '1'  <!-- 已完成小程序授权 -->
         AND cm.app_id = #{appId}
     </select>