合并

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

@@ -154,4 +154,19 @@ public class CommConstant {
 
     //=================  首屏广告 / 轮播图 end =======================
 
+    //=================  客户入口类型 start =======================
+    /*
+    * 自主进入
+    * */
+    public static final String ENTRY_VOLUNTEER = "volunteer";
+    /*
+    添加
+    */
+    public static final String ENTRY_INPUT = "input";
+    /*
+    * 报备
+    * */
+    public static final String ENTRY_VERIFY = "verify";
+    //=================  客户入口类型 end =======================
+
 }

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

@@ -42,7 +42,7 @@ public class ExtendContentController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/extendContent",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/extendContent",method= RequestMethod.GET)
     public ResponseBean extendContentList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
@@ -72,7 +72,7 @@ public class ExtendContentController extends BaseController {
      * @param extendContent 实体对象
      * @return
      */
-    @RequestMapping(value="/extendContent",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/extendContent",method= RequestMethod.POST)
     public ResponseBean extendContentAdd(@RequestBody ExtendContent extendContent){
         ResponseBean  responseBean= iExtendContentService.extendContentAdd(extendContent);
           responseBean.addSuccess(extendContent);
@@ -84,7 +84,7 @@ public class ExtendContentController extends BaseController {
      * @param id  实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/extendContent/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/extendContent/{id}", method= RequestMethod.DELETE)
     public ResponseBean extendContentDelete(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -107,7 +107,7 @@ public class ExtendContentController extends BaseController {
      * @param extendContent 实体对象
      * @return
      */
-    @RequestMapping(value="/extendContent/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/extendContent/{id}",method= RequestMethod.PUT)
     public ResponseBean extendContentUpdate(@PathVariable Integer id,
                                         @RequestBody ExtendContent extendContent){
         ResponseBean responseBean = new ResponseBean();
@@ -129,7 +129,7 @@ public class ExtendContentController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/extendContent/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/extendContent/{id}",method= RequestMethod.GET)
     public ResponseBean extendContentGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {

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

@@ -152,15 +152,23 @@ public class TaPointsExchangeController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
-     * @param taPointsExchange 实体对象
+     * @param recId  实体ID
      * @return
      */
-    @RequestMapping(value="/taPointsExchange/{id}",method= RequestMethod.PUT)
-    public ResponseBean taPointsExchangeUpdate(@PathVariable Integer id,
-                                        @RequestBody TaPointsExchange taPointsExchange){
+    @RequestMapping(value="/admin/taPointsExchange/{recId}",method= RequestMethod.PUT)
+    public ResponseBean taPointsExchangeUpdate(@PathVariable Integer recId){
         ResponseBean responseBean = new ResponseBean();
         try {
+            TaPointsExchange taPointsExchange = iTaPointsExchangeService.getById(recId);
+            if (null == taPointsExchange){
+                responseBean.addError("找不到需要核销的商品");
+                return responseBean;
+            }
+            if (taPointsExchange.getStatus().equals(CommConstant.STATUS_NORMAL)){
+                responseBean.addError("此商品已经被领取");
+                return responseBean;
+            }
+            taPointsExchange.setStatus(CommConstant.STATUS_NORMAL);
             if (iTaPointsExchangeService.updateById(taPointsExchange)){
                 responseBean.addSuccess(taPointsExchange);
             }else {

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

@@ -11,6 +11,7 @@ import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPointsRecords;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaPointsRecordsService;
+import org.apache.ibatis.annotations.Mapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +24,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -126,6 +129,7 @@ public class TaPointsRecordsController extends BaseController {
     public ResponseBean taPointsRecordsUpdate(@PathVariable Integer id,
                                         @RequestBody TaPointsRecords taPointsRecords){
         ResponseBean responseBean = new ResponseBean();
+        taPointsRecords.setPointsRecordId(id);
         try {
             if (iTaPointsRecordsService.updateById(taPointsRecords)){
                 responseBean.addSuccess(taPointsRecords);
@@ -185,4 +189,37 @@ public class TaPointsRecordsController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taPointsRecords/{id}",method= RequestMethod.GET)
+    public ResponseBean CustomerPointsRecordsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            @PathVariable(value = "id") String id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            IPage<TaPointsRecords> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaPointsRecords> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("person_id",taPersonService.getPersonIdByCustomerId(id));
+            queryWrapper.orderByDesc("create_date");
+            IPage<TaPointsRecords> result = iTaPointsRecordsService.page(pg, queryWrapper);
+            Integer totalPoints = 0;
+            for (int i = 0;i<result.getRecords().size();i++){
+                totalPoints += result.getRecords().get(i).getPointsAmount();
+            }
+            Map<String,Object> data = new HashMap<>();
+            data.put("totalPoints",totalPoints);
+            data.put("result",result);
+            responseBean.addSuccess(data);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsRecordsList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -112,9 +112,11 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value ="consultName",required = false) String consultName,
                                          @RequestParam(value ="consultTel",required = false) String consultTel,
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value ="entryType",required = false) String entryType,
+                                         @RequestParam(value ="verifyStatus",required = false) String verifyStatus){
         try{
-            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel));
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/huiju/estateagents/controller/TdBuildingTypeController.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.TdBuildingType;
+import com.huiju.estateagents.service.ITdBuildingTypeService;
+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-07-29
+ */
+@RestController
+@RequestMapping("/")
+public class TdBuildingTypeController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TdBuildingTypeController.class);
+
+    @Autowired
+    public ITdBuildingTypeService iTdBuildingTypeService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/tdBuildingType",method= RequestMethod.GET)
+    public ResponseBean tdBuildingTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TdBuildingType> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TdBuildingType> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TdBuildingType> result = iTdBuildingTypeService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            logger.error("tdBuildingTypeList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param tdBuildingType 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tdBuildingType",method= RequestMethod.POST)
+    public ResponseBean tdBuildingTypeAdd(@RequestBody TdBuildingType tdBuildingType){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTdBuildingTypeService.save(tdBuildingType)){
+                responseBean.addSuccess(tdBuildingType);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tdBuildingTypeAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/tdBuildingType/{id}", method= RequestMethod.DELETE)
+    public ResponseBean tdBuildingTypeDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTdBuildingTypeService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tdBuildingTypeDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param tdBuildingType 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tdBuildingType/{id}",method= RequestMethod.PUT)
+    public ResponseBean tdBuildingTypeUpdate(@PathVariable Integer id,
+                                        @RequestBody TdBuildingType tdBuildingType){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTdBuildingTypeService.updateById(tdBuildingType)){
+                responseBean.addSuccess(tdBuildingType);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tdBuildingTypeUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/tdBuildingType/{id}",method= RequestMethod.GET)
+    public ResponseBean tdBuildingTypeGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTdBuildingTypeService.getById(id));
+        }catch (Exception e){
+            logger.error("tdBuildingTypeDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -80,5 +81,8 @@ public class TaPointsRecords implements Serializable {
      */
     private Integer status;
 
+    @TableField(exist = false)
+    private Integer totalPoints;
+
 
 }

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

@@ -139,6 +139,8 @@ public class TaRecommendCustomer implements Serializable {
 
     private String city;
 
+    private String entryType;
+
     @TableField(exist = false)
     private List<TaPersonVisitRecord> visitRecords;
 

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

@@ -0,0 +1,58 @@
+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-07-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TdBuildingType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目类型id
+     */
+    @TableId(value = "building_type_id", type = IdType.AUTO)
+    private Integer buildingTypeId;
+
+    /**
+     * 项目类型名称
+     */
+    private String buildingTypeName;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+
+}

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

@@ -1,8 +1,10 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaPointsRecords;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -14,5 +16,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TaPointsRecordsMapper extends BaseMapper<TaPointsRecords> {
+    IPage<TaPointsRecords> getCustomerPointsList(IPage<TaPointsRecords> page, @Param("personId") String personId);
 
 }

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

@@ -25,7 +25,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     TaRecommendCustomer getCustomerById(@Param("customerId")String customerId);
 
-    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel);
+    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus);
 
 
 }

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

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TdBuildingType;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 项目类型字典表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-29
+ */
+@Mapper
+public interface TdBuildingTypeMapper extends BaseMapper<TdBuildingType> {
+
+}

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

@@ -54,5 +54,7 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building);
 
+    String getPersonIdByCustomerId(String customerId);
+
 
 }

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

@@ -25,7 +25,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
 
-    IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel);
+    IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus);
 
     TaRecommendCustomer getCustomerDetail(String customerId);
 

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

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TdBuildingType;
+
+/**
+ * <p>
+ * 项目类型字典表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-29
+ */
+public interface ITdBuildingTypeService extends IService<TdBuildingType> {
+
+}

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

@@ -634,4 +634,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
         return taPersonMapper.selectPage(page,queryWrapper);
     }
+
+    @Override
+    public String getPersonIdByCustomerId(String customerId){
+        return taRecommendCustomerMapper.getCustomerPersonId(customerId);
+    }
 }

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

@@ -246,9 +246,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel){
+    public IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus){
         IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.getCustomerList(page,building,name,tel,consultName,consultTel);
+        return taRecommendCustomerMapper.getCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus);
     }
 
     @Override

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

@@ -0,0 +1,21 @@
+package com.huiju.estateagents.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TdBuildingType;
+import com.huiju.estateagents.mapper.TdBuildingTypeMapper;
+import com.huiju.estateagents.service.ITdBuildingTypeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 项目类型字典表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-29
+ */
+@Service
+public class TdBuildingTypeServiceImpl extends ServiceImpl<TdBuildingTypeMapper, TdBuildingType> implements ITdBuildingTypeService {
+
+}

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -56,6 +56,13 @@ FROM
         <if test="consultTel != null and consultTel !=''">
             and b.tel = #{consultTel}
         </if>
+        <if test="entryType != null and entryType !=''">
+            and a.entry_type = #{entryType}
+        </if>
+        <if test="verifyStatus != null and verifyStatus !=''">
+            and a.verify_status = #{verifyStatus}
+        </if>
+
     </where>
     </select>
     <select id="getCustomerById" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">

src/main/resources/mapper/TdBuildingTypeMapper.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.TdBuildingTypeMapper">
+
+</mapper>