微信端人脸登记bug修复

src/main/java/com/jpsoft/smart/modules/wechat/controller/WxController.java

@@ -2,6 +2,7 @@ package com.jpsoft.smart.modules.wechat.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jpsoft.smart.modules.base.entity.InformationInfo;
+import com.jpsoft.smart.modules.base.entity.OwnerInfo;
 import com.jpsoft.smart.modules.base.service.InformationInfoService;
 import com.jpsoft.smart.modules.base.service.OwnerInfoService;
 import com.jpsoft.smart.modules.common.dto.MessageResult;
@@ -16,13 +17,11 @@ import com.jpsoft.smart.modules.pay.properties.WxPayProperties;
 import com.jpsoft.smart.modules.wechat.entity.AccessControl;
 import com.jpsoft.smart.modules.wechat.entity.AccessToken;
 import com.jpsoft.smart.modules.wechat.service.IAccessControlService;
-import com.jpsoft.smart.modules.wechat.vo.BindFaceVo;
-import com.jpsoft.smart.modules.wechat.vo.BindPhoneVo;
-import com.jpsoft.smart.modules.wechat.vo.RepairsVo;
-import com.jpsoft.smart.modules.wechat.vo.UserInfo;
+import com.jpsoft.smart.modules.wechat.vo.*;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -181,11 +180,16 @@ public class WxController {
                 message = "用户信息不存在";
                 result = false;
             } else {
+                OwnerInfo ownerInfo = ownerInfoService.get(accessControl.getOwnerId());
+                AccessControlVo accessControlVo = new AccessControlVo();
+                BeanUtils.copyProperties(accessControl,accessControlVo);
+                accessControlVo.setName(ownerInfo.getName());
+                accessControlVo.setPhoneNum(ownerInfo.getTel());
 
 
                 HashMap<String, Object> dataMap = new HashMap<String, Object>();
 
-                dataMap.put("accessControl", accessControl);
+                dataMap.put("accessControl", accessControlVo);
 
                 data = dataMap;
             }

src/main/java/com/jpsoft/smart/modules/wechat/vo/AccessControlVo.java

@@ -0,0 +1,65 @@
+package com.jpsoft.smart.modules.wechat.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2019-12-13 10:17
+ */
+@Data
+public class AccessControlVo {
+
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 业主姓名
+     */
+    private String name;
+
+    /**
+     * 业主手机号
+     */
+    private String phoneNum;
+
+    /**
+     * openId
+     */
+    private String openId;
+
+    /**
+     * 绑定时间
+     */
+    private Date bindTime;
+
+    /**
+     * 是否绑定人脸
+     */
+    private Boolean bindFace;
+
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新人
+     */
+    private String updateBy;
+}