Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

6 天以前 dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4

 server/meeting/meeting_service/src/main/java/com/doumee/core/wx/WxPlatNotice.java

@@ -120,8 +120,6 @@
    }

    public void createBeginWxNotice(SystemDictDataBiz systemDictDataBiz, SmsEmailMapper smsEmailMapper, Bookings bookings, String openId){
        Map<String,Object> map = new HashMap<>();

        //整体参数map
        Map<String, Object> paramMap = new HashMap<String, Object>();
        //消息主题显示相关map
@@ -169,13 +167,12 @@
        smsEmail.setCreateDate(new Date());
        smsEmail.setTitle("会议即将开始提醒");
        smsEmail.setInfo(DateUtil.getFomartDate(DateUtil.getXMinuteAfterDate(bookings.getStartTime(),-earlyMin),"yyyy-MM-dd HH:mm:ss"));
        smsEmail.setContent(JSONObject.toJSONString(map));
        smsEmail.setContent(JSONObject.toJSONString(paramMap));
        smsEmailMapper.insert(smsEmail);
    }


    public void createEndWxNotice(SystemDictDataBiz systemDictDataBiz, SmsEmailMapper smsEmailMapper, Bookings bookings,  String openId){
        Map<String,Object> map = new HashMap<>();

        //整体参数map
        Map<String, Object> paramMap = new HashMap<String, Object>();
        //消息主题显示相关map
@@ -203,12 +200,6 @@
        paramMap.put("touser", openId);
        paramMap.put("data", dataMap);

        smsEmailMapper.delete(new QueryWrapper<SmsEmail>().lambda()
                .eq(SmsEmail::getObjType,Constants.FIVE.toString())
                .eq(SmsEmail::getStatus,Constants.TWO)
                .eq(SmsEmail::getType,Constants.TWO)
                .eq(SmsEmail::getObjId,bookings.getId())
        );

        SmsEmail smsEmail = new SmsEmail();
        smsEmail.setPhone(openId);
@@ -222,7 +213,11 @@
        smsEmail.setTitle("会议即将开始提醒");
        Integer endMin= Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.OVER_NOTICE_WX).getCode());
        smsEmail.setInfo(DateUtil.getFomartDate(DateUtil.getXMinuteAfterDate(bookings.getEndTime(),-endMin),"yyyy-MM-dd HH:mm:ss"));
        smsEmail.setContent(JSONObject.toJSONString(map));
        smsEmail.setContent(JSONObject.toJSONString(paramMap));

        smsEmailMapper.insert(smsEmail);


    }