Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

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

 import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.common.SMSUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.service.ITaPersonService;
     TaChannelPersonService taChannelPersonService;
     @Autowired
     ITaUserService taUserService;
+    @Autowired
+    SMSUtils smsUtils;
 
     /**
      *
     }
 
     @PutMapping("/wx/registerConsultant")
-    public ResponseBean registerConsultant(HttpServletRequest request,@RequestParam String phone) {
-        Integer orgId =getOrgId(request);
+    public ResponseBean registerConsultant(HttpServletRequest request,@RequestParam String phone,@RequestParam String code) {
         ResponseBean responseBean = new ResponseBean();
+        if(smsUtils.checkCaptcha(phone,code)){
+            responseBean.addError("验证码错误。");
+        }
+        Integer orgId =getOrgId(request);
         String openid = JWTUtils.getSubject(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {

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

             queryWrapper.orderByDesc("create_date");
 
             IPage<TaPointsRecords> result = iTaPointsRecordsService.page(pg, queryWrapper);
+            for(int i = 0;i<result.getRecords().size();i++){
+                switch (result.getRecords().get(i).getChangeType()){
+                    case CommConstant.POINTS_CHANGE_GOODS:
+                        result.getRecords().get(i).setRecordName("兑换商品");
+                        break;
+                    case CommConstant.POINTS_CHANGE_SHARE_POSTER:
+                        result.getRecords().get(i).setRecordName("分享海报");
+                        break;
+                    case CommConstant.POINTS_CHANGE_CHECKIN:
+                        result.getRecords().get(i).setRecordName("签到");
+                        break;
+                    case CommConstant.POINTS_CHANGE_RECOMMEND_CUSTOMER:
+                        result.getRecords().get(i).setRecordName("推荐客户");
+                        break;
+                    case CommConstant.POINTS_CHANGE_SIGNUP_AGENT:
+                        result.getRecords().get(i).setRecordName("注册经纪人");
+                        break;
+                }
+            }
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

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

             queryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
             Integer orgId = getOrgId(request);
             queryWrapper.eq("org_id",orgId);
-            if (CommConstant.POINTS_RULE_PLATFORM.equals(type)) {
-                queryWrapper.isNull("building_id");
-            } else if (CommConstant.POINTS_RULE_PROJECT.equals(type)) {
-                queryWrapper.isNotNull("building_id");
+            if(null != type){
+                if (CommConstant.POINTS_RULE_PLATFORM.equals(type)) {
+                    queryWrapper.isNull("building_id");
+                } else if (CommConstant.POINTS_RULE_PROJECT.equals(type)) {
+                    queryWrapper.isNotNull("building_id");
+                }
             }
-
             IPage<TdPointsRules> result = iTdPointsRulesService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
         }catch (Exception e){

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

     @TableField(exist = false)
     private Integer totalPoints;
 
+    @TableField(exist = false)
+    private String recordName;
+
 
 }

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

 public interface TaPointsRecordsMapper extends BaseMapper<TaPointsRecords> {
     IPage<TaPointsRecords> getCustomerPointsList(IPage<TaPointsRecords> page, @Param("personId") String personId);
 
+
+
 }

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

 package com.huiju.estateagents.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.*;
 
 
 	void consumeGoodsPoints(TaGoods taGoods);
 
+	IPage<TaPointsRecords> getWxRecords(Integer pageNum,Integer pageSize,String personId);
+
 	/**
 	 * 分享积分增加  人员不限制
 	 * @param recommenderId

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

 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
 		}
 	}
 
+	@Override
+	public IPage<TaPointsRecords> getWxRecords(Integer pageNum, Integer pageSize,String personId){
+		IPage<TaPointsRecords> pg = new Page<>(pageNum, pageSize);
+		return taPointsRecordsMapper.getCustomerPointsList(pg,personId);
+	}
+
 	@Override
 	public void consumeGoodsPoints(TaGoods taGoods) {
 		Integer minusPoints = taGoods.getPointPrice();
 			taPersonMapper.update(new TaPerson(), taPersonwrapper);
 		}
 	}
+
+
 }

src/main/resources/mapper/TaPointsRecordsMapper.xml

 <?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.TaPointsRecordsMapper">
+    <select id="getCustomerPointsList" resultType="com.huiju.estateagents.entity.TaPointsRecords">
+
+    </select>
 
 </mapper>