From 826a1949272ec4dee3dc8199b182b409b27615f1 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 10 Sep 2020 09:43:25 +0800
Subject: [PATCH] =?UTF-8?q?ext=5Fjson=E5=8A=A0=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/MiniInfoDao.java       | 10 ++++++++++
 .../java/com/epmet/service/impl/CodeServiceImpl.java   |  8 ++++++++
 .../src/main/java/com/epmet/wxapi/param/WxExtJson.java |  4 ++++
 .../src/main/resources/mapper/MiniInfoDao.xml          |  6 ++++++
 4 files changed, 28 insertions(+)

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniInfoDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniInfoDao.java
index 0d29f738df..6add27be9a 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniInfoDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniInfoDao.java
@@ -53,5 +53,15 @@ public interface MiniInfoDao extends BaseDao<MiniInfoEntity> {
      * @author zxc
      */
     CustomerIdAndClientResultDTO selectCustomerIdAndClientByToUserName(@Param("toUserName")String toUserName);
+
+    /**
+     * 获取小程序名
+     * @author zhaoqifeng
+     * @date 2020/9/7 17:25
+     * @param customerId
+     * @param clientType
+     * @return java.lang.String
+     */
+    String getNickName(@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/CodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java
index 09f5f5a276..9a5640f22d 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java
@@ -11,6 +11,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.CodeConstant;
 import com.epmet.dao.AuthorizationInfoDao;
 import com.epmet.dao.ComponentAccessTokenDao;
+import com.epmet.dao.MiniInfoDao;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -65,6 +66,8 @@ public class CodeServiceImpl implements CodeService {
 	private OssFeignClient ossFeignClient;
 	@Autowired
 	private PaCustomerService paCustomerService;
+	@Autowired
+	private MiniInfoDao miniInfoDao;
 
 	@Override
 	public List<TemplateListResultDTO> templateList() {
@@ -115,10 +118,15 @@ public class CodeServiceImpl implements CodeService {
 		if (null == authInfo) {
 			throw new RenException("未授权");
 		}
+		//获取小程序居民端与工作端名称
+		String resiName = miniInfoDao.getNickName(formDTO.getCustomerId(), "resi");
+		String workName = miniInfoDao.getNickName(formDTO.getCustomerId(), "work");
 		String extJson = getExtJson(formDTO);
 		WxExtJson wxExtJson = JSONObject.parseObject(extJson, WxExtJson.class);
 		wxExtJson.setExtAppid(authInfo.getAuthorizerAppid());
 		wxExtJson.getExt().setExtAppid(authInfo.getAuthorizerAppid());
+		wxExtJson.getExt().setResiName(resiName);
+		wxExtJson.getExt().setWorkName(workName);
 		extJson = JSON.toJSONString(wxExtJson);
 		CodeExtDTO codeExtDTO = codeExtService.getExtByCustomer(formDTO.getCustomerId(), formDTO.getClientType());
 		if (null == codeExtDTO) {
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/param/WxExtJson.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/param/WxExtJson.java
index 8d6b843126..4ba45e37cf 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/param/WxExtJson.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/param/WxExtJson.java
@@ -31,6 +31,10 @@ public class WxExtJson implements Serializable {
 		@JSONField(ordinal = 1)
 		private String extAppid;
 		@JSONField(ordinal = 2)
+		private String resiName;
+		@JSONField(ordinal = 3)
+		private String workName;
+		@JSONField(ordinal = 4)
 		private FootbarBean footbar;
 		@NoArgsConstructor
 		@Data
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniInfoDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniInfoDao.xml
index 7a31b83279..f70597f4d5 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniInfoDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniInfoDao.xml
@@ -64,4 +64,10 @@
             AND user_name = #{toUserName}
         LIMIT 1
     </select>
+    <select id="getNickName" resultType="java.lang.String">
+        select NICK_NAME from mini_info
+        where DEL_FLAG = 0
+          AND CUSTOMER_ID = #{customerId}
+          AND CLIENT_TYPE = #{clientType}
+    </select>
 </mapper>
\ No newline at end of file