Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-service

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

@@ -20,6 +20,8 @@ import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.mapper.TaOrgCityMapper;
 import com.huiju.estateagents.mapper.TaSalesBatchMapper;
+import com.huiju.estateagents.property.model.TaUserVerify;
+import com.huiju.estateagents.property.service.ITaUserVerifyService;
 import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import io.swagger.annotations.Api;
@@ -119,6 +121,9 @@ public class MiniAppController extends BaseController {
     @Autowired
     private TaSalesBatchMapper taSalesBatchMapper;
 
+    @Autowired
+    private ITaUserVerifyService taUserVerifyService;
+
     /**
      * 验证接入
      */
@@ -242,11 +247,17 @@ 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);
             if (null != sceneParams) {
                 result.put("scene", sceneParams);
             }
@@ -384,10 +395,16 @@ 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);
+
         Map<String, Object> result = new HashMap<>();
         result.put("person", person);
         result.put("extraInfo", extraInfo);
         result.put("miniApp", miniapp);
+        result.put("verifyStatus", taUserVerifies.size() > 0);
 
         return ResponseBean.success(result);
     }

src/main/java/com/huiju/estateagents/property/controller/TpTicketController.java

@@ -75,7 +75,7 @@ public class TpTicketController extends BaseController {
                     "status:工单状态（0:待分配  1:拒绝受理 2:待处理 3:正在处理 4:待评价 5:已评价 6:已终止）")
     })
 
-    @RequestMapping(value = "/addRecordComment", method = RequestMethod.POST)
+    @RequestMapping(value = "/admin/addRecordComment", method = RequestMethod.POST)
     public ResponseBean addRecordComment(@RequestBody String parameter, HttpServletRequest request){
         TaUser userElement = getTaUser(request);
         ResponseBean  responseBean = tpTicketService.addRecordComment(parameter,userElement.getUserId(),userElement.getOrgId(),userElement.getUserName());
@@ -98,7 +98,7 @@ public class TpTicketController extends BaseController {
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "ticketId:工单id,textContent:拒绝的内容" )
     })
 
-    @RequestMapping(value = "/updateTicketStatus", method = RequestMethod.POST)
+    @RequestMapping(value = "/admin/updateTicketStatus", method = RequestMethod.POST)
     public ResponseBean updateTicketStatus(@RequestBody String parameter, HttpServletRequest request){
         TaUser userElement = getTaUser(request);
         ResponseBean  responseBean = tpTicketService.updateTicketStatus(parameter,userElement.getUserId(),userElement.getOrgId(),userElement.getUserName(),userElement.getLoginName());
@@ -110,7 +110,7 @@ public class TpTicketController extends BaseController {
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "content:对话内容，imageUrl:[]图片,ticketId:工单id" )
     })
 
-    @RequestMapping(value = "/updateTicket", method = RequestMethod.POST)
+    @RequestMapping(value = "/admin/updateTicket", method = RequestMethod.POST)
     public ResponseBean updateTicket(@RequestBody String parameter, HttpServletRequest request){
         TaUser userElement = getTaUser(request);
         ResponseBean  responseBean = tpTicketService.updateTicket(parameter,userElement.getUserId(),userElement.getOrgId(),userElement.getUserName(),userElement.getLoginName());