diff --git a/doc/bocom-api-sdk_v1_条码/example/com/bocom/api/example/pmssMpng/MPNG210003V1Test.java b/doc/bocom-api-sdk_v1_条码/example/com/bocom/api/example/pmssMpng/MPNG210003V1Test.java index a5d8f96..e140f21 100644 --- a/doc/bocom-api-sdk_v1_条码/example/com/bocom/api/example/pmssMpng/MPNG210003V1Test.java +++ b/doc/bocom-api-sdk_v1_条码/example/com/bocom/api/example/pmssMpng/MPNG210003V1Test.java @@ -113,7 +113,7 @@ public class MPNG210003V1Test { MPNG210003ResponseV1.RspHead rspHead = response.getRspHead(); String responseStatus = rspHead.getResponseStatus(); - System.out.println("[交行]二维码下单返回 resp={}" + JSON.toJSONString(response)); + System.out.println("【交行】二维码下单返回 resp={}" + JSON.toJSONString(response)); if (response.isSuccess() && "S".equals(response.getBizState()) && "S".equals(responseStatus)) { System.out.println("success"); MPNG210003ResponseV1.RspBody rspBody = response.getRspBody(); diff --git a/doc/bocom-api-sdk_v1_条码/example/com/bocom/api/example/pmssMpng/PmmsMpngNotify.java b/doc/bocom-api-sdk_v1_条码/example/com/bocom/api/example/pmssMpng/PmmsMpngNotify.java index f4e46b1..5a724d4 100644 --- a/doc/bocom-api-sdk_v1_条码/example/com/bocom/api/example/pmssMpng/PmmsMpngNotify.java +++ b/doc/bocom-api-sdk_v1_条码/example/com/bocom/api/example/pmssMpng/PmmsMpngNotify.java @@ -49,7 +49,7 @@ public class PmmsMpngNotify { // MPNG210003ResponseV1.RspHead rspHead = response.getRspHead(); // String responseStatus = rspHead.getResponseStatus(); // -// System.out.println("[交行]二维码下单返回 resp={}" + JSON.toJSONString(response)); +// System.out.println("【交行】二维码下单返回 resp={}" + JSON.toJSONString(response)); // if (response.isSuccess() && "S".equals(response.getBizState()) && "S".equals(responseStatus)) { // System.out.println("success"); // MPNG210003ResponseV1.RspBody rspBody = response.getRspBody(); diff --git a/doc/bocom-api-sdk_v1_条码/example/com/bocom/api/example/pmssMpng/RefundMoney_MPNG020701V1Test.java b/doc/bocom-api-sdk_v1_条码/example/com/bocom/api/example/pmssMpng/RefundMoney_MPNG020701V1Test.java index 6325b84..452d8df 100644 --- a/doc/bocom-api-sdk_v1_条码/example/com/bocom/api/example/pmssMpng/RefundMoney_MPNG020701V1Test.java +++ b/doc/bocom-api-sdk_v1_条码/example/com/bocom/api/example/pmssMpng/RefundMoney_MPNG020701V1Test.java @@ -62,7 +62,7 @@ public class RefundMoney_MPNG020701V1Test { request.setBizContent(bizContent); MPNG020701ResponseV1 response = client.execute(request, UUID.randomUUID().toString().replace("-", "")); - System.out.println("[交行]退款 resp={}" + JSON.toJSONString(response)); + System.out.println("【交行】退款 resp={}" + JSON.toJSONString(response)); if (response.isSuccess()) { System.out.println("success"); } else { diff --git a/src/main/java/com/ynxbd/bcm/config/BCMConfig.java b/src/main/java/com/ynxbd/bcm/config/BCMConfig.java index 500e63a..b192d8e 100644 --- a/src/main/java/com/ynxbd/bcm/config/BCMConfig.java +++ b/src/main/java/com/ynxbd/bcm/config/BCMConfig.java @@ -27,7 +27,7 @@ public class BCMConfig { if (isEnable) { IS_DEV = config.getBoolean("bcm.is_dev", false); if (IS_DEV) { - log.info("[交行]配置文件当前为测试环境-----------------------"); + log.info("【交行】配置文件当前为测试环境-----------------------"); config = new ProperHelper().read("bcm/bcm-dev.properties"); } @@ -47,7 +47,7 @@ public class BCMConfig { } if (APP_ID == null || MER_PTC_ID == null) { - log.error("[交行]读取配置文件bcm.properties失败"); + log.error("【交行】读取配置文件bcm.properties失败"); } } diff --git a/src/main/java/com/ynxbd/common/action/RegisterAction.java b/src/main/java/com/ynxbd/common/action/RegisterAction.java index d2152bf..8fad497 100644 --- a/src/main/java/com/ynxbd/common/action/RegisterAction.java +++ b/src/main/java/com/ynxbd/common/action/RegisterAction.java @@ -682,7 +682,7 @@ public class RegisterAction extends BaseAction { // } // // /** -// * [现场挂号]获取指定科室医生信息 +// * [今日挂号]获取指定科室医生信息 // */ // @Action("getSiteDoctorList") // public String getSiteDoctorList() { diff --git a/src/main/java/com/ynxbd/common/action/pay/BcmPayAction.java b/src/main/java/com/ynxbd/common/action/pay/BcmPayAction.java index a79d496..af266a3 100644 --- a/src/main/java/com/ynxbd/common/action/pay/BcmPayAction.java +++ b/src/main/java/com/ynxbd/common/action/pay/BcmPayAction.java @@ -23,7 +23,7 @@ import java.util.Date; public class BcmPayAction extends BaseAction { /** - * [交行]处方支付通知 + * 【交行】处方支付通知 * * @return 是否成功 */ diff --git a/src/main/java/com/ynxbd/common/action/pay/MedicalAction.java b/src/main/java/com/ynxbd/common/action/pay/MedicalAction.java index 7537d55..51131a8 100644 --- a/src/main/java/com/ynxbd/common/action/pay/MedicalAction.java +++ b/src/main/java/com/ynxbd/common/action/pay/MedicalAction.java @@ -382,7 +382,7 @@ public class MedicalAction extends BaseAction { @Action("payNotify") public Result payNotify() { try { - log.info("[微信医保]回调通知..."); + log.info("【微信-医保】回调通知..."); MedicalNotify notifyInfo = WxMedHelper.paidMedNotify(request); // 成功返回 Result.respXml(MedRespHelper.respOk(WxMedConfig.PAY_KEY)); @@ -397,7 +397,7 @@ public class MedicalAction extends BaseAction { String notifyType = notifyInfo.getAttach(); - log.info("[微信医保][{}] 收到通知 outTradeNo={}, bankTransNo={}, notifyType={}", + log.info("【微信-医保】[{}] 收到通知 outTradeNo={}, bankTransNo={}, notifyType={}", notifyType, outTradeNo, bankTransNo, notifyType); new MedicalService().commonNotify(MerchantEnum.WX_MEDICAL, notifyType, outTradeNo, totalFee, bankTransNo, payDate, payTime, openid, payInfo); diff --git a/src/main/java/com/ynxbd/common/action/pay/MedicalTestAction.java b/src/main/java/com/ynxbd/common/action/pay/MedicalTestAction.java index e9afe19..a5df09f 100644 --- a/src/main/java/com/ynxbd/common/action/pay/MedicalTestAction.java +++ b/src/main/java/com/ynxbd/common/action/pay/MedicalTestAction.java @@ -137,7 +137,7 @@ public class MedicalTestAction extends BaseAction { */ @Action("queryWxOrder") public Result queryWxOrder(String accessToken, String outTradeNo, String medTransId) { - log.info("[微信医保]订单查询 outTradeNo={}, medTransId={}", outTradeNo, medTransId); + log.info("【微信-医保】订单查询 outTradeNo={}, medTransId={}", outTradeNo, medTransId); WxMedOrder order = WxMedHelper.queryOrder(accessToken, outTradeNo, medTransId); if (order.isOk()) { return Result.success(order); diff --git a/src/main/java/com/ynxbd/common/bean/pay/Register.java b/src/main/java/com/ynxbd/common/bean/pay/Register.java index 365f9d4..f24e052 100644 --- a/src/main/java/com/ynxbd/common/bean/pay/Register.java +++ b/src/main/java/com/ynxbd/common/bean/pay/Register.java @@ -49,7 +49,7 @@ public class Register extends Order { private String tid; // 时段名 private String tName; - // 挂号类型(1:预约挂号,2:现场挂号,3:分时段预约挂号,4:分时段现场挂号) + // 挂号类型(1:预约挂号,2:今日挂号,3:分时段预约挂号,4:分时段今日挂号) private String regType; // 挂号日期 private String regDate; diff --git a/src/main/java/com/ynxbd/common/dao/AccountsDao.java b/src/main/java/com/ynxbd/common/dao/AccountsDao.java index aaf6ead..314f297 100644 --- a/src/main/java/com/ynxbd/common/dao/AccountsDao.java +++ b/src/main/java/com/ynxbd/common/dao/AccountsDao.java @@ -31,7 +31,7 @@ public class AccountsDao { "group by date_format(updatetime,'%Y-%m-%d')\n" + "union all\n" + "select CONCAT(date_format(updatetime,'%Y%m%d'), '3') as no, date_format(updatetime,'%Y-%m-%d') as date, " + - "count(*) as 'count' , sum(paymoney) as 'sumMoney', '现场挂号' as description from register " + + "count(*) as 'count' , sum(paymoney) as 'sumMoney', '今日挂号' as description from register " + "where paystatus = 0 and hisstatus = 0 and (RegType = 1 or updatetime >= regdate) and updatetime BETWEEN '" + begDate + "' and DATE_ADD('" + endDate + "',INTERVAL 1 DAY)\n" + "group by date_format(updatetime,'%Y-%m-%d') \n" + "union all\n" + diff --git a/src/main/java/com/ynxbd/common/dao/RegisterDao.java b/src/main/java/com/ynxbd/common/dao/RegisterDao.java index b09dd9a..0e8332f 100644 --- a/src/main/java/com/ynxbd/common/dao/RegisterDao.java +++ b/src/main/java/com/ynxbd/common/dao/RegisterDao.java @@ -518,10 +518,11 @@ public class RegisterDao { * @param outTradeNo 订单号 * @return 是否成功 */ - public boolean updateHisPaidByOutTradeNo(String outTradeNo) { - String sql = "update register set payStatus=0, hisStatus=0 where outTradeNo=? and hisStatus= -1"; + public boolean updateHisPaidByOutTradeNo(String outTradeNo, String invoiceTransNo) { + String sql = "update register set payStatus=0, hisStatus=0, invoiceTransNo=? where outTradeNo=? and hisStatus= -1"; return DataBase.update(sql, ps -> { - ps.setString(1, outTradeNo); + ps.setString(1, invoiceTransNo); + ps.setString(2, outTradeNo); }) > 0; } diff --git a/src/main/java/com/ynxbd/common/dao/his/HisRegisterDao.java b/src/main/java/com/ynxbd/common/dao/his/HisRegisterDao.java index 196bccb..6e86c5a 100644 --- a/src/main/java/com/ynxbd/common/dao/his/HisRegisterDao.java +++ b/src/main/java/com/ynxbd/common/dao/his/HisRegisterDao.java @@ -125,14 +125,14 @@ public class HisRegisterDao { } /** - * [现场挂号]获取现场挂号医生列表 + * [今日挂号]获取今日挂号医生列表 * * @param deptCode 科室代码 * @param timeInterval 挂号时段显示 * @return 医生列表 */ public List getRegTodayDoctorList(String deptCode, String timeInterval) { - log.info("[现场挂号]查询HIS医生列表 deptCode={}", deptCode); + log.info("[今日挂号]查询HIS医生列表 deptCode={}", deptCode); Map params = new HashMap<>(); params.put("DeptCode", deptCode); @@ -261,7 +261,7 @@ public class HisRegisterDao { // 晚班 boolean isNight = night != null && nightBegTime != null && nightEndTime != null && DateHelper.inTimeRangeH_m_s(nightBegTime, nightEndTime); - log.info("【现场挂号】时段{{}}", key); + log.info("【今日挂号】时段{{}}", key); Register register; for (Doctor doctor : doctorList) { @@ -365,7 +365,7 @@ public class HisRegisterDao { /** - * [现场挂号]获取科室列表 + * [今日挂号]获取科室列表 * * @param hasSourcesFlag 有号源标识 { 1:仅返回有号源科室; 0:有无号源科室都返回(默认值)} * @return 科室列表 @@ -379,7 +379,7 @@ public class HisRegisterDao { hasSourcesFlag = "1"; } - log.info("[现场挂号]查询HIS科室列表"); + log.info("[今日挂号]查询HIS科室列表"); List resultList = new ArrayList<>(); Map params = new HashMap<>(); @@ -490,6 +490,7 @@ public class HisRegisterDao { reg.setBegTime(node.getString("BegTime")); reg.setEndTime(node.getString("EndTime")); reg.setRefundDate(node.getString("RefundDate")); + reg.setTradeNo(node.getString("TransNo")); // 是否取号 reg.setIsTake(node.getInteger("IsTake")); // 是否就诊 @@ -562,8 +563,8 @@ public class HisRegisterDao { reg.setRegDate(node.getString("ReservationDate")); // 日期 reg.setHisTransNo(node.getString("HISTransNo")); // HIS流水号 - reg.setTradeNo(node.getString("ReservationTransNo")); // HIS交易流水号 - reg.setHospitalArea(node.getString("HospitalAreaName")); // HIS交易流水号 + reg.setTradeNo(node.getString("ReservationTransNo")); // 与HIS交易的流水号 + reg.setHospitalArea(node.getString("HospitalAreaName")); // 园区 reg.setBegTime(node.getString("BegTime")); reg.setEndTime(node.getString("EndTime")); // 金额 diff --git a/src/main/java/com/ynxbd/common/helper/his/HisEnum.java b/src/main/java/com/ynxbd/common/helper/his/HisEnum.java index 151a626..0b09472 100644 --- a/src/main/java/com/ynxbd/common/helper/his/HisEnum.java +++ b/src/main/java/com/ynxbd/common/helper/his/HisEnum.java @@ -26,8 +26,8 @@ public enum HisEnum { AP_Query_InspectionApplication("[报告]检验(化验)申请单", "5002", "AP_Query_InspectionApplication", false), // 挂号记录--------------- - AP_Query_Regist("[现场挂号]查询现场挂号记录", "2004", "AP_Query_Regist", true), - AP_Query_Reservation("[预约挂号]查询预约挂号记录", "3004", "AP_Query_Reservation", true), + AP_Query_Regist("[挂号记录]查询历史挂号记录", "2004", "AP_Query_Regist", true), + AP_Query_Reservation("[预约挂号]查询预约记录", "3004", "AP_Query_Reservation", true), // 分时段挂号--------- AP_Query_Dept_New("[分时段挂号]查询科室列表", "7001", "AP_Query_Dept_New", false), @@ -37,9 +37,9 @@ public enum HisEnum { AP_Occupy_Source_New("[分时段挂号]占号", "7005", "AP_Occupy_Source_New", true), // 普通挂号--------------- - AP_Regist("[现场挂号]执行挂号", "2003", "AP_Regist", true), - AP_Query_Dept("[现场挂号]查询科室列表", "2001", "AP_Query_Dept", true), - AP_Query_Doct("[现场挂号]根据科室查询医生列表", "2002", "AP_Query_Doct", true), + AP_Regist("[今日挂号]执行挂号", "2003", "AP_Regist", true), + AP_Query_Dept("[今日挂号]查询科室列表", "2001", "AP_Query_Dept", true), + AP_Query_Doct("[今日挂号]根据科室查询医生列表", "2002", "AP_Query_Doct", true), // ---------------------- AP_Query_Reservation_Dept("[预约挂号]查询科室列表", "3001", "AP_Query_Reservation_Dept", true), AP_Query_Reservation_Doct("[预约挂号]根据科室查询医生列表", "3002", "AP_Query_Reservation_Doct", true), diff --git a/src/main/java/com/ynxbd/common/service/MedicalService.java b/src/main/java/com/ynxbd/common/service/MedicalService.java index 905adb6..5d86f22 100644 --- a/src/main/java/com/ynxbd/common/service/MedicalService.java +++ b/src/main/java/com/ynxbd/common/service/MedicalService.java @@ -121,7 +121,6 @@ public class MedicalService { } - /** * [医保]his下单 * @@ -524,9 +523,11 @@ public class MedicalService { return false; } - log.info("[医保][挂号]HIS结算成功 outTradeNo={}, bankTransNo={}", outTradeNo, bankTransNo); + String invoiceTransNo = jsonResult.getDataMapString("InvoiceTransNo"); + + log.info("[医保][挂号]HIS结算成功 outTradeNo={}, bankTransNo={}, invoiceTransNo={}", outTradeNo, bankTransNo, invoiceTransNo); // 成功处理 - if (!regDao.updateHisPaidByOutTradeNo(outTradeNo)) { + if (!regDao.updateHisPaidByOutTradeNo(outTradeNo, invoiceTransNo)) { log.error("[医保][挂号]修改成功数据失败"); } return true; diff --git a/src/main/java/com/ynxbd/common/service/RegService.java b/src/main/java/com/ynxbd/common/service/RegService.java index a71d05a..30811f8 100644 --- a/src/main/java/com/ynxbd/common/service/RegService.java +++ b/src/main/java/com/ynxbd/common/service/RegService.java @@ -56,7 +56,7 @@ public class RegService { return null; } - // 挂号类型:1:预约挂号,2:现场挂号,3:分时段预约挂号,4:分时段现场挂号 + // 挂号类型:1:预约挂号,2:今日挂号,3:分时段预约挂号,4:分时段今日挂号 if (isSplitTime) { return DateHelper.isToday(regDate) ? "4" : "3"; // 判断是否是今天 } @@ -135,7 +135,7 @@ public class RegService { reg.setBankTransNo(bankTransNo); reg.setTradeNo(tradeNo); - // 挂号类型:1:预约挂号,2:现场挂号;3:分时段预约挂号,4:分时段现场挂号 + // 挂号类型:1:预约挂号,2:今日挂号;3:分时段预约挂号,4:分时段今日挂号 regType = reg.getRegType(); patientId = reg.getPatientId(); if (ObjectUtils.isEmpty(patientId) || ObjectUtils.isEmpty(regType) || ObjectUtils.isEmpty(reg.getRegDate())) { @@ -155,7 +155,7 @@ public class RegService { log.info("{} 开始调用HIS挂号:patientId={}, bankTransNo={}", merchantEnum.NAME, patientId, bankTransNo); String hisTransNo = null, treatNum = null, hisQueueNo, callNum = null, invoiceTransNo = null; - // 挂号类型:1:预约挂号,2:现场挂号;3:分时段预约挂号,4:分时段现场挂号 + // 挂号类型:1:预约挂号,2:今日挂号;3:分时段预约挂号,4:分时段今日挂号 JsonResult jsonResult; if ("1".equals(regType) || "2".equals(regType)) { // 挂号 log.info("[挂号]开始执行"); @@ -827,7 +827,7 @@ public class RegService { */ public Register queryRegByHisInfo(String patientId, String tradeNo, String hisTransNo) throws ServiceException { Register register; - log.info("[挂号订单]根据信息查询订单 patientId={}, hisTransNo={} tradeNo={}", patientId, hisTransNo, tradeNo); + log.info("[挂号订单]根据信息查询订单 patientId={}, hisTransNo={}, tradeNo={}", patientId, hisTransNo, tradeNo); if (ObjectUtils.isEmpty(patientId)) { return null; } @@ -966,20 +966,20 @@ public class RegService { * @param openId openId */ public boolean completeRegTreatNum(String treatNum, String openId, String patientId, String tradeNo, String hisTransNo, String orderFromOwner) throws ServiceException { - if (!ObjectUtils.isEmpty(orderFromOwner) && !"蓝旗".equals(orderFromOwner)) { + if (!ObjectUtils.isEmpty(orderFromOwner) && !"蓝旗".equals(orderFromOwner)) { // 不是线上挂号 return true; } RegisterDao regDao = new RegisterDao(); Register findInfo = queryRegByHisInfo(patientId, tradeNo, hisTransNo); if (findInfo == null) { - throw new ServiceException("未找到挂号信息"); + throw new ServiceException("未找到线上挂号信息"); // 本地数据中未找到 } Long id = findInfo.getId(); String curDate = DateHelper.getCurDate(); if (!curDate.equals(findInfo.getRegDate())) { throw new ServiceException("不是今日就诊"); } - if (!ObjectUtils.isEmpty(findInfo.getTreatNum())) { //就诊号不为空=>无需补充门诊号 + if (!ObjectUtils.isEmpty(findInfo.getTreatNum())) { // 就诊号不为空=>无需补充门诊号 return true; } return regDao.updateTreatNum(id, treatNum) > 0; diff --git a/src/main/java/com/ynxbd/wx/remove/dao/WSDao.java b/src/main/java/com/ynxbd/wx/remove/dao/WSDao.java index 1a6f98b..ed1f81e 100644 --- a/src/main/java/com/ynxbd/wx/remove/dao/WSDao.java +++ b/src/main/java/com/ynxbd/wx/remove/dao/WSDao.java @@ -66,9 +66,9 @@ // } // // /** -// * 获取现场挂号科室列表 +// * 获取今日挂号科室列表 // * -// * @return 现场挂号科室列表 +// * @return 今日挂号科室列表 // */ // public List getRegDeptList() { // List list = new ArrayList<>(); @@ -171,7 +171,7 @@ // } // // /** -// * 获取现场挂号医生列表 +// * 获取今日挂号医生列表 // * // * @param deptCode 科室代码 // * @return 医生列表 diff --git a/src/main/java/com/ynxbd/wx/wxfactory/WxMedHelper.java b/src/main/java/com/ynxbd/wx/wxfactory/WxMedHelper.java index 81886d3..23027c2 100644 --- a/src/main/java/com/ynxbd/wx/wxfactory/WxMedHelper.java +++ b/src/main/java/com/ynxbd/wx/wxfactory/WxMedHelper.java @@ -153,7 +153,7 @@ public class WxMedHelper { public static Map createOrder(OrderMIEnum OrderMIEnum, String openid, String outTradeNo, String serialNo, String cardNo, String realName, String ip, String payOrdId, String payAuthNo, BigDecimal totalFee, BigDecimal insuranceFee, BigDecimal cashFee, String body, String callbackUrl, String notifyUrl, String attach, String familyType, String familyName, String familyCardNo) throws ServiceException { Map map = new HashMap<>(); - log.info("[微信医保]下单 outTradeNo={}, openid={}, cardNo={}, realName={}, payOrdId={}, payAuthNo={}, totalFee={}, insuranceFee={}, cashFee={}, familyType={}, familyName={}, familyCardNo={}" + log.info("【微信-医保】下单 outTradeNo={}, openid={}, cardNo={}, realName={}, payOrdId={}, payAuthNo={}, totalFee={}, insuranceFee={}, cashFee={}, familyType={}, familyName={}, familyCardNo={}" , outTradeNo, openid, cardNo, realName, payOrdId, payAuthNo, totalFee, insuranceFee, cashFee, familyType, familyName, familyCardNo); MedicalPayOrder order = WxFactory.Medical.Common().createOrder(OrderMIEnum, WxCacheHelper.getAccessToken(), diff --git a/src/main/java/com/ynxbd/wx/wxfactory/WxPayHelper.java b/src/main/java/com/ynxbd/wx/wxfactory/WxPayHelper.java index a3f1861..8ee4328 100644 --- a/src/main/java/com/ynxbd/wx/wxfactory/WxPayHelper.java +++ b/src/main/java/com/ynxbd/wx/wxfactory/WxPayHelper.java @@ -82,23 +82,23 @@ public class WxPayHelper { Map paramsMap = WxSignHelper.reqXmlParamsMap(request); log.info("【微信回调】map={}", paramsMap); if (paramsMap == null) { - throw new ServiceException("【微信】回调通知下单信息返回错误"); + throw new ServiceException("【微信回调】通知下单信息返回错误"); } // 签名验证 if (!WxSignHelper.validateSign(paramsMap, WeChatConfig.MCH_KEY)) { // 验证未通过,通知支付失败 - throw new ServiceException("【微信】回调通知签名验证未通过!"); + throw new ServiceException("【微信回调】通知签名验证未通过!"); } String json = JsonHelper.toJsonString(paramsMap); if (ObjectUtils.isEmpty(json)) { - throw new ServiceException("【微信】回调通知下单信息为空"); + throw new ServiceException("【微信回调】通知下单信息为空"); } WxPayNotify notifyInfo = JsonHelper.parseObject(json, WxPayNotify.class); log.info("【微信回调】notifyInfo={}", notifyInfo); if (notifyInfo == null) { - throw new ServiceException("【微信】回调通知下单信息转换失败"); + throw new ServiceException("【微信回调】通知下单信息转换失败"); } String openid = notifyInfo.getOpenid(); @@ -1176,7 +1176,7 @@ public class WxPayHelper { public static WxNativePayResult createNativeOrder(String notifyUrl, String title, BigDecimal totalFee, String outTradeNo, String notifyType, String ip) { try { if (ObjectUtils.isEmpty(outTradeNo) || ObjectUtils.isEmpty(notifyUrl) || totalFee == null || notifyType == null) { - log.info("【微信】Native下单参数缺失"); + log.info("Native下单参数缺失"); return null; } diff --git a/src/main/java/com/ynxbd/wx/wxfactory/medical/Client.java b/src/main/java/com/ynxbd/wx/wxfactory/medical/Client.java index 86bb403..1094cdc 100644 --- a/src/main/java/com/ynxbd/wx/wxfactory/medical/Client.java +++ b/src/main/java/com/ynxbd/wx/wxfactory/medical/Client.java @@ -142,11 +142,11 @@ public class Client { params.put("channel_no", channel); // 渠道号 //---------------------------------------------------------------- params.put("sign", WxSignHelper.generateSign(params, WxSignHelper.SIGN_TYPE_MD5, mdPayKey)); - // [微信医保]测试报告内容[3] - log.info("[微信医保][下单] req={}", JsonHelper.toJsonString(params)); + // 【微信-医保】测试报告内容[3] + log.info("【微信-医保】[下单] req={}", JsonHelper.toJsonString(params)); }); - log.info("[微信医保][下单] resp={}", JsonHelper.toJsonString(jsonResult)); + log.info("【微信-医保】[下单] resp={}", JsonHelper.toJsonString(jsonResult)); if (!jsonResult.success()) { return new MedicalPayOrder().createResult(jsonResult); } @@ -329,7 +329,7 @@ public class Client { * @return 用户信息 */ public MedicalUserInfo getUserInfo(String reqUrl, String openid, String qrcode) { - log.info("[微信医保][授权]请求地址-{}", reqUrl); + log.info("【微信-医保】[授权]请求地址-{}", reqUrl); MedicalUserInfo info = new MedicalUserInfo(); String timestamp = Long.toString(System.currentTimeMillis()); @@ -341,8 +341,8 @@ public class Client { JSONObject respJson = OkHttpHelper.postForm(reqUrl, params -> { params.put("qrcode", qrcode); params.put("openid", openid); - // [微信医保]测试报告内容[1] - log.info("[微信医保][授权] req={}", JsonHelper.toJsonString(params)); + // 【微信-医保】测试报告内容[1] + log.info("【微信-医保】[授权] req={}", JsonHelper.toJsonString(params)); }, headers -> { headers.set("Accept", "application/json"); headers.set("Content-Type", "application/json"); @@ -359,7 +359,7 @@ public class Client { String message = respJson.getString("message"); log.info("respJson={}", JsonHelper.toJsonString(respJson)); if (!"0".equals(code)) { - log.error("[微信医保][授权]失败 resp={}", respJson); + log.error("【微信-医保】[授权]失败 resp={}", respJson); info.setMessage(String.format("[%s] %s", code, message)); return info; @@ -381,7 +381,7 @@ public class Client { info.setCardNo(cardNo); respJson.remove("user_card_no"); } - log.error("[微信医保][授权]返回 resp={}", respJson); + log.error("【微信-医保】[授权]返回 resp={}", respJson); info.setUserName(userName); info.setPayAuthNo(payAuthNo); diff --git a/src/main/java/com/ynxbd/wx/wxfactory/message/MdClient.java b/src/main/java/com/ynxbd/wx/wxfactory/message/MdClient.java index 443e20c..db3fc00 100644 --- a/src/main/java/com/ynxbd/wx/wxfactory/message/MdClient.java +++ b/src/main/java/com/ynxbd/wx/wxfactory/message/MdClient.java @@ -110,7 +110,7 @@ public class MdClient { * * @param hospitalName 医院名称,含院区(如果有) * @param url 链接 - * @param status 1001-预约挂号成功通知,1004-现场挂号成功通知,1002-取消预约挂号通知 + * @param status 1001-预约挂号成功通知,1004-今日挂号成功通知,1002-取消预约挂号通知 * @param patCardNo 用户证件号md5 * @param patHospitalId 用户就诊卡号 * @param patName 患者姓名李*龙 ,张 *,姓名需打码 diff --git a/src/main/java/com/ynxbd/wx/wxfactory/utils/WxRespHelper.java b/src/main/java/com/ynxbd/wx/wxfactory/utils/WxRespHelper.java index e96c36e..c8f7010 100644 --- a/src/main/java/com/ynxbd/wx/wxfactory/utils/WxRespHelper.java +++ b/src/main/java/com/ynxbd/wx/wxfactory/utils/WxRespHelper.java @@ -24,7 +24,7 @@ public class WxRespHelper { * 成功响应 */ public static String respOk() { - log.info("【微信】回调通知成功"); + log.info("【微信回调】通知成功"); try { Map map = new HashMap<>(); map.put("return_code", "SUCCESS");