agent type, new column for user ,personBuilding

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -84,9 +84,29 @@ public class TaUser implements Serializable {
     /**
      * 公司名称
      */
-    @TableField(exist = false)
     private String orgName;
 
+    /**
+     * 部门
+     */
+    private String department;
+
+    /**
+     * 职位
+     */
+    private String position;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 身份证号
+     */
+    private String idNo;
+
+
     /**
      * 公司水印
      */

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

@@ -8,11 +8,15 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaChannel;
+import com.huiju.estateagents.entity.TaChannelPerson;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
+import com.huiju.estateagents.service.TaChannelPersonService;
+import com.huiju.estateagents.service.TaChannelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.bind.annotation.*;
@@ -21,6 +25,7 @@ import com.huiju.estateagents.base.BaseController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -44,6 +49,12 @@ public class TaRecommendCustomerController extends BaseController {
     @Resource
     private ApplicationContext applicationContext;
 
+    @Autowired
+    private TaChannelService taChannelService;
+
+    @Autowired
+    private TaChannelPersonService taChannelPersonService;
+
     /**
      * 我的客户列表
      * @param pageNumber
@@ -132,9 +143,61 @@ public class TaRecommendCustomerController extends BaseController {
     }
 
     @GetMapping("/wx/customer/myReport")
-    public ResponseBean getCustomerIReport (@RequestParam(value ="personId") String personId,
+    public ResponseBean getCustomerIReport (HttpServletRequest request,
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        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);
+        try{
+            IPage<TaRecommendCustomer>pg = new Page<>(pageNumber,pageSize);
+            QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("realty_consultant",person.getPersonId());
+            queryWrapper.eq("report_recommend_status",CommConstant.REPORTED);
+            queryWrapper.eq("status",CommConstant.CUSTOMER_REPORT);
+            queryWrapper.orderByDesc("create_date");
+            IPage<TaRecommendCustomer>result = taRecommendCustomerService.page(pg,queryWrapper);
+            return ResponseBean.success(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    @GetMapping("/wx/customer/myCustomer")
+    public ResponseBean getMyCustomer (     @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer 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);
+
+        try{
+            IPage<TaRecommendCustomer>pg = new Page<>(pageNumber,pageSize);
+            QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("realty_consultant",person.getPersonId());
+            queryWrapper.eq("report_recommend_status",CommConstant.REPORTED);
+            queryWrapper.gt("status",CommConstant.CUSTOMER_REPORT);
+            queryWrapper.orderByDesc("create_date");
+            IPage<TaRecommendCustomer>result = taRecommendCustomerService.page(pg,queryWrapper);
+            return ResponseBean.success(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+
+    @GetMapping("/wx/customer/myInviteAgent")
+    public ResponseBean getMyInviteAgent (@RequestParam(value ="personId") String personId,
+                                       @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         try{
             IPage<TaRecommendCustomer>pg = new Page<>(pageNumber,pageSize);
             QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
@@ -149,6 +212,7 @@ public class TaRecommendCustomerController extends BaseController {
         }
     }
 
+
     // 客户列表 公客/私客
     @GetMapping("/admin/customer/recommend")
     public ResponseBean getCustomerList (@RequestParam(value ="name",required = false) String name,
@@ -237,16 +301,88 @@ public class TaRecommendCustomerController extends BaseController {
 
 
     @GetMapping("/admin/customer/recommend/{customerId}")
-    public ResponseBean getCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize, @PathVariable String customerId){
-        String buildingId="";
+    public ResponseBean getCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize, @PathVariable String customerId,HttpServletRequest request){
+        Integer orgId = getOrgId(request);
+        try{
+            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,customerId,orgId));
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    @GetMapping("/wx/customer/recommend/{customerId}")
+    public ResponseBean getWxCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize,HttpServletRequest request){
+        Integer orgId =getOrgId(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);
         try{
-            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,customerId,buildingId));
+            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,person.getPersonId(),orgId));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
+    /**
+     * 修改对象
+     * @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){
+        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);
+        try {
+            if(CommConstant.PERSON_ESTATE_CHANNEL.equals(personType)){
+                QueryWrapper<TaChannel>channelQueryWrapper = new QueryWrapper<>();
+                channelQueryWrapper.eq("channel_code",channelCode);
+                QueryWrapper<TaChannelPerson>channelPersonQueryWrapper = new QueryWrapper<>();
+                TaChannel channel = taChannelService.getOne(channelQueryWrapper);
+                channelPersonQueryWrapper.eq("person_id",person.getPersonId());
+                channelPersonQueryWrapper.eq("channel_id",channel.getChannelId());
+                Integer count = taChannelPersonService.count(channelPersonQueryWrapper);
+                if(count >0){
+                    return ResponseBean.error("您已绑定过渠道",ResponseBean.ERROR_UNAVAILABLE);
+                }
+                TaChannelPerson channelPerson = new TaChannelPerson();
+                channelPerson.setCreateDate(LocalDateTime.now());
+                channelPerson.setPersonId(person.getPersonId());
+                channelPerson.setChannelId(channel.getChannelId());
+                taChannelPersonService.save(channelPerson);
+            }else {
+                QueryWrapper<TaChannelPerson>channelPersonQueryWrapper = new QueryWrapper<>();
+                channelPersonQueryWrapper.eq("person_id",person.getPersonId());
+                List<TaChannelPerson> taChannelPerson = taChannelPersonService.list(channelPersonQueryWrapper);
+                if (taChannelPerson.size()>0){
+                    for(int i=0;i<taChannelPerson.size();i++){
+                        taChannelPerson.get(i).setStatus(CommConstant.STATUS_DELETE);
+                    }
+                    taChannelPersonService.updateBatchById(taChannelPerson);
+                }
+            }
+            person.setPersonType(personType);
+            if (taPersonService.updateById(person)){
+                responseBean.addSuccess(person);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
         /**
      * 修改对象
      * @param taRecommendCustomer 实体对象

src/main/java/com/huiju/estateagents/entity/TaChannelPerson.java

@@ -38,5 +38,7 @@ public class TaChannelPerson implements Serializable {
      */
     private LocalDateTime createDate;
 
+    private Integer status;
+
 
 }

src/main/java/com/huiju/estateagents/entity/TaPersonBuilding.java

@@ -41,5 +41,10 @@ public class TaPersonBuilding implements Serializable {
      */
     private LocalDateTime createDate;
 
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+
 
 }

src/main/java/com/huiju/estateagents/service/ITaRecommendCustomerService.java

@@ -41,7 +41,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     TaRecommendCustomer getCustomerById(String customerId);
 
-    IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,String building);
+    IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,Integer orgId);
 
     TaRecommendCustomer newByPerson(TaPerson person);
 }

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

@@ -389,7 +389,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,String building){
+    public IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,Integer orgId){
         QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
         // todo
         // 此处可能不是 person_id 而是 recommend_person