andrew 4 年前
父节点
当前提交
ccf8794e7a

+ 29
- 11
src/main/java/com/huiju/estateagents/controller/MiniAppController.java 查看文件

38
 
38
 
39
 import javax.annotation.Resource;
39
 import javax.annotation.Resource;
40
 import javax.servlet.http.HttpServletRequest;
40
 import javax.servlet.http.HttpServletRequest;
41
+import java.lang.reflect.Array;
41
 import java.time.LocalDateTime;
42
 import java.time.LocalDateTime;
42
 import java.util.HashMap;
43
 import java.util.HashMap;
43
 import java.util.List;
44
 import java.util.List;
44
 import java.util.Map;
45
 import java.util.Map;
45
 import java.util.concurrent.ExecutorService;
46
 import java.util.concurrent.ExecutorService;
46
 import java.util.concurrent.Executors;
47
 import java.util.concurrent.Executors;
48
+import java.util.stream.Collector;
49
+import java.util.stream.Collectors;
50
+
51
+import static com.sun.jmx.snmp.ThreadContext.contains;
47
 
52
 
48
 @RestController
53
 @RestController
49
 @RequestMapping("/api/wx")
54
 @RequestMapping("/api/wx")
247
             if (!StringUtils.isEmpty(from) && !StringUtils.isEmpty(recommender) && !StringUtils.isEmpty(targetId)) {
252
             if (!StringUtils.isEmpty(from) && !StringUtils.isEmpty(recommender) && !StringUtils.isEmpty(targetId)) {
248
                 taSharePersonFromService.createBy(taPerson, from, recommender, targetId);
253
                 taSharePersonFromService.createBy(taPerson, from, recommender, targetId);
249
             }
254
             }
250
-            QueryWrapper<TaUserVerify> taUserVerifyQueryWrapper = new QueryWrapper<>();
251
-            taUserVerifyQueryWrapper.eq("person_id",taPerson.getPersonId());
252
-            taUserVerifyQueryWrapper.eq("verify_status","1");
253
-            List<TaUserVerify> taUserVerifies = taUserVerifyService.list(taUserVerifyQueryWrapper);
254
-
255
 
255
 
256
             Map<String, Object> result = new HashMap<>();
256
             Map<String, Object> result = new HashMap<>();
257
             result.put("person", taPerson);
257
             result.put("person", taPerson);
258
             result.put("sessionKey", session.getSessionKey());
258
             result.put("sessionKey", session.getSessionKey());
259
             result.put("token", token);
259
             result.put("token", token);
260
-            result.put("verifyStatus", taUserVerifies.size() > 0);
260
+            result.put("verifyStatus", getVerifyStatus(taPerson));
261
             if (null != sceneParams) {
261
             if (null != sceneParams) {
262
                 result.put("scene", sceneParams);
262
                 result.put("scene", sceneParams);
263
             }
263
             }
395
         Map<String, Object> extraInfo = taPersonService.getExtraInfo(person.getPersonId());
395
         Map<String, Object> extraInfo = taPersonService.getExtraInfo(person.getPersonId());
396
         person.setPassword(null);
396
         person.setPassword(null);
397
 
397
 
398
-        QueryWrapper<TaUserVerify> taUserVerifyQueryWrapper = new QueryWrapper<>();
399
-        taUserVerifyQueryWrapper.eq("person_id",person.getPersonId());
400
-        taUserVerifyQueryWrapper.eq("verify_status","1");
401
-        List<TaUserVerify> taUserVerifies = taUserVerifyService.list(taUserVerifyQueryWrapper);
398
+        // 获取用户认证状态
399
+        String verifyStatus = getVerifyStatus(person);
402
 
400
 
403
         Map<String, Object> result = new HashMap<>();
401
         Map<String, Object> result = new HashMap<>();
404
         result.put("person", person);
402
         result.put("person", person);
405
         result.put("extraInfo", extraInfo);
403
         result.put("extraInfo", extraInfo);
406
         result.put("miniApp", miniapp);
404
         result.put("miniApp", miniapp);
407
-        result.put("verifyStatus", taUserVerifies.size() > 0);
405
+        result.put("verifyStatus", verifyStatus);
408
 
406
 
409
         return ResponseBean.success(result);
407
         return ResponseBean.success(result);
410
     }
408
     }
411
 
409
 
410
+    private String getVerifyStatus(TaPerson person) {
411
+        QueryWrapper<TaUserVerify> taUserVerifyQueryWrapper = new QueryWrapper<>();
412
+        taUserVerifyQueryWrapper.eq("person_id",person.getPersonId());
413
+        List<TaUserVerify> taUserVerifies = taUserVerifyService.list(taUserVerifyQueryWrapper);
414
+        // 未认证
415
+        String verifyStatus = "not_certified";
416
+        List<String> verifyList = taUserVerifies.stream().map(TaUserVerify::getVerifyStatus).collect(Collectors.toList());
417
+        if (verifyList.contains("1")){
418
+            // 已认证
419
+            verifyStatus = "certified";
420
+        }else if (verifyList.contains("2")){
421
+            // 认证未通过
422
+            verifyStatus = "certification_failed";
423
+        }else if (verifyList.contains("0")){
424
+            // 认证中
425
+            verifyStatus = "certification_in_progress";
426
+        }
427
+        return verifyStatus;
428
+    }
429
+
412
     /**
430
     /**
413
      * 获取用户绑定手机号信息
431
      * 获取用户绑定手机号信息
414
      */
432
      */

+ 6
- 0
src/main/java/com/huiju/estateagents/property/model/TpTicket.java 查看文件

118
      */
118
      */
119
     private LocalDateTime updateDate;
119
     private LocalDateTime updateDate;
120
 
120
 
121
+    /**
122
+     * 报修类型的名字
123
+     */
124
+    @TableField(exist = false)
125
+    private String repairName;
126
+
121
 
127
 
122
     @TableField(exist = false)
128
     @TableField(exist = false)
123
     private String [] tdImagesList;
129
     private String [] tdImagesList;

+ 8
- 0
src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java 查看文件

652
 
652
 
653
             ticket.setTdImagesList(imgageArr);
653
             ticket.setTdImagesList(imgageArr);
654
             ticket.setTicketRecordList(ticketRecordList);
654
             ticket.setTicketRecordList(ticketRecordList);
655
+            // 报修类型:0:公共区域  1: 房屋质量  2::户内设施  PS : 报修的情况下才有报修类型
656
+            String repairType = ticket.getRepairType();
657
+            String repairName = repairType == null ?
658
+                    null : "0".equals(repairType) ?
659
+                    "公共区域" : "1".equals(repairType) ?
660
+                    "房屋质量" : "2".equals(repairType) ?
661
+                    "户内设施" : null;
662
+            ticket.setRepairName(repairName);
655
 
663
 
656
 //            // 把该工单的消息变为 已读
664
 //            // 把该工单的消息变为 已读
657
 //            TpMessage tpMessage = new TpMessage();
665
 //            TpMessage tpMessage = new TpMessage();

+ 0
- 5
src/main/java/com/huiju/estateagents/property/vo/TpTicketVO.java 查看文件

23
 @Data
23
 @Data
24
 public class TpTicketVO extends TpTicket {
24
 public class TpTicketVO extends TpTicket {
25
 
25
 
26
-    /**
27
-     * 报修类型的名字
28
-     */
29
-    private String repairName;
30
-
31
     /** ====================================== **/
26
     /** ====================================== **/
32
 
27
 
33
 
28