diff --git a/src/main/java/com/ynxbd/common/action/SmsAction.java b/src/main/java/com/ynxbd/common/action/SmsAction.java index 25d6901..5550cb5 100644 --- a/src/main/java/com/ynxbd/common/action/SmsAction.java +++ b/src/main/java/com/ynxbd/common/action/SmsAction.java @@ -49,12 +49,16 @@ public class SmsAction extends BaseAction { // 生成验证码 String code = CodeHelper.getRandomCode(6); switch (callNo) { - case "peis_report": // 体检报告 + case "general": // 通用模板【您的验证码${code},您正进行身份验证,该验证码5分钟内有效,请勿泄漏于他人!】 + isFlag = SmsHelper.sendCode("SMS_257021489", tel, code); + break; + + case "peis_report": // 体检报告【您的校验码:${code},您正在查看体检报告,感谢您的支持!】 isFlag = SmsHelper.sendCode("SMS_164268358", tel, code); break; case "user_bind": // 用户绑定 - isFlag = SmsHelper.sendCode("SMS_164268358", tel, code); + isFlag = SmsHelper.sendCode("SMS_257021489", tel, code); break; default: diff --git a/src/main/java/com/ynxbd/common/action/XBDAction.java b/src/main/java/com/ynxbd/common/action/XBDAction.java index fe9046e..cc88174 100644 --- a/src/main/java/com/ynxbd/common/action/XBDAction.java +++ b/src/main/java/com/ynxbd/common/action/XBDAction.java @@ -203,10 +203,12 @@ public class XBDAction extends BaseAction { addInfo.setGetWay(getWay); addInfo.setAddress(address); addInfo.setPhone(phone); + + addInfo.setApplyId(applyId); addInfo.setPayStatus(-2); // 预约标识 if (!service.addResApply(addInfo, openId, patientId)) { - log.info("[病历复印]预约申请信息存储失败 patientId={}, openId={}, patientId={}", patientId, openId, patientId); + log.info("[病历复印]预约申请信息存储失败 patientId={}, openId={}, applyId={}", patientId, openId, applyId); return Result.error(ResultEnum.SPECIFIED_QUESTIONED_USER_NOT_EXIST); } diff --git a/src/main/java/com/ynxbd/common/action/test/TestAction.java b/src/main/java/com/ynxbd/common/action/test/TestAction.java index eef6dcf..653f88e 100644 --- a/src/main/java/com/ynxbd/common/action/test/TestAction.java +++ b/src/main/java/com/ynxbd/common/action/test/TestAction.java @@ -1,10 +1,12 @@ package com.ynxbd.common.action.test; import com.ynxbd.common.action.base.BaseAction; +import com.ynxbd.common.bean.pay.PayCasebook; import com.ynxbd.common.helper.common.DateHelper; import com.ynxbd.common.result.Result; import com.ynxbd.common.result.ResultEnum; import com.ynxbd.common.result.ServiceException; +import com.ynxbd.common.service.CasebookService; import com.ynxbd.wx.wxfactory.medical.WxMedConfig; import lombok.extern.slf4j.Slf4j; import org.apache.struts2.convention.annotation.Action; diff --git a/src/main/java/com/ynxbd/common/bean/pay/Order.java b/src/main/java/com/ynxbd/common/bean/pay/Order.java index a71dd42..a97d58c 100644 --- a/src/main/java/com/ynxbd/common/bean/pay/Order.java +++ b/src/main/java/com/ynxbd/common/bean/pay/Order.java @@ -75,13 +75,6 @@ public class Order implements Serializable { private Integer payStatus; // HIS通知状态 private Integer hisStatus; - // --------------------------------------- - // 通知状态 - private Integer payState; - // 通知状态 - private Integer noticeState; - // 通知返回提示 - private Integer noticeResult; // -------------------------------------- // HIS返回提示 private String hisResult; @@ -151,6 +144,9 @@ public class Order implements Serializable { // 第三方回调状态(-1:未调用,0:调用成功,500:调用超时,其他:调用失败) private Integer noticeStatus; + // 第三方返回结果 + private String noticeResult; + // 订单额外信息 private Object orderObj; diff --git a/src/main/java/com/ynxbd/common/dao/CasebookDao.java b/src/main/java/com/ynxbd/common/dao/CasebookDao.java index fa1b4c1..7dbb376 100644 --- a/src/main/java/com/ynxbd/common/dao/CasebookDao.java +++ b/src/main/java/com/ynxbd/common/dao/CasebookDao.java @@ -27,7 +27,7 @@ public class CasebookDao { ps.setString(8, casebook.getAddress()); ps.setString(9, casebook.getPhone()); ps.setString(10, casebook.getApplyId()); - ps.setInt(11, casebook.getPayState()); + ps.setInt(11, casebook.getPayStatus()); ps.setString(12, casebook.getOutTradeNo()); ps.setBigDecimal(13, casebook.getTotalFee()); ps.setBigDecimal(14, casebook.getPayMoney()); diff --git a/src/main/java/com/ynxbd/common/dao/OutCollectPayDao.java b/src/main/java/com/ynxbd/common/dao/OutCollectPayDao.java index 626d7d6..e0b67cc 100644 --- a/src/main/java/com/ynxbd/common/dao/OutCollectPayDao.java +++ b/src/main/java/com/ynxbd/common/dao/OutCollectPayDao.java @@ -14,7 +14,7 @@ public class OutCollectPayDao { * @return Y|N */ public boolean insert(PayOutCollect order) { - String sql = "insert into oc_pay(updateTime, totalFee, outTradeNo, bankTransNo, authCode, operateUser, patientId, openid, mid, name, idCardNo, collectId, barCode, payState, noticeState) values (now(),?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + String sql = "insert into oc_pay(updateTime, totalFee, outTradeNo, bankTransNo, authCode, operateUser, patientId, openid, mid, name, idCardNo, collectId, barCode, payStatus, noticeStatus) values (now(),?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; return DataBase.insert(sql, ps -> { ps.setBigDecimal(1, order.getTotalFee()); ps.setString(2, order.getOutTradeNo()); @@ -30,8 +30,8 @@ public class OutCollectPayDao { ps.setString(11, order.getCollectId()); ps.setString(12, order.getBarCode()); // - ps.setInt(13, order.getPayState()); - ps.setInt(14, order.getNoticeState()); + ps.setInt(13, order.getPayStatus()); + ps.setInt(14, order.getNoticeStatus()); }) > 0; } @@ -60,7 +60,7 @@ public class OutCollectPayDao { * @return 信息 */ public boolean updateMerPaidByOutTradeNo(String outTradeNo, String bankTransNo) { - String sql = "update oc_pay set payState=?, bankTransNo=? where outTradeNo=? and bankTransNo is null"; + String sql = "update oc_pay set payStatus=?, bankTransNo=? where outTradeNo=? and bankTransNo is null"; return DataBase.update(sql, ps -> { ps.setInt(1, 0); ps.setString(2, bankTransNo); @@ -68,17 +68,17 @@ public class OutCollectPayDao { }) > 0; } - public boolean updateNoticeErr(String outTradeNo, Integer noticeState, String noticeResult) { - String sql = "update oc_pay set noticeState=?, noticeResult=? where outTradeNo=? "; + public boolean updateNoticeErr(String outTradeNo, Integer noticeStatus, String noticeResult) { + String sql = "update oc_pay set noticeStatus=?, noticeResult=? where outTradeNo=? "; return DataBase.update(sql, ps -> { - ps.setInt(1, noticeState); + ps.setInt(1, noticeStatus); ps.setString(2, noticeResult); ps.setString(3, outTradeNo); }) > 0; } public boolean updateNoticeOk(String outTradeNo) { - String sql = "update oc_pay set noticeState=0 where outTradeNo=? and payState = 0"; + String sql = "update oc_pay set noticeStatus=0 where outTradeNo=? and payStatus = 0"; return DataBase.update(sql, ps -> { ps.setString(1, outTradeNo); }) > 0; diff --git a/src/main/java/com/ynxbd/common/helper/lis/RMLisHelper.java b/src/main/java/com/ynxbd/common/helper/lis/RMLisHelper.java index de9271b..d6a7305 100644 --- a/src/main/java/com/ynxbd/common/helper/lis/RMLisHelper.java +++ b/src/main/java/com/ynxbd/common/helper/lis/RMLisHelper.java @@ -2,7 +2,6 @@ package com.ynxbd.common.helper.lis; import com.ynxbd.common.helper.ProperHelper; import com.ynxbd.common.helper.common.ErrorHelper; -import com.ynxbd.common.helper.common.FileHelper; import com.ynxbd.common.helper.common.SnowHelper; import com.ynxbd.common.helper.common.SoapHelper; import com.ynxbd.common.result.JsonResult; @@ -27,13 +26,13 @@ public class RMLisHelper { static { ProperHelper config = new ProperHelper().read("lis.properties"); String url = config.getString("lis.url"); - Boolean unifiedEntrance = config.getBoolean("lis.unifiedEntrance", false); + Boolean is_unified_entrance = config.getBoolean("lis.is_unified_entrance", false); IS_LOG_RESP = config.getBoolean("lis.is_log_resp", false); if (url == null) { LIS_SOAP_URL = null; log.error("Lis配置文件读取失败"); - } else if (!unifiedEntrance) { + } else if (!is_unified_entrance) { LIS_SOAP_URL = "http://" + url + "/LisReportServics.asmx?wsdl"; } else { LIS_SOAP_URL = "http://" + url + "/LisReportServics.asmx?UnifiedEntrance"; @@ -49,7 +48,11 @@ public class RMLisHelper { */ public static String getResponseXml(String method, Map params) { if (params == null) { - log.info("params is null"); + log.error("[LIS]params is null"); + return null; + } + if (LIS_SOAP_URL == null) { + log.info("[LIS]LIS_SOAP_URL is null"); return null; } diff --git a/src/main/java/com/ynxbd/common/service/CasebookService.java b/src/main/java/com/ynxbd/common/service/CasebookService.java index 686d838..575ff62 100644 --- a/src/main/java/com/ynxbd/common/service/CasebookService.java +++ b/src/main/java/com/ynxbd/common/service/CasebookService.java @@ -154,7 +154,7 @@ public class CasebookService { * @return bool */ public boolean addResApply(PayCasebook casebook, String openId, String patientId) { - if (casebook == null || ObjectUtils.isEmpty(casebook.getApplyId())) { + if (casebook == null || ObjectUtils.isEmpty(casebook.getApplyId()) || ObjectUtils.isEmpty(casebook.getPayStatus())) { return false; } return new CasebookDao().insert(casebook, openId, patientId); diff --git a/src/main/java/com/ynxbd/common/service/OutCollectService.java b/src/main/java/com/ynxbd/common/service/OutCollectService.java index 1265d92..36b0de6 100644 --- a/src/main/java/com/ynxbd/common/service/OutCollectService.java +++ b/src/main/java/com/ynxbd/common/service/OutCollectService.java @@ -26,8 +26,8 @@ public class OutCollectService { PayOutCollect addInfo = CopyHelper.fatherToChild(order, PayOutCollect.class); addInfo.setBarCode(brCode); addInfo.setIdCardNo(cardNo); - addInfo.setPayState(0); - addInfo.setNoticeState(0); + addInfo.setPayStatus(0); + addInfo.setNoticeStatus(0); addInfo.setPayWay("2"); boolean isResult = new OutCollectPayDao().insert(addInfo); oResult.setSuccess(isResult); @@ -58,8 +58,8 @@ public class OutCollectService { addInfo.setRemark(remark); addInfo.setPayWay("3"); - addInfo.setPayState(-1); - addInfo.setNoticeState(-1); + addInfo.setPayStatus(-1); + addInfo.setNoticeStatus(-1); if (!new OutCollectPayDao().insert(addInfo)) { log.error("[外采]信息预存失败 collectId={}", collectId); @@ -114,10 +114,10 @@ public class OutCollectService { throw new ServiceException(ResultEnum.PARAM_IS_DEFECT); } - Integer payState = ocPay.getPayState(); - Integer noticeState = ocPay.getNoticeState(); + Integer payStatus = ocPay.getPayStatus(); + Integer noticeStatus = ocPay.getNoticeStatus(); - if (payState == null || noticeState == null || payState != -1 || noticeState != -1) { // 状态不明确 + if (payStatus == null || noticeStatus == null || payStatus != -1 || noticeStatus != -1) { // 状态不明确 throw new ServiceException(ResultEnum.PAY_REPEAT, String.format("{%s}[外采]订单已支付 outTradeNo={%s}, bankTransNo={%s}", merchantEnum.NAME, outTradeNo, bankTransNo)); } diff --git a/src/main/resources/lis.properties b/src/main/resources/lis.properties index 309d808..98d56aa 100644 --- a/src/main/resources/lis.properties +++ b/src/main/resources/lis.properties @@ -1 +1 @@ -# LIS\u914D\u7F6E lis.url=192.168.1.185:8090 lis.unifiedEntrance=true \ No newline at end of file +# LIS\u914D\u7F6E lis.url=10.20.10.36:9623 # \u662F\u5426\u6253\u5370\u8FD4\u56DE\u65E5\u5FD7 lis.is_log_resp=false # \u914D\u7F6E lis.is_unified_entrance=false \ No newline at end of file