Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/consult/WxPushEndpoint.java

@@ -52,17 +52,4 @@ public class WxPushEndpoint extends EnvelopRestEndpoint {
        return success("success");
    }
    @PostMapping(value = "sendPatientUnreadWXTemplate")
    @ApiOperation(value = "Job发送居民未读消息微信模板消息")
    public Envelop sendPatientUnreadWXTemplate(@ApiParam(name = "openid", value = "openid")
                                               @RequestParam(value = "openid", required = true) String openid,
                                               @ApiParam(name = "first", value = "first")
                                               @RequestParam(value = "first", required = true) String first,
                                               @ApiParam(name = "templateName", value = "templateName")
                                               @RequestParam(value = "templateName", required = true) String templateName,
                                               @ApiParam(name = "scene", value = "scene")
                                               @RequestParam(value = "scene", required = true) String scene){
        wxPushService.sendPatientUnreadWXTemplate(openid,first,templateName,scene);
        return success("success");
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/consult/WxPushService.java

@@ -71,11 +71,4 @@ public class WxPushService {
        }
    }
    public void sendPatientUnreadWXTemplate(String openid,String first,String templateName,String scene){
        String time = DateUtil.getStringDateShort()+" 09:00:00";
        Date timeDate = DateUtil.strToDate(time);
        messageUtil.putTemplateWxMessage(wxId,templateName,scene,openid,first,null,null,1,null,
                DateUtil.dateToChineseTime2(timeDate),"消息未回复通知","未回复");
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/doorCoach/DoctorDoorCoachOrderService.java

@@ -439,16 +439,14 @@ public class DoctorDoorCoachOrderService {
        ConsultDo consult = consultDao.queryByRelationCode(orderId);
        try {
            JSONObject json = new JSONObject();
            if(consult != null) {
                json.put("consult", consult.getId());
            }
            String first = "key1，您好！您的上门预约服务已由【key2】医生接单了";
            json.put("id", doorServiceOrder.getId());
            String first = "【key1】您好！您的上门预约订单已由【key2】接单了";
            first = first.replace("key1",(patient.getName()==null?"":patient.getName()));
            first = first.replace("key2", null != doorServiceOrder.getDoctorName() ? doorServiceOrder.getDoctorName() : "");
            List<BasePatientWechatDo> basePatientWechatDos = basePatientWechatDao.findByWechatIdAndPatientId(wxId,patient.getId());
            if (basePatientWechatDos.size()>0){
                String openId = basePatientWechatDos.get(0).getOpenid();
                messageUtil.putTemplateWxMessage(wxId,"template_process_feedback","smyyyjjd",openId,first,null,null,30,json, DateUtil.dateToChineseDate(new Date()),"上门预约已接单","已接单");
                messageUtil.putTemplateWxMessage(wxId,"template_process_feedback","smyyyjjd",openId,first,null,null,2,json, DateUtil.dateToChineseDate(new Date()),"上门预约已接单","已接单");
            }
        }catch (Exception e){
            e.printStackTrace();

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/doorCoach/PatientDoorCoachOrderService.java

@@ -845,19 +845,15 @@ public class PatientDoorCoachOrderService extends BaseJpaService<BaseDoorCoachOr
        this.orderWithConfirmLogAdd(result,confirmInfo,orderId);
        ConsultDo consult = consultDao.queryByRelationCode(orderId);
        // 发送微信模板消息，通知居民工单已取消（smyyyqx-上门预约已取消）
        String first = "key1，您好，您的上门预约服务已退回，点击查看原因";
        String first = "key1您好，您的上门预约订单已退回，点击查看原因";
        BasePatientDO patient = patientDao.findById(orderDO.getPatient());
        first  = first.replace("key1", null != patient.getName() ? patient.getName() : "");
        JSONObject json = new JSONObject();
        if(consult != null) {
            json.put("consult", consult.getId());
        }else {
            json.put("id", orderDO.getId());
        }
        json.put("id", orderDO.getId());
        List<BasePatientWechatDo> basePatientWechatDos = basePatientWechatDao.findByWechatIdAndPatientId(wxId,patient.getId());
        if (basePatientWechatDos.size()>0){
            String openId = basePatientWechatDos.get(0).getOpenid();
            messageUtil.putTemplateWxMessage(wxId,"template_process_feedback","smyyyqx",openId,first,null,null,30,json, DateUtil.dateToChineseDate(new Date()),"上门预约已取消","已取消");
            messageUtil.putTemplateWxMessage(wxId,"template_process_feedback","smyyyqx",openId,first,null,null,2,json, DateUtil.dateToChineseDate(new Date()),"上门预约已取消","已取消");
        }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/util/MessageUtil.java

@@ -193,6 +193,12 @@ public class MessageUtil {
                wxTemplateConfigDO.setUrl(wxTemplateConfigDO.getUrl() + "?sessionId=" + json.getString("sessionId")
                        +"&type="+json.getString("consultType")+"&openid="+openid);
                break;
            case 2:
                wxTemplateConfigDO.setUrl(wxTemplateConfigDO.getUrl() + "?openid=" + openid+"&id="+json.getString("id"));
                break;
            case 3:
                wxTemplateConfigDO.setUrl(wxTemplateConfigDO.getUrl() + "?openid=" + openid);
                break;
            case 19:
                String urlStr= wxTemplateConfigDO.getUrl();
                boolean status = urlStr.contains("openid=");

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/job/message/PatientSendUnreadJob.java

@@ -1,5 +1,6 @@
package com.yihu.jw.care.job.message;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.care.util.MessageUtil;
import com.yihu.jw.im.util.ImUtil;
import com.yihu.jw.util.date.DateUtil;
@@ -80,7 +81,7 @@ public class PatientSendUnreadJob implements Job {
        String time = DateUtil.getStringDateShort()+" 09:00:00";
        Date timeDate = DateUtil.strToDate(time);
        messageUtil.putTemplateWxMessage(wxId,templateName,scene,openid,first,null,null,null,null,
        messageUtil.putTemplateWxMessage(wxId,templateName,scene,openid,first,null,null,3,new JSONObject(),
                DateUtil.dateToChineseTime2(timeDate),"消息未回复通知","未回复");
    }
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/util/MessageUtil.java

@@ -113,44 +113,8 @@ public class MessageUtil {
            return wxTemplateConfigDO;
        }
        switch (type){
            case 1:
                //咨询回复
                wxTemplateConfigDO.setUrl(wxTemplateConfigDO.getUrl() + "?sessionId=" + json.getString("sessionId")
                        +"&type="+json.getString("consultType"));
                break;
            case 19:
                String urlStr= wxTemplateConfigDO.getUrl();
                boolean status = urlStr.contains("openid=");
                if(!status){
                    urlStr=json.getString("url")+"?openid=" + openid;
                }
                wxTemplateConfigDO.setUrl(url + urlStr );
                break;
            case 30:
                //反馈通知 测试 TPbq9m0SAiVfRhXtXq17SDmYIfrJ8Whp2NpSrq9wlfI
                if(json.containsKey("consult")) {
                    wxTemplateConfigDO.setUrl(url + wxTemplateConfigDO.getUrl() + "?openid=" + openid + "&consult=" + json.getString("consult"));
                }else if (json.containsKey("id")){
                    wxTemplateConfigDO.setUrl(url + wxTemplateConfigDO.getUrl() + "?openid=" + openid + "&id=" + json.getString("id"));
                }else if(json.containsKey("relationCode")){
                    wxTemplateConfigDO.setUrl(url + wxTemplateConfigDO.getUrl() + "?openid=" + openid );
                }else if(json.containsKey("resultCode")){
                    wxTemplateConfigDO.setUrl(url + wxTemplateConfigDO.getUrl() + "?resultCode=" + json.getString("resultCode"));
                }
                break;
            case 31:
                //上门服务医生评分
                wxTemplateConfigDO.setUrl(url + wxTemplateConfigDO.getUrl()+"?openid=" + openid + "&id=" + json.getString("id")+ "&finish=" + json.getString("finish"));
                break;
            case 32:
                String url1 = "wx/common/";
                wxTemplateConfigDO.setUrl(url1 + wxTemplateConfigDO.getUrl()+"?openid=" + openid + "&consult=" + json.getString("consult") + "&status=" + json.getInteger("status"));
                break;
            case 34:
                wxTemplateConfigDO.setUrl(url + wxTemplateConfigDO.getUrl() + "?openid=" + openid + "&orderId=" + json.getString("orderId")+ "&authorizeImage=" + json.getString("authorizeImage"));
                break;
            case 35:
                wxTemplateConfigDO.setUrl(url + wxTemplateConfigDO.getUrl()+json.getString("orderId")+"&isMask=1");
            case 3:
                wxTemplateConfigDO.setUrl(wxTemplateConfigDO.getUrl() + "?openid=" + openid);
                break;
        }
        return wxTemplateConfigDO;