合并

src/main/java/com/huiju/estateagents/center/sysUser/controller/SysUserController.java

@@ -197,7 +197,7 @@ public class SysUserController extends BaseController {
         String token = JWTUtils.newToken(sysUser.getUserName());
     
         //保存token
-        saveToken(token);
+        sysTokenService.saveToken(token);
         
         Map<String, Object> result = new HashMap<>();
         result.put("token", token);
@@ -214,11 +214,4 @@ public class SysUserController extends BaseController {
         sysTokenService.remove(sysTokenQueryWrapper);
         return ResponseBean.success("成功退出");
     }
-    
-    private void saveToken(String token) {
-        SysToken sysToken = new SysToken();
-        sysToken.setToken(token);
-        sysToken.setExpDate(LocalDateTime.now());
-        sysTokenService.save(sysToken);
-    }
 }

src/main/java/com/huiju/estateagents/center/sysUser/service/ISysTokenService.java

@@ -12,5 +12,6 @@ import com.huiju.estateagents.center.sysUser.entity.SysToken;
  * @since 2019-09-11
  */
 public interface ISysTokenService extends IService<SysToken> {
-
+	
+	SysToken saveToken(String token);
 }

src/main/java/com/huiju/estateagents/center/sysUser/service/impl/SysTokenServiceImpl.java

@@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.center.sysUser.entity.SysToken;
 import com.huiju.estateagents.center.sysUser.mapper.SysTokenMapper;
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 令牌表  服务实现类
@@ -17,5 +20,16 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SysTokenServiceImpl extends ServiceImpl<SysTokenMapper, SysToken> implements ISysTokenService {
-
+	
+	@Autowired
+	private SysTokenMapper sysTokenMapper;
+	
+	@Override
+	public SysToken saveToken(String token) {
+		SysToken sysToken = new SysToken();
+		sysToken.setToken(token);
+		sysToken.setExpDate(LocalDateTime.now().plusDays(7));
+		sysTokenMapper.insert(sysToken);
+		return sysToken;
+	}
 }

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;
 
     /**
      * 分页查询列表
@@ -282,7 +287,7 @@ public class TaUserController extends BaseController {
         String token = JWTUtils.newTokenByMap(map);
     
         //保存token
-        saveToken(token);
+        sysTokenService.saveToken(token);
     
         Map<String, Object> result = new HashMap<>();
         result.put("token", token);
@@ -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());
@@ -414,11 +428,4 @@ public class TaUserController extends BaseController {
         }
         return responseBean;
     }
-    
-    private void saveToken(String token) {
-        SysToken sysToken = new SysToken();
-        sysToken.setToken(token);
-        sysToken.setExpDate(LocalDateTime.now());
-        sysTokenService.save(sysToken);
-    }
 }

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/TaUserAuthMenuServiceImpl.java

@@ -88,7 +88,7 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
         }
         try {
             //授权菜单，先删除在新增
-            taUserAuthMenuMapper.deleteUserAuthMenu(roleId);
+            taRoleMenuMapper.deleteCurrentMenu(roleId);
             for (SysMenu sysMenu: sysMenuList) {
                 TaRoleMenu taRoleMenu = new TaRoleMenu();
                 taRoleMenu.setRoleId(roleId);
@@ -126,6 +126,7 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
             TaRole taRole = new TaRole();
             taRole.setRoleName(name);
             taRole.setOrgId(orgId);
+            taRole.setStatus(1);
             taRole.setCreateDate(LocalDateTime.now());
             taRoleMapper.insert(taRole);
 

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;
@@ -15,11 +17,13 @@ import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaMiniappTemplate;
 import com.huiju.estateagents.entity.TaOrg;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.mapper.TaMiniappMapper;
 import com.huiju.estateagents.mapper.TaMiniappTemplateMapper;
 import com.huiju.estateagents.mapper.TaOrgMapper;
 import com.huiju.estateagents.mapper.TaPersonBuildingMapper;
+import com.huiju.estateagents.mapper.TaPersonMapper;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -57,6 +61,12 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 	@Autowired
 	private TaPersonBuildingMapper taPersonBuildingMapper;
 	
+	@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);
@@ -224,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());
@@ -269,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);
@@ -279,6 +310,21 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		taPersonBuilding.setCreateDate(LocalDateTime.now());
 		taPersonBuildingMapper.insert(taPersonBuilding);
 		
+		//更新person
+		TaPerson taPerson = new TaPerson();
+		taPerson.setAvatarurl(taUser.getAvatar());
+		taPerson.setCompany(taUser.getOrgName());
+		taPerson.setTel(taUser.getPhone());
+		taPerson.setName(taUser.getUserName());
+		taPerson.setAddress(taUser.getAddress());
+		taPerson.setIdNo(taUser.getIdNo());
+		taPerson.setDepartment(taUser.getDepartment());
+		taPerson.setPost(taUser.getPosition());
+		taPerson.setPhoto(taUser.getPhoto());
+		QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+		taPersonQueryWrapper.eq("user_id",taUser.getUserId());
+		taPersonMapper.update(taPerson,taPersonQueryWrapper);
+		
 		return taUser;
 	}
 }

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

@@ -0,0 +1,134 @@
+package com.huiju.estateagents.common;
+
+import com.huiju.estateagents.config.SMSProperties;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.*;
+import org.springframework.web.client.RestTemplate;
+
+import java.time.LocalDateTime;
+import java.util.*;
+
+@Slf4j
+@Configuration
+@EnableConfigurationProperties(SMSProperties.class)
+public class SMSUtils {
+    // 短信服务配置
+    SMSProperties smsProperties;
+
+    Map<String, Phone> allPhones;
+
+    @Autowired
+    public SMSUtils(SMSProperties properties) {
+        smsProperties = properties;
+        allPhones = new HashMap<>();
+    }
+
+    /**
+     * 发送验证码到 tel
+     * @param tel
+     * @return
+     */
+    public boolean sendCaptcha(String tel) {
+        Phone phone = allPhones.get(tel);
+        if (null == phone) {
+            phone = new Phone();
+            phone.setTel(tel);
+        }
+
+        phone.setCaptcha(genCaptcha(smsProperties.getCaptcha().getSize()));
+        phone.setExpire(LocalDateTime.now().plusSeconds(smsProperties.getCaptcha().getExpire()));
+        allPhones.put(tel, phone);
+
+        log.info("发送手机 {} 验证码 {}", tel, phone.getCaptcha());
+
+        String[] params = { phone.getCaptcha(), smsProperties.getCaptcha().getSign() };
+        return sendMessage(smsProperties.getCaptcha().getCode(), tel, params);
+    }
+
+    /**
+     * 校验验证码
+     * @param tel
+     * @param smsCaptcha
+     * @return
+     */
+    public boolean checkCaptcha(String tel, String smsCaptcha) {
+        Phone phone = allPhones.get(tel);
+        if (null == phone) {
+            log.error("手机号 {} 的验证码未找到", tel);
+            return false;
+        }
+
+        if (null == smsCaptcha || !smsCaptcha.equals(phone.getCaptcha())) {
+            log.error("手机号 {} 校验验证码出错, 正确: {}, 错误: {}", tel, phone.getCaptcha(), smsCaptcha);
+            return false;
+        }
+
+        LocalDateTime now = LocalDateTime.now();
+        if (now.isAfter(phone.getExpire())) {
+            log.error("手机号 {} 的验证码已过期", tel);
+            return false;
+        }
+
+        // 如果验证成功, 则从缓存中删除
+        allPhones.remove(tel);
+        return true;
+    }
+
+    public boolean sendVisitor(String tel, String name) {
+        log.info("发送手机 {} 客户名称 {}", tel, name);
+
+        String[] params = { name };
+        return sendMessage(smsProperties.getVisitor().getCode(), tel, params);
+    }
+
+    private String genCaptcha(int length) {
+        List<String> nums = new ArrayList<>();
+        for (int i = 0; i < length; i ++) {
+            int rand = (new Random()).nextInt(10);
+            nums.add(String.valueOf(rand));
+        }
+        return String.join("", nums);
+    }
+
+    private boolean sendMessage(String code, String tel, String[] params) {
+        // 发送内容
+        SMSProperties.Template message = new SMSProperties.Template();
+        message.setCode(code);
+        message.setTel(tel);
+        message.setParams(params);
+
+        // 构造 request
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.parseMediaType(smsProperties.getContentType()));
+//        String body = JSONObject.toJSONString(message);
+        HttpMethod method = HttpMethod.resolve(smsProperties.getMethod());
+        HttpEntity requestEntity = new HttpEntity(message, headers);
+
+        RestTemplate template = new RestTemplate();
+        HttpEntity<String> response = template.exchange(
+                smsProperties.getUrl(),
+                method,
+                requestEntity,
+                String.class,
+                new Object()
+        );
+
+        if (((ResponseEntity<String>) response).getStatusCodeValue() != HttpStatus.OK.value()) {
+            log.error("请求发送短信验证码失败: {}", response.toString());
+            return false;
+        }
+
+        return true;
+    }
+
+    @Data
+    public static class Phone {
+        String tel;
+        String captcha;
+        LocalDateTime expire;
+    }
+}

src/main/java/com/huiju/estateagents/config/SMSProperties.java

@@ -0,0 +1,35 @@
+package com.huiju.estateagents.config;
+
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@Data
+@ConfigurationProperties(prefix = "sms")
+public class SMSProperties {
+    String url;
+    String method;
+    String contentType;
+    Captcha captcha;
+    Visitor visitor;
+
+    @Data
+    public static class Template {
+        String code;
+        String tel;
+        String[] params;
+    }
+
+    @Data
+    public static class Captcha {
+        String code;
+        Integer expire;
+        Integer size;
+        String sign;
+    }
+
+    @Data
+    public static class Visitor {
+        String code;
+    }
+}

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

@@ -4,8 +4,10 @@ package com.huiju.estateagents.controller;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.AliOSSUtils;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.SMSUtils;
 import com.huiju.estateagents.common.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -18,6 +20,8 @@ import java.util.Map;
 @RestController
 @RequestMapping("/api")
 public class CommonController {
+    @Autowired
+    SMSUtils smsUtils;
 
     /**
      * 图片上传
@@ -60,6 +64,16 @@ public class CommonController {
         return result;
     }
 
+    @PostMapping("{plat}/captcha")
+    public ResponseBean sendCaptcha(@RequestParam String tel) {
+        boolean success = smsUtils.sendCaptcha(tel);
+        if (success) {
+            return ResponseBean.success("发送验证码成功");
+        } else {
+            return ResponseBean.error("验证码发送失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
     @GetMapping("/wx/awesome/dict/{typeFor}")
     public ResponseBean dicts(@PathVariable String typeFor) {
 

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

@@ -7,6 +7,8 @@ import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.WxUtils;
 import com.huiju.estateagents.entity.*;
@@ -46,6 +48,11 @@ public class MiniAppController {
     @Autowired
     private ITaOrgService taOrgService;
 
+    @Autowired
+    private ISysTokenService sysTokenService;
+
+
+
 
 
     /**
@@ -92,7 +99,7 @@ public class MiniAppController {
             personQueryWrapper.eq("org_id",orgId);
             int count = taPersonService.count(personQueryWrapper);
 
-            if(from.contains("share") && StringUtils.isNotBlank(recommender) && count>0){
+            if(null!=from&&from.contains("share") && StringUtils.isNotBlank(recommender) && count>0){
                 // 添加积分
                  applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll));
             }
@@ -131,6 +138,8 @@ public class MiniAppController {
             result.put("extraInfo", extraInfo);
             result.put("miniAuthorized", null != taPerson.getAvatarurl() && taPerson.getAvatarurl().indexOf("wx.qlogo.cn") > 0);
 
+            String token = miniResp.get("token");
+            sysTokenService.saveToken(token);
 
             return ResponseBean.success(result);
         } catch (WxErrorException e) {

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

@@ -1,10 +1,12 @@
 package com.huiju.estateagents.controller;
 
+import com.alibaba.fastjson.JSONObject;
 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.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.service.ITaMiniappService;
 import org.slf4j.Logger;
@@ -141,4 +143,25 @@ public class TaMiniappController extends BaseController {
         }
         return responseBean;
     }
+
+    @PostMapping(value = "center/check/taMiniapp")
+    public ResponseBean createQRCode(@RequestBody String paramStr) {
+        if (StringUtils.isEmpty(paramStr)) {
+            return ResponseBean.error("生成二维码参数为空", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        JSONObject params = JSONObject.parseObject(paramStr);
+        if (null == params) {
+            return ResponseBean.error("非法生成二维码参数", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        String appid = params.getString("appid");
+        String secret = params.getString("secret");
+        String path = params.getString("path");
+
+        if (StringUtils.isEmpty(appid) || StringUtils.isEmpty(secret) || StringUtils.isEmpty(path)) {
+
+        }
+        return null;
+    }
 }

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) {
@@ -109,6 +115,14 @@ public class TaPersonController extends BaseController {
             person.setPersonType(CommConstant.PERSON_REALTY_CONSULTANT);
             person.setUserId(user.getUserId());
             person.setAvatarurl(user.getAvatar());
+            person.setCompany(user.getOrgName());
+            person.setTel(user.getPhone());
+            person.setName(user.getUserName());
+            person.setAddress(user.getAddress());
+            person.setIdNo(user.getIdNo());
+            person.setDepartment(user.getDepartment());
+            person.setPost(user.getPosition());
+            person.setPhoto(user.getPhoto());
             taPersonService.updateById(person);
             responseBean.addSuccess(person);
         }else {

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

@@ -98,13 +98,14 @@ public class TdPointsRulesController extends BaseController {
             queryWrapper.orderByDesc("create_date");
             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");
+            queryWrapper.eq(orgId != null,"org_id",orgId);
+            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/interceptor/AccessInterceptor.java

@@ -125,18 +125,18 @@ public class AccessInterceptor implements HandlerInterceptor {
             response.getOutputStream().write(JSONObject.toJSONBytes(resp));
             return false;
         }
-
+        
         //添加如果执行了登出操作提示先进行登录
         SysToken sysToken = sysTokenService.getById(jwtAuths[1]);
         if (null == sysToken){
             ResponseBean resp = ResponseBean.error("请先进行系统登录操作", ResponseBean.ERROR_AUTH_FAIL);
-
+    
             response.addHeader("Content-type", "application/json");
             response.getOutputStream().write(JSONObject.toJSONBytes(resp));
             return false;
         }
-
-        //按钮权限校验
+        
+//        按钮权限校验
         boolean state = checkButtonRole(request);
         if (!state){
             ResponseBean resp = ResponseBean.error("权限验证非法" , ResponseBean.ERROR_AUTH_FAIL);
@@ -157,7 +157,7 @@ public class AccessInterceptor implements HandlerInterceptor {
         //根据路径匹配code 一致继续 否则无权限
         String requestURI = request.getRequestURI();
         String method = request.getMethod();
-        TaButtonUriMap taButtonUriMap = taButtonUriMapService.getByURI(method+":"+requestURI);
+        TaButtonUriMap taButtonUriMap = taButtonUriMapService.getByURI(requestURI+":"+method);
         if (null == taButtonUriMap){
             return true;
         }

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/mapper/TaRoleMenuMapper.java

@@ -15,4 +15,9 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaRoleMenuMapper extends BaseMapper<TaRoleMenu> {
 
+    /**
+     * 先删除再添加
+     * @param roleId
+     */
+    void deleteCurrentMenu(Integer roleId);
 }

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

@@ -1,8 +1,10 @@
 package com.huiju.estateagents.service;
 
+import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
+import com.alibaba.fastjson.JSONObject;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaMiniappQrcode;
@@ -29,6 +31,8 @@ public interface IMiniAppService {
 
     ResponseBean getQrCode(String paramsStr, String appid);
 
+    String createQrCode(WxMaService service, String path) throws Exception;
+
     TaMiniappQrcode getQrCodeBySerialNo(Integer id);
 
     List<TaMiniapp> getAllAvaliableMiniapps();

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/MiniAppServiceImpl.java

@@ -175,6 +175,13 @@ public class MiniAppServiceImpl implements IMiniAppService {
         }
     }
 
+    @Override
+    public String createQrCode(WxMaService service, String path) throws Exception {
+        File qrFile = service.getQrcodeService().createWxaCode(path);
+        String qrcode = AliOSSUtils.putObject(qrFile, CommConstant.ALIOSS_DEFAULT_UPLOAD);
+        return qrcode;
+    }
+
     @Override
     public TaMiniappQrcode getQrCodeBySerialNo(Integer id) {
         return taMiniappQrcodeMapper.selectById(id);

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/java/com/huiju/estateagents/service/impl/TaRoleServiceImpl.java

@@ -54,19 +54,19 @@ public class TaRoleServiceImpl extends ServiceImpl<TaRoleMapper, TaRole> impleme
             SysMenu sysMenu = sysMenuMapper.selectById(taRoleMenu.getMenuId());
             sysMenuList.add(sysMenu);
 
-            // 查询按钮
-            QueryWrapper<TaRoleButton> taRoleButtonQuery= new QueryWrapper<>();
-            taRoleButtonQuery.eq("role_id",id);
-            List<TaRoleButton> taRoleButtonList= taRoleButtonMapper.selectList(taRoleButtonQuery);
-            List<SysButtonInMenu> sysButtonInArr = new ArrayList<>();
-            for(TaRoleButton taRoleButton :taRoleButtonList){
-                QueryWrapper<SysButtonInMenu> sysButtonInMenuQuery = new QueryWrapper<>();
-                sysButtonInMenuQuery.eq("btn_id",taRoleButton.getBtnId());
-                SysButtonInMenu sysButtonInMenuList= sysButtonInMenuMapper.selectOne(sysButtonInMenuQuery);
-                sysButtonInArr.add(sysButtonInMenuList);
-            }
-            sysMenu.setSysButtonInMenu(sysButtonInArr);
         }
+        // 查询按钮
+        QueryWrapper<TaRoleButton> taRoleButtonQuery= new QueryWrapper<>();
+        taRoleButtonQuery.eq("role_id",id);
+        List<TaRoleButton> taRoleButtonList= taRoleButtonMapper.selectList(taRoleButtonQuery);
+        List<SysButtonInMenu> sysButtonInArr = new ArrayList<>();
+        for(TaRoleButton taRoleButton :taRoleButtonList){
+            QueryWrapper<SysButtonInMenu> sysButtonInMenuQuery = new QueryWrapper<>();
+            sysButtonInMenuQuery.eq("btn_id",taRoleButton.getBtnId());
+            SysButtonInMenu sysButtonInMenuList= sysButtonInMenuMapper.selectOne(sysButtonInMenuQuery);
+            sysButtonInArr.add(sysButtonInMenuList);
+        }
+        taRole.setSysButtonInMenu(sysButtonInArr);
         taRole.setSysMenuList(sysMenuList);
         return taRole;
     }

src/main/resources/application-demo.yml

@@ -48,4 +48,27 @@ ali:
     bucketName: estateagents
     bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
 
+# 手机短信服务
+sms:
+  url: http://micservice.ycjcjy.com/sms
+  method: POST
+  contentType: "application/json;charset=UTF-8"
+  template:
+    code:
+    tel:
+    params:
 
+  # 以下为各模板 code
+  # 验证码
+  captcha:
+    # 模板 code
+    code: "0301"
+    # 有效时间 秒
+    expire: 120
+    # 验证码长度
+    size: 4
+    # 短信签名
+    sign: AI智慧案场
+
+  visitor:
+    code: "0501"

src/main/resources/application-dev.yml

@@ -48,4 +48,27 @@ ali:
     bucketName: estateagents
     bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
 
+# 手机短信服务
+sms:
+  url: http://micservice.ycjcjy.com/sms
+  method: POST
+  contentType: "application/json;charset=UTF-8"
+  template:
+    code:
+    tel:
+    params:
 
+  # 以下为各模板 code
+  # 验证码
+  captcha:
+    # 模板 code
+    code: "0301"
+    # 有效时间 秒
+    expire: 120
+    # 验证码长度
+    size: 4
+    # 短信签名
+    sign:營銷雲
+
+  visitor:
+    code: "0501"

src/main/resources/application-gzysd.yml

@@ -48,4 +48,27 @@ ali:
     bucketName: estateagents
     bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
 
+# 手机短信服务
+sms:
+  url: http://micservice.ycjcjy.com/sms
+  method: POST
+  contentType: "application/json;charset=UTF-8"
+  template:
+    code:
+    tel:
+    params:
 
+  # 以下为各模板 code
+  # 验证码
+  captcha:
+    # 模板 code
+    code: "0301"
+    # 有效时间 秒
+    expire: 120
+    # 验证码长度
+    size: 4
+    # 短信签名
+    sign: AI智慧案场
+
+  visitor:
+    code: "0501"

src/main/resources/application-nj.yml

@@ -49,4 +49,27 @@ ali:
     bucketName: estateagents
     bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
 
+# 手机短信服务
+sms:
+  url: http://micservice.ycjcjy.com/sms
+  method: POST
+  contentType: "application/json;charset=UTF-8"
+  template:
+    code:
+    tel:
+    params:
 
+  # 以下为各模板 code
+  # 验证码
+  captcha:
+    # 模板 code
+    code: "0301"
+    # 有效时间 秒
+    expire: 120
+    # 验证码长度
+    size: 4
+    # 短信签名
+    sign: AI智慧案场
+
+  visitor:
+    code: "0501"

src/main/resources/application-prod.yml

@@ -48,4 +48,27 @@ ali:
     bucketName: estateagents
     bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
 
+# 手机短信服务
+sms:
+  url: http://micservice.ycjcjy.com/sms
+  method: POST
+  contentType: "application/json;charset=UTF-8"
+  template:
+    code:
+    tel:
+    params:
 
+  # 以下为各模板 code
+  # 验证码
+  captcha:
+    # 模板 code
+    code: "0301"
+    # 有效时间 秒
+    expire: 120
+    # 验证码长度
+    size: 4
+    # 短信签名
+    sign: AI智慧案场
+
+  visitor:
+    code: "0501"

src/main/resources/application-test.yml

@@ -48,4 +48,27 @@ ali:
     bucketName: estateagents
     bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
 
+# 手机短信服务
+sms:
+  url: http://micservice.ycjcjy.com/sms
+  method: POST
+  contentType: "application/json;charset=UTF-8"
+  template:
+    code:
+    tel:
+    params:
 
+  # 以下为各模板 code
+  # 验证码
+  captcha:
+    # 模板 code
+    code: "0301"
+    # 有效时间 秒
+    expire: 120
+    # 验证码长度
+    size: 4
+    # 短信签名
+    sign: AI智慧案场
+
+  visitor:
+    code: "0501"

src/main/resources/application-xs.yml

@@ -48,4 +48,27 @@ ali:
     bucketName: estateagents
     bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
 
+# 手机短信服务
+sms:
+  url: http://micservice.ycjcjy.com/sms
+  method: POST
+  contentType: "application/json;charset=UTF-8"
+  template:
+    code:
+    tel:
+    params:
 
+  # 以下为各模板 code
+  # 验证码
+  captcha:
+    # 模板 code
+    code: "0301"
+    # 有效时间 秒
+    expire: 120
+    # 验证码长度
+    size: 4
+    # 短信签名
+    sign: AI智慧案场
+
+  visitor:
+    code: "0501"

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/TaRoleMenuMapper.xml

@@ -1,5 +1,7 @@
 <?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.TaRoleMenuMapper">
-
+    <delete  id="deleteCurrentMenu">
+    delete from ta_role_menu where ta_role_menu.role_id = #{roleId}
+    </delete >
 </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