Merge branch 'dev' of trick9191/jw2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/base/wx/WxReplySceneDO.java

@@ -18,7 +18,7 @@ public class WxReplySceneDO extends UuidIdentityEntityWithOperator implements ja
    private String appOriginId;//原始ID（唯一）
    private String msgType;//微信消息类型：text，event，image，voice，video，shortvideo，location，link
    private String event;//微信事件类型：SCAN，LOCATION，CLICK，subscribe，unsubscribe
    private String scene;//图文消息/自定义消息，分组场景
    private String scene;//图文消息/自定义消息，分组场景，微信的eventKey
    private String content;//居民回复内容，消息字段
    private Integer status;//状态(-1删除 0 冻结 1可用
@@ -84,4 +84,5 @@ public class WxReplySceneDO extends UuidIdentityEntityWithOperator implements ja
    public void setStatus(Integer status) {
        this.status = status;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/wx/WechatCoreService.java

@@ -224,7 +224,23 @@ public class WechatCoreService {
     * @param message
     * @return
     */
    public String clickProcess(Map<String, String> message){
    public String clickProcess(Map<String, String> message)throws Exception{
        //获取原始id
        String toUserName = message.get("ToUserName");
        //EventKey值为菜单的场景值
        String eventKey = message.get("EventKey");
        //查询需要对应匹配的点击事件值
        List<WxReplySceneDO> scenes = wxReplySceneDao.findByAppOriginIdAndMsgTypeAndEventAndStatus(toUserName,WeiXinMessageUtils.REQ_MESSAGE_TYPE_EVENT,WeiXinMessageUtils.EVENT_TYPE_CLICK,1);
        if(scenes!=null&&scenes.size()>0){
            //匹配对应点击事件场景值
            for(WxReplySceneDO scene:scenes){
                //判断带参二维码中前缀是否包该场景值
                if(StringUtils.isNotBlank(scene.getScene())&&eventKey.indexOf(scene.getScene())!=-1){
                    return getGraphicXMl(scene.getScene(),scene.getWechatId(),message);
                }
            }
        }
        return "";
    }