同城物流对接

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/dao/PrescriptionExpressageDao.java

@@ -14,6 +14,9 @@ import java.util.List;
 */
public interface PrescriptionExpressageDao extends PagingAndSortingRepository<WlyyPrescriptionExpressageDO, String>, JpaSpecificationExecutor<WlyyPrescriptionExpressageDO> {
    @Query("from WlyyPrescriptionExpressageDO p where p.bspOrderNo=?1")
    WlyyPrescriptionExpressageDO findByPrescriptionExpressBspOrderNo(String bspOrderNo);
    @Query("from WlyyPrescriptionExpressageDO p where p.mailno=?1")
    WlyyPrescriptionExpressageDO findByPrescriptionExpressMailno(String mailno);

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -161,6 +161,8 @@ import java.time.Duration;
import java.time.LocalTime;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
@@ -1244,6 +1246,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    expressageDO.setHospitalAddress(baseDrugStoreDO.getAddress());
                }
                expressageDO.setDel(1);
                expressageDO.setType(1);
                expressageDO.setCreateTime(new Date());
                expressageDO.setOutpatientId(outpatient.getId());
                prescriptionExpressageDao.save(expressageDO);
@@ -6058,6 +6061,141 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        }
    }
    /**
     * 顺丰同城物流模版消息
     *
     * @param outpatientId
     * @param prescriptionId
     * @param remindMsg
     */
    public void sendSFTcWxTemplate(String outpatientId,String prescriptionId,String remindMsg){
        String contentMsg = "";
        String first = "";
        String remark = "";
        String patientId = "";
        String drugName = "";
        String patienName = "";
        String mailNo ="";
        String msgUrl ="";
        WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findById(outpatientId);
        List<WlyyPrescriptionInfoDO> wlyyPrescriptionInfoDOS = prescriptionInfoDao.findByPrescriptionId(prescriptionId,1);
        if (wlyyOutpatientDO!=null){
            patientId = wlyyOutpatientDO.getConsumer();
        }
        if (wlyyPrescriptionInfoDOS!=null&&wlyyPrescriptionInfoDOS.size()>0){
            drugName = wlyyPrescriptionInfoDOS.get(0).getDrugName();
        }
        List<WlyyPrescriptionExpressageDO> wlyyPrescriptionExpressageDOS =prescriptionExpressageDao.findByOutpatientId(outpatientId);
        if (wlyyPrescriptionExpressageDOS!=null&&wlyyPrescriptionExpressageDOS.size()>0){
            mailNo = wlyyPrescriptionExpressageDOS.get(0).getMailno();
        }
        BasePatientDO basePatientDO = basePatientDao.findById(patientId);
        if (basePatientDO!=null){
            patienName = basePatientDO.getName();
        }
        if ("xm_ykyy_wx".equalsIgnoreCase(wechatId)||"sd_tnzyy_wx".equalsIgnoreCase(wechatId)){
            List<BasePatientWechatDo> ps = new ArrayList<BasePatientWechatDo>();
            if (StringUtils.isNotEmpty(outpatientId)){
                ps = basePatientWechatDao.findByWechatIdAndPatientId(wechatId, patientId);
            }
            if (ps.isEmpty()) {
                logger.info("该用户" + patienName + "没有openid,无法推送模版消息，用户ID：" + patientId + "wechatId:" + wechatId);
                return;
            }
            WxTemplateConfigDO newConfig = new WxTemplateConfigDO();
            String scene = "sfxxtx";
            WxTemplateConfigDO config = wxTemplateConfigDao.findByWechatIdAndTemplateNameAndSceneAndStatus(wechatId, "template_sf_msg_notice", scene, 1);
            BeanUtils.copyProperties(config, newConfig);
            newConfig.setFirst(config.getFirst().replace("key1",remindMsg));
            newConfig.setKeyword1(config.getKeyword1().replace("key1",patienName).replace("key2",drugName));
            newConfig.setKeyword2("顺丰快递");
            newConfig.setKeyword3(mailNo);
            newConfig.setKeyword4(remindMsg);
            newConfig.setRemark(config.getRemark());
            String path = "returnVisit/logistics?outpatientId="+outpatientId+"&prescriptionCode="+prescriptionId;
            newConfig.setPagepath(newConfig.getPagepath()+ URLEncoder.encode(path));
            newConfig.setUrl(newConfig.getUrl().replace("key1",outpatientId).replace("key2",prescriptionId));
            logger.info("=======setUrl========" + newConfig.getUrl());
            WxAccessTokenDO wxAccessTokenDO = wxAccessTokenService.getWxAccessTokenById(wechatId);
            for (BasePatientWechatDo one : ps) {
                logger.info("发送的消息="+ com.alibaba.fastjson.JSONObject.toJSONString(newConfig));
                try {
                    logger.info("调用眼科微信模板消息接口的入参：AccessToken="+wxAccessTokenDO.getAccessToken()+"---Openid="+one.getOpenid());
                    weixinMessagePushUtils.putWxMsg(wxAccessTokenDO.getAccessToken(), one.getOpenid(), newConfig);
                    logger.info("发送成功");
                } catch (Exception e) {
                    e.printStackTrace();
                    logger.info("发送失败，error="+e.getMessage());
                }
                //保存发送模板记录,
                WxPushLogDO wxPushLogDO = new WxPushLogDO();
                wxPushLogDO.setCreateTime(new Date());
                wxPushLogDO.setOpenid(one.getOpenid());
                wxPushLogDO.setReceiver(patientId);
                wxPushLogDO.setWechatId(wechatId);
                wxPushLogDO.setReceiverName(patienName);
                wxPushLogDO.setScene(scene);
                wxPushLogDao.save(wxPushLogDO);
            }
            //发送极光消息推送
            wxTempalteJPush("logistics_remind",wlyyOutpatientDO,null,drugName,mailNo,remindMsg,prescriptionId);
        }else {
            first = "您好，您的处方订单物流"+remindMsg;
            contentMsg = "药品订单"+remindMsg;
            logger.info("推送物流模板消息参数first："+first+"====contentMsg:"+contentMsg);
            msgUrl="/ims-wx/index.html#/returnVisit/logistics?type=2&outpatientId="+outpatientId+"&prescriptionCode="+prescriptionId;
            String responseMsg = "";
            if ("xm_xzzx_wx".equalsIgnoreCase(wechatId)) {
                //String prefix="https://www.xmheart.com";
                String prefix = "https://ih.xmheart.com/hlwyy";
                if(StringUtils.isNotEmpty(outpatientId)){
                    responseMsg = xzzxEntranceService.sendMes(wechatId,
                            patientId,
                            basePatientDO.getIdcard(),
                            first,
                            contentMsg,
                            remark,
                            prefix+msgUrl);
                }
                logger.info("url="+prefix+msgUrl);
                String msg="first："+first+"contentMsg："+contentMsg+"remark："+remark;
                logger.info("发送的信息="+msg);
                logger.info("心脏模板消息发送返回结果："+responseMsg);
            } else if ("xm_zsyy_wx".equalsIgnoreCase(wechatId)) {
                String prefix = "https://hlwyy.xmzsh.com";
                if (StringUtils.isNotEmpty(outpatientId)) {
                    responseMsg = entranceService.ehospitalNotice(
                            patienName,
                            basePatientDO.getIdcard(),
                            basePatientDO.getMobile(),
                            first,
                            prefix + msgUrl,
                            contentMsg,
                            remark
                    );
                    logger.info("中山发送模板消息返回结果="+responseMsg);
                    System.out.println("结束发送模板消息");
                }
            }
            //保存发送模板记录,
            WxPushLogDO wxPushLogDO = new WxPushLogDO();
            wxPushLogDO.setCreateTime(new Date());
            wxPushLogDO.setReceiver(patientId);
            wxPushLogDO.setWechatId(wechatId);
            wxPushLogDO.setReceiverName(patienName);
            wxPushLogDO.setRequest(first+contentMsg+msgUrl);
            wxPushLogDO.setResponse(responseMsg);
            wxPushLogDO.setTempName("顺丰推送的物流消息");
            wxPushLogDao.save(wxPushLogDO);
        }
    }
    //核算检测预约模板消息
    public void sendNatWxTemplat(String name,String idcard,String mobile,String time,String orderNo,String relationName){
        String first = "";
@@ -8513,7 +8651,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            } else {
                System.out.println("获取顺丰物流面单信息:1");
                sfexpress_obj = expressageDOList.get(0);
                if (sfexpress_obj.getType() == 2) {
                if (sfexpress_obj.getType()!=null&&sfexpress_obj.getType() == 2) {
                    com.alibaba.fastjson.JSONObject sfJsonObject = new com.alibaba.fastjson.JSONObject();
                    sfJsonObject.put("mailno", sfexpress_obj.getMailno());
                    sfJsonObject.put("mailtype", "同城快递");
@@ -8541,6 +8679,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    sfJsonObject.put("pay_method", 2);
                    sfJsonObject.put("receive_time", "");
                    sfJsonObject.put("dispensaryType", 2);
                    sfJsonObject.put("destcode","592AH-002A");
                    for (WlyyPrescriptionDO prescriptionDO:wlyyPrescriptionDOList){
                        prescriptionDO.setStatus(32);
                        prescriptionDao.save(prescriptionDO);
                    }
                    result = sfJsonObject;
                    System.out.println("获取顺丰物流面单信息:8");
                }else {
@@ -11684,7 +11827,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        if (patientDO==null){
            return PageEnvelop.getError("找不到该患者",-1);
        }
        StringBuffer sql = new StringBuffer(" SELECT DISTINCT b.*, c.oneself_pickup_flg,f.job_title_code,f.job_title_name  FROM (SELECT a.* FROM wlyy_prescription a left join wlyy_outpatient o ON o.id=a.outpatient_id  WHERE o.consumer = '");
        StringBuffer sql = new StringBuffer(" SELECT DISTINCT b.*, c.oneself_pickup_flg,c.type,f.job_title_code,f.job_title_name  FROM (SELECT a.* FROM wlyy_prescription a left join wlyy_outpatient o ON o.id=a.outpatient_id  WHERE o.consumer = '");
        StringBuffer countSql = new StringBuffer("select COUNT(DISTINCT b.id) count FROM (SELECT a.* FROM wlyy_prescription a left join wlyy_outpatient o ON o.id=a.outpatient_id  WHERE o.consumer = '");
        /*if (consumerflag){
            sql.append(" WHERE o.consumer = '");
@@ -16990,13 +17133,14 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
     * @param type
     * @return
     */
    public String updateExpressInfo(String realOrder,Integer type){
    public String updateExpressInfo(String realOrder,Integer type) throws Exception {
        String res = "";
        WlyyPrescriptionDO prescriptionDO = prescriptionDao.findByRealOrder(realOrder);
        List<WlyyPrescriptionExpressageDO> expressageDOS = prescriptionExpressageDao.findByOutpatientId(prescriptionDO.getOutpatientId());
        WlyyPrescriptionExpressageDO expressageDO = expressageDOS.get(0);
        if(type==1){
            expressageDO.setType(1);
            expressageDO.setOneselfPickupFlg(0);
            expressageDO.setUpdateTime(new Date());
        }else {
            res = sfUtils.createorder(realOrder);
@@ -17004,4 +17148,84 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        return res;
    }
    public void routeInfo(String json,Integer flag){
        com.alibaba.fastjson.JSONObject obj = com.alibaba.fastjson.JSONObject.parseObject(json);
        String orderId = obj.getString("sf_order_id");
        String order_status =obj.getString("order_status");
        String status_desc  =obj.getString("status_desc");
        String msgContent = unicodeToStr(status_desc);
        WlyyPrescriptionExpressageDO expressageDO = prescriptionExpressageDao.findByPrescriptionExpressBspOrderNo(orderId);
        List<WlyyPrescriptionDO> prescriptionDOS = prescriptionDao.findByOutpatientId(expressageDO.getOutpatientId());
        if(flag==1){
        } else if (flag==2) {
            String cancel_reason = obj.getString("cancel_reason");
            String cancel_code = obj.getString("cancel_code");
            msgContent +=unicodeToStr(cancel_reason);
        } else if(flag==3){
            prescriptionDao.updateStatusByOutPatientId( 100,new Date(),expressageDO.getOutpatientId());
            for (WlyyPrescriptionDO prescriptionDO:prescriptionDOS){
                if (prescriptionDO.getStatus()>=32){
                    WlyyPrescriptionLogDO prescriptionLogDO = new WlyyPrescriptionLogDO();
                    prescriptionLogDO.setCreateTime(new Date());
                    prescriptionLogDO.setStatus(100);
                    prescriptionLogDO.setOutpatientId(prescriptionDO.getOutpatientId());
                    prescriptionLogDO.setPrescriptionCode(prescriptionDO.getPatientCode());
                    prescriptionLogDO.setUserCode(prescriptionDO.getPatientCode());
                    prescriptionLogDO.setUserName(prescriptionDO.getPatientName());
                    prescriptionLogDO.setUserType(1);
                    prescriptionLogDO.setDatajson("处方完成");
                    prescriptionLogDao.save(prescriptionLogDO);
                    logger.info("更新处方日志");
                }
            }
        }
        for (WlyyPrescriptionDO prescriptionDO:prescriptionDOS){
            sendSFTcWxTemplate(prescriptionDO.getOutpatientId(),prescriptionDO.getId(),msgContent);
        }
    }
    private String unicodeToStr(String unicodeCodePoints){
        java.util.regex.Pattern pattern = Pattern.compile("(\\\\u(\\p{XDigit}{4}))");
        Matcher matcher = pattern.matcher(unicodeCodePoints);
        char ch;
        while (matcher.find()) {
            ch = (char) Integer.parseInt(matcher.group(2), 16);
            unicodeCodePoints = unicodeCodePoints.replace(matcher.group(1), ch + "");
        }
        return unicodeCodePoints;
    }
    /**
     * 查询是否符合时间内的同城配送标识
     * @return
     */
    public boolean selectTime(){
        WlyyHospitalSysDictDO sysDictDO = hospitalSysDictDao.findById("sftcTimeLimit");
        boolean flag =false;
        if (StringUtils.isNoneBlank(sysDictDO.getDictValue())){
            com.alibaba.fastjson.JSONObject obj = com.alibaba.fastjson.JSONObject.parseObject(sysDictDO.getDictValue());
            String amStartStr = DateUtil.getStringDateShort()+" "+obj.getString("amStartDate");
            String amEndStr = DateUtil.getStringDateShort()+" "+obj.getString("amEndDate");
            String pmStartStr = DateUtil.getStringDateShort()+" "+obj.getString("pmStartDate");
            String pmEndStr = DateUtil.getStringDateShort()+" "+obj.getString("pmEndDate");
            Date nowDate = new Date();
            Date amStartDate = DateUtil.strToDateLong(amStartStr);
            Date amEndDate = DateUtil.strToDateLong(amEndStr);
            Date pmStartDate = DateUtil.strToDateLong(pmStartStr);
            Date pmEndDate = DateUtil.strToDateLong(pmEndStr);
            if (amStartDate.compareTo(nowDate)<0&&amEndDate.compareTo(nowDate)>0){
                flag = true;
            } else if (pmStartDate.compareTo(nowDate)<0&&pmEndDate.compareTo(nowDate)>0) {
                flag = true;
            }else {
                flag = false;
            }
        }
        return flag;
    }
}

gateway/ag-basic/src/main/java/com/yihu/jw/gateway/filter/PostFilter.java

@@ -138,6 +138,9 @@ public class PostFilter extends ZuulFilter {
            url.contains("/open/noLogin/ylzReceiveNotify")||
            url.contains("/open/noLogin/receiveNotify")||
            url.contains("/open/noLogin/getSFExpressInfoNew")||
            url.contains("/open/noLogin/updateOrderStatus")||
            url.contains("/open/noLogin/sfOrderComplete")||
            url.contains("/open/noLogin/sfOrderCancel")||
            url.contains("/open/noLogin/sfroutepushservice")||
            url.contains("/open/noLogin/ylzSettleRecord")||
                url.contains("/weixin")||url.contains("/oauth/getSsoPublicKey")||

svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/third/PrescriptionUpdateController.java

@@ -185,4 +185,6 @@ public class PrescriptionUpdateController extends EnvelopRestEndpoint {
            return ObjEnvelop.getError("获取面单信息失败,"+e.getMessage());
        }
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

@@ -3076,4 +3076,36 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
            return failedObjEnvelopException(e);
        }
    }
    @RequestMapping(value="/updateOrderStatus",method = RequestMethod.POST)
    @ApiOperation("配送状态更改回调")
    public JSONObject updateOrderStatus(@RequestBody String param){
        logger.info("配送状态更改回调，WaybillRoute="+param);
        JSONObject object = new JSONObject();
        prescriptionService.routeInfo(param,1);
        object.put("error_code",0);
        object.put("error_msg","success");
        return object;
    }
    @RequestMapping(value="/sfOrderCancel",method = RequestMethod.POST)
    @ApiOperation("顺丰原因订单取消回调")
    public JSONObject sfOrderCancel(@RequestBody String param){
        logger.info("顺丰原因订单取消回调，WaybillRoute="+param);
        JSONObject object = new JSONObject();
        prescriptionService.routeInfo(param,2);
        object.put("error_code",0);
        object.put("error_msg","success");
        return object;
    }
    @RequestMapping(value="/sfOrderComplete",method = RequestMethod.POST)
    @ApiOperation("订单完成")
    public JSONObject sfOrderComplete(@RequestBody String param){
        logger.info("订单完成，WaybillRoute="+param);
        JSONObject object = new JSONObject();
        prescriptionService.routeInfo(param,3);
        object.put("error_code",0);
        object.put("error_msg","success");
        return object;
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -171,6 +171,16 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private SFUtils sfUtils;
    @GetMapping(value = "selectTime")
    @ApiOperation(value = "查询是否符合时间内的同城配送标识")
    public ObjEnvelop selectTime() {
        try {
            return ObjEnvelop.getSuccess("success",prescriptionService.selectTime());
        } catch (Exception e) {
            return failedObjEnvelopException(e);
        }
    }
    @PostMapping(value = "updateExpressInfo")
    @ApiOperation(value = "更新配送方式")
    public ObjEnvelop updateExpressInfo(@ApiParam(name = "realOrder", value = "处方号")
@@ -197,9 +207,12 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = "precreateorder")
    @ApiOperation(value = "顺丰同城配送-预创建订单(店铺)")
    public ObjEnvelop precreateorder(@ApiParam(name = "realOrder", value = "处方号")
                                    @RequestParam(value = "realOrder", required = true) String realOrder) {
                                    @RequestParam(value = "realOrder", required = true) String realOrder,
                                     @ApiParam(name = "json", value = "物流信息")
                                     @RequestParam(value = "json", required = true) String json) {
        try {
            return ObjEnvelop.getSuccess("success",sfUtils.precreateorder(realOrder));
            WlyyPrescriptionExpressageDO expressageDO = objectMapper.readValue(json, WlyyPrescriptionExpressageDO.class);
            return ObjEnvelop.getSuccess("success",sfUtils.precreateorder(realOrder,expressageDO));
        } catch (Exception e) {
            return failedObjEnvelopException(e);
        }
@@ -216,7 +229,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        }
    }
    @PostMapping(value = "Sflistorderfeed")
    @PostMapping(value = "sflistorderfeed")
    @ApiOperation(value = "顺丰同城配送-订单状态流查询")
    public ObjEnvelop listorderfeed(@ApiParam(name = "realOrder", value = "处方号")
                                  @RequestParam(value = "realOrder", required = true) String realOrder) {