personFrom

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

@@ -0,0 +1,144 @@
+package com.huiju.estateagents.controller;
+
+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.entity.TdPersonFrom;
+import com.huiju.estateagents.service.ITdPersonFromService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import com.huiju.estateagents.base.BaseController;
+
+/**
+ * <p>
+    * 用户来源字典  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-08-08
+ */
+@RestController
+@RequestMapping("/")
+public class TdPersonFromController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TdPersonFromController.class);
+
+    @Autowired
+    public ITdPersonFromService iTdPersonFromService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/tdPersonFrom",method= RequestMethod.GET)
+    public ResponseBean tdPersonFromList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TdPersonFrom> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TdPersonFrom> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TdPersonFrom> result = iTdPersonFromService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            logger.error("tdPersonFromList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param tdPersonFrom 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tdPersonFrom",method= RequestMethod.POST)
+    public ResponseBean tdPersonFromAdd(@RequestBody TdPersonFrom tdPersonFrom){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTdPersonFromService.save(tdPersonFrom)){
+                responseBean.addSuccess(tdPersonFrom);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tdPersonFromAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/tdPersonFrom/{id}", method= RequestMethod.DELETE)
+    public ResponseBean tdPersonFromDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTdPersonFromService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tdPersonFromDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param tdPersonFrom 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tdPersonFrom/{id}",method= RequestMethod.PUT)
+    public ResponseBean tdPersonFromUpdate(@PathVariable Integer id,
+                                        @RequestBody TdPersonFrom tdPersonFrom){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTdPersonFromService.updateById(tdPersonFrom)){
+                responseBean.addSuccess(tdPersonFrom);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tdPersonFromUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/tdPersonFrom/{id}",method= RequestMethod.GET)
+    public ResponseBean tdPersonFromGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTdPersonFromService.getById(id));
+        }catch (Exception e){
+            logger.error("tdPersonFromDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -221,4 +221,10 @@ public class TaPerson implements Serializable {
     private String language;
 
     private Integer saveNum;
+
+    private String recommendPerson;
+
+    private String recommendPersonType;
+
+    private String fromCode;
 }

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

@@ -110,7 +110,7 @@ public class TaRecommendCustomer implements Serializable {
     /**
      * 推荐人
      */
-    private String personId;
+    private String recommendPerson;
 
     /**
      * 服务顾问

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

@@ -0,0 +1,53 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 用户来源字典 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TdPersonFrom implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 来源ID
+     */
+    @TableId(value = "from_id", type = IdType.AUTO)
+    private Integer fromId;
+
+    /**
+     * 来源编码
+     */
+    private String fromCode;
+
+    /**
+     * 来源名称
+     */
+    private String fromName;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com/huiju/estateagents/mapper/TdPersonFromMapper.java

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TdPersonFrom;
+
+/**
+ * <p>
+ * 用户来源字典  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-08
+ */
+public interface TdPersonFromMapper extends BaseMapper<TdPersonFrom> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TdPersonFrom;
+
+/**
+ * <p>
+ * 用户来源字典  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-08
+ */
+public interface ITdPersonFromService extends IService<TdPersonFrom> {
+
+}

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

@@ -175,18 +175,18 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 		// 已经领取过的不会再次领取
 		List<String> params = new ArrayList<String>() {{
 			// 推荐人
-			add("person="+taRecommendCustomer.getPersonId());
+			add("person="+taRecommendCustomer.getRecommendPerson());
 			// 推荐客户手机
 			add("phone="+taRecommendCustomer.getPhone());
 		}};
 		String changeParams = String.join("&", params);
-		boolean hasJoined = isPointsRecordsExist(taRecommendCustomer.getPersonId(), changeType, changeParams);
+		boolean hasJoined = isPointsRecordsExist(taRecommendCustomer.getRecommendPerson(), changeType, changeParams);
 		if (hasJoined) {
 			return;
 		}
 
 		// 发放积分
-		TaPerson taPerson = taPersonMapper.getById(taRecommendCustomer.getPersonId());
+		TaPerson taPerson = taPersonMapper.getById(taRecommendCustomer.getRecommendPerson());
 		if (savePoints(taPerson, changeType, changeParams, pointsAmount)) {
 			taPersonMapper.setFieldIncrement(taPerson.getPersonId(), "points", pointsAmount);
 		}

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

@@ -184,7 +184,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         String status = params.getString("status");
         if (null == status) status = "1";
         taRecommendCustomer.setStatus(status);
-        taRecommendCustomer.setPersonId(taPerson.getPersonId());
+        taRecommendCustomer.setRecommendPerson(taPerson.getPersonId());
 
         // 报备有 10 天有效期
         QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TdPersonFrom;
+import com.huiju.estateagents.mapper.TdPersonFromMapper;
+import com.huiju.estateagents.service.ITdPersonFromService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户来源字典  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-08
+ */
+@Service
+public class TdPersonFromServiceImpl extends ServiceImpl<TdPersonFromMapper, TdPersonFrom> implements ITdPersonFromService {
+
+}

src/main/resources/mapper/TdPersonFromMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.TdPersonFromMapper">
+
+</mapper>