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

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

@@ -13,9 +13,11 @@ import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
 import com.huiju.estateagents.center.taUser.entity.TaTagUser;
 import com.huiju.estateagents.center.taUser.entity.TaTags;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
 import com.huiju.estateagents.center.taUser.service.ITaTagUserService;
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
+import com.huiju.estateagents.center.taUser.service.ITaUserRoleService;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
@@ -76,6 +78,9 @@ public class TaUserController extends BaseController {
     
     @Autowired
     private ITaPersonBuildingService taPersonBuildingService;
+    
+    @Autowired
+    private ITaUserRoleService taUserRoleService;
 
     /**
      * 分页查询列表
@@ -357,6 +362,15 @@ public class TaUserController extends BaseController {
                 tags.add(e.getTagId());
             });
             taUser.setTaTags(tags);
+            //获取角色信息
+            QueryWrapper<TaUserRole> taUserRoleQueryWrapper = new QueryWrapper<>();
+            taUserRoleQueryWrapper.eq("user_id",id);
+            List<TaUserRole> taUserRoleList = taUserRoleService.list(taUserRoleQueryWrapper);
+            List<Integer> ids = new ArrayList<>();
+            taUserRoleList.forEach(e -> {
+                ids.add(e.getRoleId());
+            });
+            taUser.setRoleIds(ids);
             taUser.setLoginPassword("");
             QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
             taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());

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

@@ -153,6 +153,9 @@ public class TaUser implements Serializable {
     @TableField(exist = false)
     private List<Integer> taTags = new ArrayList<Integer>();
     
+    @TableField(exist = false)
+    private List<Integer> roleIds = new ArrayList<Integer>();
+    
     @TableField(exist = false)
     private String buildingId;
 }

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

@@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.center.taUser.entity.TaTagUser;
 import com.huiju.estateagents.center.taUser.entity.TaTags;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
 import com.huiju.estateagents.center.taUser.mapper.TaTagUserMapper;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.center.taUser.mapper.TaUserRoleMapper;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.MD5Utils;
@@ -62,6 +64,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 	@Autowired
 	private TaPersonMapper taPersonMapper;
 	
+	@Autowired
+	private TaUserRoleMapper taUserRoleMapper;
+	
 	@Override
 	public IPage<Map<String,Object>> getPageList(IPage pg) {
 		List<Map<String,Object>> taUserList = taUserMapper.getPageList(pg);
@@ -229,6 +234,15 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			taTagUserMapper.insert(taTagUser);
 		});
 		
+		//保存用户角色
+		List<Integer> roleIds = taUser.getRoleIds();
+		roleIds.forEach(e -> {
+			TaUserRole taUserRole = new TaUserRole();
+			taUserRole.setUserId(taUser.getUserId());
+			taUserRole.setRoleId(e);
+			taUserRoleMapper.insert(taUserRole);
+		});
+		
 		//保存项目
 		TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
 		taPersonBuilding.setBuildingId(taUser.getBuildingId());
@@ -274,6 +288,18 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			taTagUserMapper.insert(taTagUser);
 		});
 		
+		QueryWrapper<TaUserRole> taUserRoleQueryWrapper = new QueryWrapper<>();
+		taUserRoleQueryWrapper.eq("user_id",taUser.getUserId());
+		taUserRoleMapper.delete(taUserRoleQueryWrapper);
+		//保存用户角色
+		List<Integer> roleIds = taUser.getRoleIds();
+		roleIds.forEach(e -> {
+			TaUserRole taUserRole = new TaUserRole();
+			taUserRole.setUserId(taUser.getUserId());
+			taUserRole.setRoleId(e);
+			taUserRoleMapper.insert(taUserRole);
+		});
+		
 		QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
 		taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());
 		taPersonBuildingMapper.delete(taPersonBuildingQueryWrapper);

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

@@ -10,6 +10,7 @@ import com.huiju.estateagents.center.taUser.entity.TaUser;
 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;
@@ -49,6 +50,8 @@ public class TaPersonController extends BaseController {
     TaChannelPersonService taChannelPersonService;
     @Autowired
     ITaUserService taUserService;
+    @Autowired
+    SMSUtils smsUtils;
 
     /**
      *
@@ -91,9 +94,12 @@ public class TaPersonController extends BaseController {
     }
 
     @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

@@ -105,6 +105,25 @@ public class TaPointsRecordsController extends BaseController {
             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

@@ -99,12 +99,13 @@ public class TdPointsRulesController extends BaseController {
             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

@@ -84,5 +84,8 @@ public class TaPointsRecords implements Serializable {
     @TableField(exist = false)
     private Integer totalPoints;
 
+    @TableField(exist = false)
+    private String recordName;
+
 
 }

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

@@ -18,4 +18,6 @@ import org.apache.ibatis.annotations.Param;
 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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.*;
 
@@ -23,6 +24,8 @@ public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
 
 	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

@@ -3,6 +3,8 @@ package com.huiju.estateagents.service.impl;
 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;
@@ -214,6 +216,12 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 		}
 	}
 
+	@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();
@@ -301,4 +309,6 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 			taPersonMapper.update(new TaPerson(), taPersonwrapper);
 		}
 	}
+
+
 }

src/main/resources/mapper/TaPointsRecordsMapper.xml

@@ -1,5 +1,8 @@
 <?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>

src/main/resources/mapper/TaUserAuthButtonMapper.xml

@@ -18,7 +18,7 @@
         where
             t.btn_id in (
                 SELECT
-                a.role_id
+                a.btn_id
                 from
                 ta_role_button a
                 where