bug fix

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

@@ -16,14 +16,18 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaRole;
+import com.huiju.estateagents.service.ITaRoleService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import sun.dc.pr.PRError;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -46,6 +50,8 @@ public class TaUserController extends BaseController {
     @Autowired
     private ISysTokenService sysTokenService;
 
+    @Autowired
+    private ITaRoleService iTaRoleService;
 
     /**
      * 分页查询列表
@@ -191,6 +197,8 @@ public class TaUserController extends BaseController {
         Map map = JWTUtils.getUserIdAndOrgId(request);
         try {
             TaUser taUser = iTaUserService.getById(map.get("userId").toString());
+            List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());
+            taUser.setRoles(roles);
             taUser.setLoginPassword("");
             responseBean.addSuccess(taUser);
         }catch (Exception e){
@@ -228,6 +236,9 @@ public class TaUserController extends BaseController {
         if (taUser.getStatus() != CommConstant.STATUS_NORMAL) {
             return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
         }
+
+        List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());
+        taUser.setRoles(roles);
         taUser.setLoginPassword("");
         Map map = new HashMap();
         map.put("userId",taUser.getUserId().toString());

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

@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.entity.TaRole;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -119,4 +121,10 @@ public class TaUser implements Serializable {
      */
     @TableField(exist = false)
     private TaMiniapp miniapp;
+
+    /**
+     * 授权角色列表
+     */
+    @TableField(exist = false)
+    private List<TaRole> roles;
 }

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

@@ -2,67 +2,47 @@ package com.huiju.estateagents.common;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
-import cn.binarywang.wx.miniapp.bean.WxMaTemplateData;
-import cn.binarywang.wx.miniapp.bean.WxMaTemplateMessage;
 import cn.binarywang.wx.miniapp.config.WxMaInMemoryConfig;
-import com.huiju.estateagents.config.WxProperties;
-import com.huiju.estateagents.entity.TaBuilding;
-import com.huiju.estateagents.service.ITaBuildingService;
-import me.chanjar.weixin.common.error.WxErrorException;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.service.IMiniAppService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
-@Configuration
-@EnableConfigurationProperties(WxProperties.class)
+@Component
 public class WxUtils {
-    static WxMaService miniApp;
-
-    static WxProperties properties;
+    private ConcurrentHashMap<String, WxMaService> serives = new ConcurrentHashMap();
 
     @Autowired
-    public WxUtils(WxProperties properties) { WxUtils.properties = properties; }
+    IMiniAppService iMiniAppService;
 
-    public static WxMaService getMiniApp() {
-        return miniApp;
+    public WxMaService getMiniApp(String appid) {
+        return serives.get(appid);
     }
 
-    @Autowired
-    ITaBuildingService iTaBuildingService;
-
     @PostConstruct
     public void init() {
         System.out.println("-------------PostConstruct----------------");
 
-        WxMaInMemoryConfig config = new WxMaInMemoryConfig();
-
-        WxProperties.Miniapp miniProperty = WxUtils.properties.getMiniapp();
-
-        config.setAppid(miniProperty.getAppid());
-        config.setSecret(miniProperty.getSecret());
-        config.setToken(miniProperty.getToken());
-        config.setAesKey(miniProperty.getAesKey());
-        config.setMsgDataFormat(miniProperty.getMsgDataFormat());
-
-        WxUtils.miniApp = new WxMaServiceImpl();
-        WxUtils.miniApp.setWxMaConfig(config);
-        System.out.println("-------------PostConstruct- 222---------------");
-        System.out.println(WxUtils.miniApp);
-    }
+        List<TaMiniapp> taMiniappList = iMiniAppService.getAllAvaliableMiniapps();
+        if (null != taMiniappList) {
+            return;
+        }
 
-    public static WxProperties.Tpl getTplByName(String name) {
-        for ( WxProperties.Tpl t: properties.getTpls()) {
-            if (t.getName().equals(name)) {
-                return t;
-            }
+        for (TaMiniapp taMiniapp : taMiniappList) {
+            WxMaInMemoryConfig config = new WxMaInMemoryConfig();
+            config.setAppid(taMiniapp.getMiniappId());
+            config.setSecret(taMiniapp.getSecret());
+            config.setToken(taMiniapp.getToken());
+            config.setAesKey(taMiniapp.getAesKey());
+            config.setMsgDataFormat("JSON");
+
+            WxMaService service = new WxMaServiceImpl();
+            service.setWxMaConfig(config);
+            serives.put(taMiniapp.getMiniappId(), service);
         }
-        return null;
     }
 }

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

@@ -34,23 +34,15 @@ public class MiniAppController {
     @Autowired
     private ITaPersonService taPersonService;
 
-    final WxMaService wxService = WxUtils.getMiniApp();
-
     @Autowired
     private IMiniAppService miniAppService;
 
     @Autowired
     private ITaRecommendCustomerService taRecommendCustomerService;
 
-    @Autowired
-    private ITaCustomerPersonService taCustomerPersonService;
-
     @Resource
     private ApplicationContext applicationContext;
 
-    @Autowired
-    private TaShareMapper taShareMapper;
-
     @Autowired
     private ITaOrgService taOrgService;
 
@@ -71,12 +63,23 @@ public class MiniAppController {
      * 登陆接口
      */
     @PostMapping("/login")
-    public ResponseBean login(String code,@RequestParam(required = false) String from,@RequestParam(required = false)String recommender,HttpServletRequest request) {
+    public ResponseBean login(
+            String code,
+            @RequestParam(required = false) String from,
+            @RequestParam(required = false)String recommender,
+            HttpServletRequest request) {
+        String appid = request.getHeader("appid");
+
         if (StringUtils.isBlank(code)) {
             return ResponseBean.error("参数 code 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
+        if (StringUtils.isBlank(appid)) {
+            return ResponseBean.error("Header 参数 appid 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
         try {
-            WxMaJscode2SessionResult session = miniAppService.getSessionInfo(code);
+
+            WxMaJscode2SessionResult session = miniAppService.getSessionInfo(code, appid);
             Integer orgId =getOrgId(request);
             Map<String, String> miniResp = new HashMap<>();
             miniResp.put("openid", session.getOpenid());
@@ -93,7 +96,7 @@ public class MiniAppController {
                 // 添加积分
                  applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll));
             }
-            TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid(),orgId);
+            TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid(), orgId);
             if (null == taPerson) {
                 return ResponseBean.error("发生未知错误", ResponseBean.ERROR_UNAVAILABLE);
             }
@@ -109,6 +112,7 @@ public class MiniAppController {
                     }
                 }
             }
+            taPerson.setMiniappId(appid);
             taPersonService.updateById(taPerson);
 
             taPerson.setPassword(null);
@@ -155,6 +159,7 @@ public class MiniAppController {
      */
     @PostMapping("/signup")
     public ResponseBean info(@RequestBody String paramStr, HttpServletRequest request) {
+        String appid = request.getHeader("appid");
         TaPerson person = null;
 
         if (null == paramStr || "".equals(paramStr.trim()) || "{}".equals(paramStr.trim())) {
@@ -178,12 +183,12 @@ public class MiniAppController {
             String iv = params.getString("iv");
 
             // 用户信息校验
-            if (!miniAppService.checkUserInfo(sessionKey, rawData, signature)) {
+            if (!miniAppService.checkUserInfo(sessionKey, rawData, signature, appid)) {
                 return ResponseBean.error("校验参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
             }
 
             // 解密用户信息
-            WxMaUserInfo userInfo = miniAppService.getUserInfo(sessionKey, encryptedData, iv);
+            WxMaUserInfo userInfo = miniAppService.getUserInfo(sessionKey, encryptedData, iv, appid);
 
             // 更新或保存用户信息
             person = taPersonService.mergePersonWxInfo(userInfo);
@@ -208,6 +213,7 @@ public class MiniAppController {
      */
     @PostMapping("/userPhone")
     public ResponseBean phone(@RequestBody String paramStr, HttpServletRequest request) {
+        String appid = request.getHeader("appid");
         JSONObject params = JSONObject.parseObject(paramStr);
         if (null == params) {
             return ResponseBean.error("校验参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -218,7 +224,7 @@ public class MiniAppController {
         String iv = params.getString("iv");
 
         // 解密
-        WxMaPhoneNumberInfo phoneNoInfo = miniAppService.getPhoneNoInfo(sessionKey, encryptedData, iv);
+        WxMaPhoneNumberInfo phoneNoInfo = miniAppService.getPhoneNoInfo(sessionKey, encryptedData, iv, appid);
 
         // 更新用户绑定手机
         String openid = JWTUtils.getSubject(request);
@@ -271,8 +277,9 @@ public class MiniAppController {
      * @return
      */
     @PostMapping("/qrcode")
-    public ResponseBean qrcode(@RequestBody String paramsStr) {
-        return miniAppService.getQrCode(paramsStr);
+    public ResponseBean qrcode(@RequestBody String paramsStr, HttpServletRequest request) {
+        String appid = request.getHeader("appid");
+        return miniAppService.getQrCode(paramsStr, appid);
     }
 
     /**

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

@@ -56,6 +56,9 @@ public class TaMiniapp implements Serializable {
      */
     private Integer orgId;
 
+
+    private String aesKey;
+
     @TableField(exist = false)
     private List<TaMiniappTemplate> tpls;
 }

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

@@ -258,4 +258,6 @@ public class TaPerson implements Serializable {
      */
     @TableField(exist = false)
     private int inviteCount;
+
+    private String miniappId;
 }

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

@@ -2,8 +2,11 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.entity.TaMiniappTemplate;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 小程序表  Mapper 接口
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaMiniappMapper extends BaseMapper<TaMiniapp> {
 
+    List<TaMiniapp> getAllAvaliableMiniapps();
 }

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaMiniappTemplate;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -14,5 +15,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TaMiniappTemplateMapper extends BaseMapper<TaMiniappTemplate> {
-
+    TaMiniappTemplate selectTplByType(@Param("type") String type, @Param("appid") String appid);
 }

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

@@ -3,6 +3,9 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaRole;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaRoleMapper extends BaseMapper<TaRole> {
 
+    List<TaRole> getRolesByUser(@Param("user") Integer userId);
 }

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

@@ -4,27 +4,32 @@ import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaMiniappQrcode;
+import com.huiju.estateagents.entity.TaPerson;
 import me.chanjar.weixin.common.error.WxErrorException;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 public interface IMiniAppService {
-    WxMaJscode2SessionResult getSessionInfo(String code) throws WxErrorException;
+    WxMaJscode2SessionResult getSessionInfo(String code, String appid) throws WxErrorException;
 
-    boolean checkUserInfo(String sessionKey, String rawData, String signature);
+    boolean checkUserInfo(String sessionKey, String rawData, String signature, String appid);
 
-    WxMaUserInfo getUserInfo(String sessionKey, String encryptedData, String iv);
+    WxMaUserInfo getUserInfo(String sessionKey, String encryptedData, String iv, String appid);
 
-    WxMaPhoneNumberInfo getPhoneNoInfo(String sessionKey, String encryptedData, String iv);
+    WxMaPhoneNumberInfo getPhoneNoInfo(String sessionKey, String encryptedData, String iv, String appid);
 
-    void sendNoticeMessage(String toUser, String link, String name, String phone, String content, LocalDateTime dt);
+    void sendNoticeMessage(TaPerson toUser, String link, String name, String phone, String content, LocalDateTime dt);
 
-    void sendMainBizMessage(String toUser, String link, String custName, String phone, String sex, String fromName, String bizType, String content);
+    void sendMainBizMessage(TaPerson toUser, String link, String custName, String phone, String sex, String fromName, String bizType, String content);
 
-    void sendNewCustomerMessage(String toUser, String link, String custName, String phone, String sex, String fromName);
+    void sendNewCustomerMessage(TaPerson toUser, String link, String custName, String phone, String sex, String fromName);
 
-    ResponseBean getQrCode(String paramsStr);
+    ResponseBean getQrCode(String paramsStr, String appid);
 
     TaMiniappQrcode getQrCodeBySerialNo(Integer id);
+
+    List<TaMiniapp> getAllAvaliableMiniapps();
 }

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

@@ -3,6 +3,8 @@ package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.TaRole;
 
+import java.util.List;
+
 /**
  * <p>
  * 角色表 角色表，每个org的角色可以单独设置。但是都共有一个admin角色。这个角色在创建用户的时候创建好了 服务类
@@ -12,5 +14,5 @@ import com.huiju.estateagents.entity.TaRole;
  * @since 2019-09-11
  */
 public interface ITaRoleService extends IService<TaRole> {
-
+    List<TaRole> getRolesByUser(Integer userId);
 }

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

@@ -7,13 +7,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.*;
 import com.huiju.estateagents.config.WxProperties;
+import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaMiniappQrcode;
+import com.huiju.estateagents.entity.TaMiniappTemplate;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.mapper.TaMiniFormidsMapper;
+import com.huiju.estateagents.mapper.TaMiniappMapper;
 import com.huiju.estateagents.mapper.TaMiniappQrcodeMapper;
+import com.huiju.estateagents.mapper.TaMiniappTemplateMapper;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaMiniFormidsService;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -35,34 +41,43 @@ public class MiniAppServiceImpl implements IMiniAppService {
     @Autowired
     ITaMiniFormidsService taMiniFormidsService;
 
+    @Autowired
+    TaMiniappMapper taMiniappMapper;
+
+    @Autowired
+    TaMiniappTemplateMapper taMiniappTemplateMapper;
+
+    @Autowired
+    WxUtils wxUtils;
+
     @Override
-    public WxMaJscode2SessionResult getSessionInfo(String code) throws WxErrorException {
-        WxMaService wxService = WxUtils.getMiniApp();
+    public WxMaJscode2SessionResult getSessionInfo(String code, String appid) throws WxErrorException {
+        WxMaService wxService = wxUtils.getMiniApp(appid);
         System.out.println(wxService);
         System.out.println(wxService.getUserService());
         return wxService.getUserService().getSessionInfo(code);
     }
 
     @Override
-    public boolean checkUserInfo(String sessionKey, String rawData, String signature) {
-        WxMaService wxService = WxUtils.getMiniApp();
+    public boolean checkUserInfo(String sessionKey, String rawData, String signature, String appid) {
+        WxMaService wxService = wxUtils.getMiniApp(appid);
         return wxService.getUserService().checkUserInfo(sessionKey, rawData, signature);
     }
 
     @Override
-    public WxMaUserInfo getUserInfo(String sessionKey, String encryptedData, String iv) {
-        WxMaService wxService = WxUtils.getMiniApp();
+    public WxMaUserInfo getUserInfo(String sessionKey, String encryptedData, String iv, String appid) {
+        WxMaService wxService = wxUtils.getMiniApp(appid);
         return wxService.getUserService().getUserInfo(sessionKey, encryptedData, iv);
     }
 
     @Override
-    public WxMaPhoneNumberInfo getPhoneNoInfo(String sessionKey, String encryptedData, String iv) {
-        WxMaService wxService = WxUtils.getMiniApp();
+    public WxMaPhoneNumberInfo getPhoneNoInfo(String sessionKey, String encryptedData, String iv, String appid) {
+        WxMaService wxService = wxUtils.getMiniApp(appid);
         return wxService.getUserService().getPhoneNoInfo(sessionKey, encryptedData, iv);
     }
 
     @Override
-    public void sendNoticeMessage(String toUser, String link, String name, String phone, String content, LocalDateTime dt) {
+    public void sendNoticeMessage(TaPerson toUser, String link, String name, String phone, String content, LocalDateTime dt) {
         List<WxMaTemplateData> data = new ArrayList<>();
         data.add(new WxMaTemplateData("keyword1", name, "#fffff"));
         data.add(new WxMaTemplateData("keyword2", phone, "#fffff"));
@@ -73,7 +88,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
     }
 
     @Override
-    public void sendMainBizMessage(String toUser, String link, String custName, String phone, String sex, String fromName, String bizType, String content) {
+    public void sendMainBizMessage(TaPerson toUser, String link, String custName, String phone, String sex, String fromName, String bizType, String content) {
         List<WxMaTemplateData> data = new ArrayList<>();
         data.add(new WxMaTemplateData("keyword1", custName, "#fffff"));
         data.add(new WxMaTemplateData("keyword2", StringUtils.ifNull(phone, "未知"), "#fffff"));
@@ -86,7 +101,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
     }
 
     @Override
-    public void sendNewCustomerMessage(String toUser, String link, String custName, String phone, String sex, String fromName) {
+    public void sendNewCustomerMessage(TaPerson toUser, String link, String custName, String phone, String sex, String fromName) {
         List<WxMaTemplateData> data = new ArrayList<>();
         data.add(new WxMaTemplateData("keyword1", custName, "#fffff"));
         data.add(new WxMaTemplateData("keyword2", StringUtils.ifNull(phone, "未知"), "#fffff"));
@@ -97,11 +112,10 @@ public class MiniAppServiceImpl implements IMiniAppService {
     }
 
     @Override
-    public ResponseBean getQrCode(String paramsStr) {
+    public ResponseBean getQrCode(String paramsStr, String appid) {
         if (null == paramsStr) return ResponseBean.error("请指定二维码生成参数", ResponseBean.ERROR_MISSING_PARAMS);
 
-        WxMaService wxService = WxUtils.getMiniApp();
-        String appid = wxService.getWxMaConfig().getAppid();
+        WxMaService wxService = wxUtils.getMiniApp(appid);
 
         // 先去数据库中查询
         QueryWrapper<TaMiniappQrcode> queryWrapper = new QueryWrapper<>();
@@ -166,29 +180,61 @@ public class MiniAppServiceImpl implements IMiniAppService {
         return taMiniappQrcodeMapper.selectById(id);
     }
 
-    private void sendMessage(String tplName, String toUser, String link, List<WxMaTemplateData> data) {
-        WxProperties.Tpl tpl = WxUtils.getTplByName(tplName);
+    @Override
+    public List<TaMiniapp> getAllAvaliableMiniapps() {
+        List<TaMiniapp> taMiniappList = taMiniappMapper.getAllAvaliableMiniapps();
+
+        if (null != taMiniappList) {
+            for (TaMiniapp miniapp : taMiniappList) {
+                QueryWrapper<TaMiniappTemplate> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("miniapp_id", miniapp.getMiniappId());
+                miniapp.setTpls(taMiniappTemplateMapper.selectList(queryWrapper));
+            }
+        }
+
+        return taMiniappList;
+    }
+
+    private void sendMessage(String tplName, TaPerson toUser, String link, List<WxMaTemplateData> data) {
+        String appid = toUser.getMiniappId();
+        if (StringUtils.isEmpty(appid)) {
+            log.error("人员 {} 无对应来源小程序信息", toUser);
+        }
+
+        TaMiniappTemplate tpl = getTplByType(tplName, toUser.getMiniappId());
         if (null == tpl) return ;
 
-        String formid = taMiniFormidsService.getFormidBy(toUser, true);
+        String formid = taMiniFormidsService.getFormidBy(toUser.getMiniOpenid(), true);
         if (StringUtils.isEmpty(formid)) {
-            log.error("發送消息失敗, 沒有有效的 formid");
+            log.error("发送消息失敗, 沒有有效的 formid");
             return;
         }
 
         WxMaTemplateMessage message = WxMaTemplateMessage.builder()
-                .templateId(tpl.getId())
+                .templateId(tpl.getTplId())
                 .data(data)
                 .formId(formid)
                 .page(StringUtils.ifNull(link, CommConstant.MINIAPP_INDEX))
-                .toUser(toUser)
+                .toUser(toUser.getMiniOpenid())
                 .build();
         try {
-
-            WxMaService wxService = WxUtils.getMiniApp();
+            WxMaService wxService = wxUtils.getMiniApp(appid);
             wxService.getMsgService().sendTemplateMsg(message);
         } catch (WxErrorException e) {
             e.printStackTrace();
         }
     }
+
+    private TaMiniappTemplate getTplByType(String type, String appid) {
+        TaMiniappTemplate tpl = taMiniappTemplateMapper.selectTplByType(type, appid);
+        return tpl;
+    }
+
+    public TaMiniapp getMinappByOrg(Integer org) {
+        QueryWrapper<TaMiniapp> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", org);
+        queryWrapper.last("limit 1");
+
+        return taMiniappMapper.selectOne(queryWrapper);
+    }
 }

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

@@ -147,7 +147,7 @@ public class TaChatServiceImpl extends ServiceImpl<TaChatMapper, TaChat> impleme
                 };
                 String link = "/pages/im/index?"+String.join("&", its);
 
-                miniAppService.sendNoticeMessage(to.getMiniOpenid(), link, StringUtils.ifNull(from.getName(), from.getNickname()), StringUtils.ifNull(from.getTel(), from.getPhone()), "给您发送了一条新消息, 请查收", LocalDateTime.now());
+                miniAppService.sendNoticeMessage(to, link, StringUtils.ifNull(from.getName(), from.getNickname()), StringUtils.ifNull(from.getTel(), from.getPhone()), "给您发送了一条新消息, 请查收", LocalDateTime.now());
             } else {
                 taChat.setIsRead(CommConstant.MESSAGE_READED);
             }

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

@@ -290,7 +290,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         TaPerson saleMan = taPersonMapper.getSalesExecutive();
         if (null != saleMan && !StringUtils.isEmpty(saleMan.getMiniOpenid())) {
             // 发送消息
-            iMiniAppService.sendNewCustomerMessage(saleMan.getMiniOpenid(), CommConstant.MINIAPP_INDEX, taRecommendCustomer.getName(), taRecommendCustomer.getPhone(), "", taPerson.getName());
+            iMiniAppService.sendNewCustomerMessage(saleMan, CommConstant.MINIAPP_INDEX, taRecommendCustomer.getName(), taRecommendCustomer.getPhone(), "", taPerson.getName());
         }
 
         return ResponseBean.success(taRecommendCustomer);

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

@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.entity.TaRole;
 import com.huiju.estateagents.mapper.TaRoleMapper;
 import com.huiju.estateagents.service.ITaRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 角色表 角色表，每个org的角色可以单独设置。但是都共有一个admin角色。这个角色在创建用户的时候创建好了 服务实现类
@@ -16,5 +19,11 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TaRoleServiceImpl extends ServiceImpl<TaRoleMapper, TaRole> implements ITaRoleService {
+    @Autowired
+    TaRoleMapper taRoleMapper;
 
+    @Override
+    public List<TaRole> getRolesByUser(Integer userId) {
+        return taRoleMapper.getRolesByUser(userId);
+    }
 }

src/main/resources/mapper/TaMiniappMapper.xml

@@ -1,5 +1,14 @@
 <?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.TaMiniappMapper">
-
+    <select id="getAllAvaliableMiniapps" resultType="com.huiju.estateagents.entity.TaMiniapp">
+        SELECT
+            s.*
+        FROM
+            ta_user t
+        INNER JOIN ta_miniapp s ON t.org_id = s.org_id
+        WHERE
+            t.`status` = 1
+        AND t.exp_date &gt;= now()
+    </select>
 </mapper>

src/main/resources/mapper/TaMiniappTemplateMapper.xml

@@ -1,5 +1,14 @@
 <?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.TaMiniappTemplateMapper">
-
+    <select id="selectTplByType" resultType="com.huiju.estateagents.entity.TaMiniappTemplate">
+        SELECT
+            s.*
+        FROM
+            ta_miniapp t
+        INNER JOIN ta_miniapp_template s ON t.miniapp_id = s.miniapp_id
+        WHERE
+            t.miniapp_id = #{appid}
+        AND s.tpl_type = #{type}
+    </select>
 </mapper>

src/main/resources/mapper/TaRoleMapper.xml

@@ -1,5 +1,13 @@
 <?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.TaRoleMapper">
-
+    <select id="getRolesByUser" resultType="com.huiju.estateagents.entity.TaRole">
+        SELECT
+            t.*
+        FROM
+            ta_role t
+        INNER JOIN ta_user_role s ON t.role_id = s.role_id
+        WHERE
+            s.user_id = #{user}
+    </select>
 </mapper>