合并

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -118,7 +118,7 @@ public class TaUserController extends BaseController {
         return responseBean;
     }
 
-    @PutMapping(value = "/center/turn/taUser/{id}/{type}")
+    @PutMapping(value = "/{plat}/turn/taUser/{id}/{type}")
     public ResponseBean turnUser(@PathVariable String type, @PathVariable Integer id) {
         try {
             iTaUserService.turnUserOnOrNot(id, "on".equals(type));
@@ -323,6 +323,7 @@ public class TaUserController extends BaseController {
             taUserQueryWrapper.like(!StringUtils.isEmpty(userName),"user_name",userName);
             taUserQueryWrapper.like(!StringUtils.isEmpty(phone),"phone",phone);
             taUserQueryWrapper.eq(null != status,"status",status);
+            taUserQueryWrapper.ne("IFNULL(is_admin,0)",CommConstant.STATUS_NORMAL);
             IPage<TaUser> result = iTaUserService.page(pg,taUserQueryWrapper);
             List<TaUser> taUserList = result.getRecords();
             taUserList.forEach(e -> {

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -235,13 +235,16 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 	
 	@Override
 	public TaUser updateAdminUser(TaUser taUser) throws Exception {
+		TaUser taUserBefore = taUserMapper.selectById(taUser.getUserId());
 		if (StringUtils.isEmpty(taUser.getPhone())) {
 			throw new Exception("电话号码不能为空");
 		}
 		if (StringUtils.isEmpty(taUser.getUserName())) {
 			throw new Exception("用户名称不能为空");
 		}
-		taUser.setLoginName(taUser.getPhone());
+		if(taUserBefore.getLoginName().equals(taUserBefore.getPhone())){
+			taUser.setLoginName(taUser.getPhone());
+		}
 		
 		QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
 		wrapper.nested(q -> q.eq("phone", taUser.getPhone()).or().eq("login_Name", taUser.getLoginName()));

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -382,6 +382,7 @@ public class CommConstant {
     public static final String POSTER_CONTENT_TYPE_NEWS = "news";
     //人员
     public static final String POSTER_CONTENT_TYPE_PERSON = "person";
-
-
+	
+	
+	public static final String GD_KEY = "c9fc664a9030aed2ec2183508c2ca476";
 }

src/main/java/com/huiju/estateagents/common/WxUtils.java

@@ -28,21 +28,28 @@ public class WxUtils {
         System.out.println("-------------PostConstruct----------------");
 
         List<TaMiniapp> taMiniappList = iMiniAppService.getAllAvaliableMiniapps();
-        if (null != taMiniappList) {
+        if (null == taMiniappList) {
             return;
         }
 
         for (TaMiniapp taMiniapp : taMiniappList) {
-            WxMaInMemoryConfig config = new WxMaInMemoryConfig();
-            config.setAppid(taMiniapp.getMiniappId());
-            config.setSecret(taMiniapp.getSecret());
-            config.setToken(taMiniapp.getToken());
-            config.setAesKey(taMiniapp.getAesKey());
-            config.setMsgDataFormat("JSON");
-
-            WxMaService service = new WxMaServiceImpl();
-            service.setWxMaConfig(config);
+            WxMaService service = newService(taMiniapp);
             serives.put(taMiniapp.getMiniappId(), service);
         }
     }
+
+    public WxMaService newService(TaMiniapp taMiniapp) {
+        serives.remove(taMiniapp.getMiniappId());
+
+        WxMaInMemoryConfig config = new WxMaInMemoryConfig();
+        config.setAppid(taMiniapp.getMiniappId());
+        config.setSecret(taMiniapp.getSecret());
+        config.setToken(taMiniapp.getToken());
+        config.setAesKey(taMiniapp.getAesKey());
+        config.setMsgDataFormat("JSON");
+
+        WxMaService service = new WxMaServiceImpl();
+        service.setWxMaConfig(config);
+        return service;
+    }
 }

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

@@ -4,6 +4,7 @@ package com.huiju.estateagents.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
@@ -20,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import com.huiju.estateagents.base.BaseController;
+import org.springframework.web.client.RestTemplate;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
@@ -89,7 +91,7 @@ public class TaPersonController extends BaseController {
     }
 
     @PutMapping("/wx/registerConsultant")
-    public ResponseBean registerConsultant(HttpServletRequest request) {
+    public ResponseBean registerConsultant(HttpServletRequest request,@RequestParam String phone) {
         Integer orgId =getOrgId(request);
         ResponseBean responseBean = new ResponseBean();
         String openid = JWTUtils.getSubject(request);
@@ -99,7 +101,7 @@ public class TaPersonController extends BaseController {
         }
         TaPerson person = taPersons.get(0);
         QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("phone",person.getPhone());
+        queryWrapper.eq("phone",phone);
         queryWrapper.eq("org_id",orgId);
         List<TaUser> users = taUserService.list(queryWrapper);
         if(users.size()>0){
@@ -116,7 +118,7 @@ public class TaPersonController extends BaseController {
     }
 
     @PutMapping("/wx/registerAgent")
-    public ResponseBean registerAgent(@RequestParam String recommendAgentCode, @RequestParam String channelCode,HttpServletRequest request) {
+    public ResponseBean registerAgent(@RequestParam(required = false) String recommendAgentCode, @RequestParam(required = false) String channelCode,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId =getOrgId(request);
         String openid = JWTUtils.getSubject(request);
@@ -466,8 +468,8 @@ public class TaPersonController extends BaseController {
      * @param channelCode 渠道码
      * @return
      */
-    @RequestMapping(value="/wx/customer/recommend/becomeChannel/{channelCode}",method= RequestMethod.PUT)
-    public ResponseBean taRecommendAgentBecomeChannel(@PathVariable String channelCode,HttpServletRequest request,@RequestParam("personType")String personType){
+    @RequestMapping(value="/wx/customer/recommend/becomeChannel",method= RequestMethod.PUT)
+    public ResponseBean taRecommendAgentBecomeChannel(@RequestParam(required = false) String channelCode,HttpServletRequest request,@RequestParam("personType")String personType){
         ResponseBean responseBean = new ResponseBean();
         String openid = JWTUtils.getSubject(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
@@ -519,5 +521,77 @@ public class TaPersonController extends BaseController {
     }
 
 
+    /**
+     * 获取名片详情
+     * @return
+     */
+    @GetMapping("/wx/agent/recommend/mine")
+    public ResponseBean getAgentIRecommend(@RequestParam(defaultValue = "1") int pageNum,
+                                           @RequestParam(defaultValue = "10") int pageSize, HttpServletRequest request) {
+        String openid = JWTUtils.getSubject(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        QueryWrapper<TaPerson>queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("recommend_agent",person.getRecommendAgent());
+        queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+        Page<TaPerson>page = new Page<>();
+        page.setPages(pageNum);
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaPerson>data = taPersonService.page(page,queryWrapper);
+        responseBean.addSuccess(data);
+
+        return responseBean;
+    }
+
+    /**
+     * 获取当前用户
+     * @param request
+     * @return
+     */
+    @GetMapping("/wx/user/current")
+    public ResponseBean getWxCurrentPerson(HttpServletRequest request) {
+        String personId = JWTUtils.getSubject(request);
+        TaPerson taPerson = taPersonService.getById(personId);
+        if (null == taPerson || taPerson.getStatus() != CommConstant.STATUS_NORMAL) {
+            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_AUTH_EXPIRED);
+        }
 
+        return ResponseBean.success(taPerson);
+    }
+    
+    /**
+     * 微信添加人员添加城市
+     * @param location
+     * @param request
+     * @return
+     */
+    @PutMapping("/wx/person/city")
+    public ResponseBean updatePersonCity(@RequestBody String location, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        String openid = JWTUtils.getSubject(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        JSONObject jsonObject = JSONObject.parseObject(location);
+        RestTemplate restTemplate = new RestTemplate();
+        String result = restTemplate.getForObject("https://restapi.amap.com/v3/geocode/regeo?key="+ CommConstant.GD_KEY + "&location=" + jsonObject.getString("location") + "&output=json", String.class);
+        JSONObject resultJson = JSONObject.parseObject(result);
+        if (!resultJson.getString("status").equals(CommConstant.STATUS_NORMAL)){
+            String adcode =  resultJson.getJSONObject("regeocode").getJSONObject("addressComponent").getString("adcode");
+            adcode = adcode.substring(0,adcode.length()-2) + "00";
+            person.setCity(adcode);
+            taPersonService.updateById(person);
+            responseBean.addSuccess("保存城市成功");
+            return responseBean;
+        }
+        responseBean.addError("未找到城市");
+        return responseBean;
+    }
 }

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

@@ -312,7 +312,7 @@ public class TaRecommendCustomerController extends BaseController {
         }
     }
 
-    @GetMapping("/wx/customer/recommend/{customerId}")
+    @GetMapping("/wx/customer/recommend/mine")
     public ResponseBean getWxCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize,HttpServletRequest request){
         Integer orgId =getOrgId(request);
         String openid = JWTUtils.getSubject(request);

src/main/java/com/huiju/estateagents/service/impl/TaMiniappServiceImpl.java

@@ -1,13 +1,16 @@
 package com.huiju.estateagents.service.impl;
 
+import cn.binarywang.wx.miniapp.api.WxMaService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.common.WxUtils;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaMiniappTemplate;
 import com.huiju.estateagents.mapper.TaMiniappMapper;
 import com.huiju.estateagents.mapper.TaMiniappTemplateMapper;
 import com.huiju.estateagents.service.ITaMiniappService;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -24,6 +27,9 @@ public class TaMiniappServiceImpl extends ServiceImpl<TaMiniappMapper, TaMiniapp
     @Autowired
     TaMiniappTemplateMapper taMiniappTemplateMapper;
 
+    @Autowired
+    WxUtils wxUtils;
+
     @Override
     public TaMiniapp saveInfoWithTpls(TaMiniapp taMiniapp) throws Exception {
         if (StringUtils.isEmpty(taMiniapp.getMiniappId())) {
@@ -63,6 +69,11 @@ public class TaMiniappServiceImpl extends ServiceImpl<TaMiniappMapper, TaMiniapp
             }
         }
 
+        WxMaService appService = wxUtils.getMiniApp(taMiniapp.getMiniappId());
+        if (null == appService || (null != orign && !taMiniapp.getSecret().equals(orign.getSecret()))) {
+            wxUtils.newService(taMiniapp);
+        }
+
         return taMiniapp;
     }
 }

src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

@@ -241,18 +241,18 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         result.put("name", user.getUserName());
         result.put("company", user.getOrgName());
         result.put("department", user.getDepartment());
-        result.put("picture", person.getPhoto());
+        result.put("picture", user.getPhoto());
         result.put("hotNum", person.getHotNum());
         result.put("likeNum", person.getLikeNum());
         result.put("pvNum", person.getPvNum());
         result.put("post", person.getPost());
-        result.put("phone", person.getTel());
+        result.put("phone", user.getPhone());
         result.put("avatar",user.getAvatar());
         result.put("visitors", visitors);
         result.put("liked", false);
         result.put("unReadNum", 0);
         result.put("projects", buildings);
-        result.put("address", person.getAddress());
+        result.put("address", user.getAddress());
         result.put("personTags",person.getPersonTags());
         result.put("posters",taPosterService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));
         result.put("shareContent",taShareContentService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));