Merge branch 'dev' of liubing/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/patient/PayEndpoint.java

@@ -296,7 +296,9 @@ public class PayEndpoint extends EnvelopRestEndpoint {
                log.error("退款订单不存在");
                return XMLUtil.setXML("SUCCESS", "OK");
            }
            orderDO.setOutRefundNo(desParams.get("refund_id"));
            if (!(orderDO.getOutRefundNo().contains("CAREDISPATCHER"))){
                orderDO.setOutRefundNo(desParams.get("refund_id"));
            }
//            orderDO.setResponseParam(paramsJson);
            // 判断total_amount是否确实为该订单的实际金额（即商户订单创建时的金额），
            String totalFee = desParams.get("refund_fee");

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/pay/PayService.java

@@ -552,9 +552,9 @@ public class PayService {
        if (orderDO.getOutRefundNo().contains("CAREDISPATCHER")){//调度员拒单时 不生成售后订单
            orderRefundDao.delete(orderDO.getId());
        }else {
            businessOrderDO.setStatus(4);
            orderRefundDao.save(orderDO);
        }
        businessOrderDO.setStatus(4);
        businessOrderDao.save(businessOrderDO);
        log.info("【退款通知】成功，type：{}", type);
    }