add subscribe message

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

@@ -112,11 +112,12 @@ public class MiniAppController extends BaseController {
             TaMiniapp miniapp = taMiniappService.getById(appid);
             WxMaJscode2SessionResult session = miniAppService.getSessionInfo(code, appid);
             Integer orgId =miniapp.getOrgId();
-            Map<String, String> miniResp = new HashMap<>();
+            Map<String, Object> miniResp = new HashMap<>();
             miniResp.put("openid", session.getOpenid());
             miniResp.put("sessionKey", session.getSessionKey());
             miniResp.put("unionid", session.getUnionid());
             miniResp.put("name",miniapp.getName());
+            miniResp.put("tpls", miniAppService.getTpls(appid));
 
             //如果是分享进来且没有进入过小程序，给分享人发放积分
             QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
@@ -219,7 +220,7 @@ public class MiniAppController extends BaseController {
             result.put("extraInfo", extraInfo);
             result.put("miniAuthorized", null != taPerson.getAvatarurl() && taPerson.getAvatarurl().indexOf("wx.qlogo.cn") > 0);
 
-            String token = miniResp.get("token");
+            String token = (String) miniResp.get("token");
             sysTokenService.saveToken(token);
 
             return ResponseBean.success(result);
@@ -408,7 +409,6 @@ public class MiniAppController extends BaseController {
         }
     }
 
-
     public Integer getOrgId(HttpServletRequest request){
 
         Map map = JWTUtils.getUserIdAndOrgId(request);

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

@@ -5,6 +5,7 @@ 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.TaMiniappTemplate;
 import com.huiju.estateagents.service.ITaMiniappTemplateService;
 import org.slf4j.Logger;
@@ -12,6 +13,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 小程序消息模板  前端控制器
@@ -143,4 +146,16 @@ public class TaMiniappTemplateController extends BaseController {
         }
         return responseBean;
     }
+
+    @GetMapping("/wx/template/of/{type}")
+    public ResponseBean getTemplateByType(@PathVariable String type, HttpServletRequest request) {
+        String appid = request.getHeader("appid");
+
+        if (StringUtils.isEmpty(type) || StringUtils.isEmpty(appid)) {
+            return ResponseBean.error("参数非法", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaMiniappTemplate tpl = iTaMiniappTemplateService.getTplByType(type, appid);
+        return ResponseBean.success(tpl);
+    }
 }

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

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.huiju.estateagents.base.ResponseBean;
 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 me.chanjar.weixin.common.error.WxErrorException;
 
@@ -40,4 +41,8 @@ public interface IMiniAppService {
     TaMiniappQrcode getQrCodeBySerialNo(Integer id);
 
     List<TaMiniapp> getAllAvaliableMiniapps();
+
+    TaMiniappTemplate getTplByType(String type, String appid);
+
+    List<TaMiniappTemplate> getTpls(String appid);
 }

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

@@ -12,5 +12,5 @@ import com.huiju.estateagents.entity.TaMiniappTemplate;
  * @since 2019-09-11
  */
 public interface ITaMiniappTemplateService extends IService<TaMiniappTemplate> {
-
+    TaMiniappTemplate getTplByType(String type, String appid);
 }

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

@@ -387,11 +387,21 @@ public class MiniAppServiceImpl implements IMiniAppService {
         return data;
     }
 
-    private TaMiniappTemplate getTplByType(String type, String appid) {
+    @Override
+    public TaMiniappTemplate getTplByType(String type, String appid) {
         TaMiniappTemplate tpl = taMiniappTemplateMapper.selectTplByType(type, appid);
         return tpl;
     }
 
+    @Override
+    public List<TaMiniappTemplate> getTpls(String appid) {
+        QueryWrapper<TaMiniappTemplate> query = new QueryWrapper<>();
+        query.eq("miniapp_id", appid);
+        query.orderByAsc("serial_no");
+
+        return taMiniappTemplateMapper.selectList(query);
+    }
+
     public TaMiniapp getMinappByOrg(Integer org) {
         QueryWrapper<TaMiniapp> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("org_id", org);

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.entity.TaMiniappTemplate;
 import com.huiju.estateagents.mapper.TaMiniappTemplateMapper;
 import com.huiju.estateagents.service.ITaMiniappTemplateService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -16,5 +17,12 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TaMiniappTemplateServiceImpl extends ServiceImpl<TaMiniappTemplateMapper, TaMiniappTemplate> implements ITaMiniappTemplateService {
+    @Autowired
+    TaMiniappTemplateMapper taMiniappTemplateMapper;
 
+    @Override
+    public TaMiniappTemplate getTplByType(String type, String appid) {
+        TaMiniappTemplate tpl = taMiniappTemplateMapper.selectTplByType(type, appid);
+        return tpl;
+    }
 }

src/main/resources/mapper/TaMiniappTemplateMapper.xml

@@ -10,5 +10,6 @@
         WHERE
             t.miniapp_id = #{appid}
         AND s.tpl_type = #{type}
+        limit 1
     </select>
 </mapper>