bug

src/main/java/com/huiju/estateagents/controller/MiniAppController.java

@@ -38,12 +38,17 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Array;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+
+import static com.sun.jmx.snmp.ThreadContext.contains;
 
 @RestController
 @RequestMapping("/api/wx")
@@ -247,17 +252,12 @@ public class MiniAppController extends BaseController {
             if (!StringUtils.isEmpty(from) && !StringUtils.isEmpty(recommender) && !StringUtils.isEmpty(targetId)) {
                 taSharePersonFromService.createBy(taPerson, from, recommender, targetId);
             }
-            QueryWrapper<TaUserVerify> taUserVerifyQueryWrapper = new QueryWrapper<>();
-            taUserVerifyQueryWrapper.eq("person_id",taPerson.getPersonId());
-            taUserVerifyQueryWrapper.eq("verify_status","1");
-            List<TaUserVerify> taUserVerifies = taUserVerifyService.list(taUserVerifyQueryWrapper);
-
 
             Map<String, Object> result = new HashMap<>();
             result.put("person", taPerson);
             result.put("sessionKey", session.getSessionKey());
             result.put("token", token);
-            result.put("verifyStatus", taUserVerifies.size() > 0);
+            result.put("verifyStatus", getVerifyStatus(taPerson));
             if (null != sceneParams) {
                 result.put("scene", sceneParams);
             }
@@ -395,20 +395,38 @@ public class MiniAppController extends BaseController {
         Map<String, Object> extraInfo = taPersonService.getExtraInfo(person.getPersonId());
         person.setPassword(null);
 
-        QueryWrapper<TaUserVerify> taUserVerifyQueryWrapper = new QueryWrapper<>();
-        taUserVerifyQueryWrapper.eq("person_id",person.getPersonId());
-        taUserVerifyQueryWrapper.eq("verify_status","1");
-        List<TaUserVerify> taUserVerifies = taUserVerifyService.list(taUserVerifyQueryWrapper);
+        // 获取用户认证状态
+        String verifyStatus = getVerifyStatus(person);
 
         Map<String, Object> result = new HashMap<>();
         result.put("person", person);
         result.put("extraInfo", extraInfo);
         result.put("miniApp", miniapp);
-        result.put("verifyStatus", taUserVerifies.size() > 0);
+        result.put("verifyStatus", verifyStatus);
 
         return ResponseBean.success(result);
     }
 
+    private String getVerifyStatus(TaPerson person) {
+        QueryWrapper<TaUserVerify> taUserVerifyQueryWrapper = new QueryWrapper<>();
+        taUserVerifyQueryWrapper.eq("person_id",person.getPersonId());
+        List<TaUserVerify> taUserVerifies = taUserVerifyService.list(taUserVerifyQueryWrapper);
+        // 未认证
+        String verifyStatus = "not_certified";
+        List<String> verifyList = taUserVerifies.stream().map(TaUserVerify::getVerifyStatus).collect(Collectors.toList());
+        if (verifyList.contains("1")){
+            // 已认证
+            verifyStatus = "certified";
+        }else if (verifyList.contains("2")){
+            // 认证未通过
+            verifyStatus = "certification_failed";
+        }else if (verifyList.contains("0")){
+            // 认证中
+            verifyStatus = "certification_in_progress";
+        }
+        return verifyStatus;
+    }
+
     /**
      * 获取用户绑定手机号信息
      */

src/main/java/com/huiju/estateagents/property/model/TpTicket.java

@@ -118,6 +118,12 @@ public class TpTicket implements Serializable {
      */
     private LocalDateTime updateDate;
 
+    /**
+     * 报修类型的名字
+     */
+    @TableField(exist = false)
+    private String repairName;
+
 
     @TableField(exist = false)
     private String [] tdImagesList;

src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java

@@ -652,6 +652,14 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 
             ticket.setTdImagesList(imgageArr);
             ticket.setTicketRecordList(ticketRecordList);
+            // 报修类型：0:公共区域  1: 房屋质量  2::户内设施  PS : 报修的情况下才有报修类型
+            String repairType = ticket.getRepairType();
+            String repairName = repairType == null ?
+                    null : "0".equals(repairType) ?
+                    "公共区域" : "1".equals(repairType) ?
+                    "房屋质量" : "2".equals(repairType) ?
+                    "户内设施" : null;
+            ticket.setRepairName(repairName);
 
 //            // 把该工单的消息变为 已读
 //            TpMessage tpMessage = new TpMessage();

src/main/java/com/huiju/estateagents/property/vo/TpTicketVO.java

@@ -23,11 +23,6 @@ import java.util.Map;
 @Data
 public class TpTicketVO extends TpTicket {
 
-    /**
-     * 报修类型的名字
-     */
-    private String repairName;
-
     /** ====================================== **/