Recoding
/
WxPay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、病历复印下单新增入参，可直接下单，防止存在没有预约信息报错的情况。

Browse Source 
2、RMLis调用接口超时后，出现空异常，新增超时返回公有数据。
debug
王绍全 1 day ago
parent 4967f18444
commit da788b1d90
5 changed files with 189 additions and 111 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 78
      src/main/java/com/ynxbd/common/action/XBDAction.java
  2. 2
      src/main/java/com/ynxbd/common/bean/pay/PayCasebook.java
  3. 65
      src/main/java/com/ynxbd/common/dao/CasebookDao.java
  4. 15
      src/main/java/com/ynxbd/common/helper/lis/RMLisHelper.java
  5. 130
      src/main/java/com/ynxbd/common/service/CasebookService.java

78
src/main/java/com/ynxbd/common/action/XBDAction.java
Unescape View File

@ -24,6 +24,9 @@ import org.apache.commons.lang3.ObjectUtils;
import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Action;
import org.apache.struts2.convention.annotation.Namespace; import org.apache.struts2.convention.annotation.Namespace;
import java.math.BigDecimal;
import java.util.List;
/** /**
* @author 李进才 * @author 李进才
* @ClassName XBDAction * @ClassName XBDAction
@ -41,7 +44,6 @@ public class XBDAction extends BaseAction {
return Result.success(); return Result.success();
} }
/** /**
* 获取智能云胶片的地址 * 获取智能云胶片的地址
* *
@ -103,23 +105,22 @@ public class XBDAction extends BaseAction {
} }
/** /**
* 获取该病人需要翻拍病历干啥的列表(用途)->直接绑定翻拍的病历类型 * [病历复印]获取该病人需要翻拍病历干啥的列表(用途)->直接绑定翻拍的病历类型
* *
* @return 用途列表 * @return 用途列表
*/ */
@Action("getMRTemplateList") @Action("getMRTemplateList")
public Result getMRTemplateList() { public Result getMRTemplateList() {
try { try {
String jsonString = XBDHttpHelper.ExecMethodPost(XBDEnum.BLSM_Appointment_GetTemplate.NAME, params -> { String respJson = XBDHttpHelper.ExecMethodPost(XBDEnum.BLSM_Appointment_GetTemplate.NAME, null);
}); return Result.success(JsonHelper.parseArray(respJson));
return Result.success(JsonHelper.parseArray(jsonString));
} catch (Exception e) { } catch (Exception e) {
return Result.error(e); return Result.error(e);
} }
} }
/** /**
* 新增预约 * [病历复印]新增预约信息
* *
* @param openId openId * @param openId openId
* @param patientId patientId * @param patientId patientId
@ -140,30 +141,18 @@ public class XBDAction extends BaseAction {
* @return 成功行数 * @return 成功行数
*/ */
@Action("addMRReserve") @Action("addMRReserve")
public Result addMRReserve(String openId, String patientId, String zyNum, String applyName, String relationship, String useToNo, String useToName, int getWay, String address, String phone, String ptImg1, String ptImg2, String ptImg3, String ptImg4, String ptImg5, String ptImg6, String applyPtImg1, String applyPtImg2, String applicationImg) { public Result addMRReserve(String openId, @AesDecode String patientId, String zyNum, String applyName, String relationship, String useToNo, String useToName, int getWay, String address, String phone, String ptImg1, String ptImg2, String ptImg3, String ptImg4, String ptImg5, String ptImg6, String applyPtImg1, String applyPtImg2, String applicationImg) {
try { try {
log.info("[病历复印]预约信息 patientId={}, treatNum={}, applyName={}, useToNo={}, useToName={}, getWay={}, address={}, phone={}", patientId, zyNum, applyName, useToNo, useToName, getWay, address, phone); log.info("[病历复印]新增预约信息 patientId={}, treatNum={}, applyName={}, useToNo={}, useToName={}, getWay={}, address={}, phone={}", patientId, zyNum, applyName, useToNo, useToName, getWay, address, phone);
if (ObjectUtils.isEmpty(openId) || ObjectUtils.isEmpty(patientId)) { if (ObjectUtils.isEmpty(openId) || ObjectUtils.isEmpty(patientId)) {
return Result.error(ResultEnum.PARAM_IS_DEFECT); return Result.error(ResultEnum.PARAM_IS_DEFECT);
} }
PayCasebook payCasebook = new PayCasebook();
payCasebook.setTreatNum(zyNum);
payCasebook.setPatientName(applyName);
payCasebook.setUseToNo(useToNo);
payCasebook.setUseToName(useToName);
payCasebook.setGetWay(getWay);
payCasebook.setAddress(address);
payCasebook.setPhone(phone);
CasebookService casebookService = new CasebookService(); CasebookService service = new CasebookService();
if (casebookService.hasResInfo(openId, patientId, zyNum, String.valueOf(getWay), useToNo, useToName)) { List<PayCasebook> dbDataList = service.queryListByTreat(patientId, zyNum);
log.info("[病历复印]预约信息重复 patientId={}, treatNum={}, getWay={}, useToNo={}, useToName={}", patientId, zyNum, getWay, useToNo, useToName); if (dbDataList.size() > 5) {
return Result.error(ResultEnum.APPLY_REPEAT); log.info("[病历复印]今日预约申请次数超过限制 patientId={}, treatNum={}, getWay={}, useToNo={}, useToName={}", patientId, zyNum, getWay, useToNo, useToName);
} throw new ServiceException("[病历复印]每日可预约申请最多5次，请明日再试！");
long id = casebookService.addResApply(payCasebook, openId, patientId); // 返回自增id
if (id <= 0) {
log.info("[病历复印]预约信息存储失败 patientId={}, openId={}, patientId={}", patientId, openId, patientId);
return Result.error(ResultEnum.SPECIFIED_QUESTIONED_USER_NOT_EXIST);
} }
String respJson = XBDHttpHelper.ExecMethodPost(XBDEnum.BLSM_Appointment_SetAppointment.NAME, params -> { String respJson = XBDHttpHelper.ExecMethodPost(XBDEnum.BLSM_Appointment_SetAppointment.NAME, params -> {
@ -191,7 +180,7 @@ public class XBDAction extends BaseAction {
params.put("ApplicationImg", applicationImg); params.put("ApplicationImg", applicationImg);
}); });
log.info("[病历复印]HIS预约返回 resp=[{}], id={}", respJson, id); log.info("[病历复印]HIS预约申请返回 resp={}", respJson);
if (ObjectUtils.isEmpty(respJson)) { if (ObjectUtils.isEmpty(respJson)) {
return Result.error(ResultEnum.INTERFACE_HIS_INVOKE_ERROR); return Result.error(ResultEnum.INTERFACE_HIS_INVOKE_ERROR);
} }
@ -206,27 +195,39 @@ public class XBDAction extends BaseAction {
return Result.error(ResultEnum.INTERFACE_HIS_DATA_ERROR); return Result.error(ResultEnum.INTERFACE_HIS_DATA_ERROR);
} }
if (!casebookService.updateApplyIdById(id, applyId)) { PayCasebook addInfo = new PayCasebook();
log.error("[病历复印]记录applyId失败 id={}, applyId={}", applyId, applyId); addInfo.setTreatNum(zyNum);
return Result.error(ResultEnum.ERROR); addInfo.setPatientName(applyName);
addInfo.setUseToNo(useToNo);
addInfo.setUseToName(useToName);
addInfo.setGetWay(getWay);
addInfo.setAddress(address);
addInfo.setPhone(phone);
addInfo.setPayStatus(-2); // 预约标识
if (!service.addResApply(addInfo, openId, patientId)) {
log.info("[病历复印]预约申请信息存储失败 patientId={}, openId={}, patientId={}", patientId, openId, patientId);
return Result.error(ResultEnum.SPECIFIED_QUESTIONED_USER_NOT_EXIST);
} }
return Result.success(respJsonObj); return Result.success(respJsonObj);
} catch (Exception e) { } catch (Exception e) {
log.error("[病历复印]预约失败 error:{}", e.toString()); log.error("[病历复印]HIS预约申请失败 error:{}", e.toString());
return Result.error(e); return Result.error(e);
} }
} }
/** /**
* 获取该病人的病历翻拍历史 * [查询]患者的病历翻拍历史
* *
* @param patientId 病人Id * @param patientId 病人Id
* @return 历史记录 * @return 历史记录
*/ */
@Action("getMRHistory") @Action("getMRHistory")
public Result getMRHistory(String patientId) { public Result getMRHistory(@AesDecode String patientId) {
try { try {
log.info("[查询]患者的病历翻拍历史 patientId={}", patientId);
String jsonString = XBDHttpHelper.ExecMethodPost(XBDEnum.BLSM_Appointment_GetHistoryAppointment.NAME, params -> { String jsonString = XBDHttpHelper.ExecMethodPost(XBDEnum.BLSM_Appointment_GetHistoryAppointment.NAME, params -> {
params.put("patientID", patientId); params.put("patientID", patientId);
params.put("BorrowNo", -1); params.put("BorrowNo", -1);
@ -249,17 +250,18 @@ public class XBDAction extends BaseAction {
* @return 支付回调参数 * @return 支付回调参数
*/ */
@Action("caseBookPay") @Action("caseBookPay")
public Result caseBookPay(String payCode, String openid, String patientId, String treatNum, String totalFee, String applyId, String getWay, String useToName) { public Result caseBookPay(String payCode, String openid, @AesDecode String patientId, String patientName, String treatNum, BigDecimal totalFee, String applyId, Integer getWay, String useToNo, String useToName, String address, String phone) {
log.info("[病历复印]下单 payCode={}, openid={}, patientId={}, treatNum={}, totalFee={}", payCode, openid, patientId, treatNum, totalFee); try {
log.info("[病历复印]下单 payCode={}, openid={}, patientId={}, patientName={}, treatNum={}, totalFee={}, useToName={}", payCode, openid, patientId, patientName, treatNum, totalFee, useToName);
MerchantEnum merchantEnum = MerchantEnum.findEnumByCode(payCode); MerchantEnum merchantEnum = MerchantEnum.findEnumByCode(payCode);
if (merchantEnum == null) { // 支付方式异常 if (merchantEnum == null) { // 支付方式异常
return Result.error(ResultEnum.PAY_TYPE_ERROR); return Result.error(ResultEnum.PAY_TYPE_ERROR);
} }
if (payCode == null || openid == null || patientId == null || treatNum == null || totalFee == null || applyId == null || getWay == null || useToName == null) {
return Result.error(ResultEnum.PARAM_IS_DEFECT);
}
String ip = request.getRemoteAddr(); String ip = request.getRemoteAddr();
return new CasebookService().placeOrder(merchantEnum, ip, openid, patientId, treatNum, totalFee, applyId, getWay, useToName); return new CasebookService().placeOrder(merchantEnum, ip, openid, patientId, patientName, treatNum, totalFee, applyId, getWay, useToNo, useToName, address, phone);
} catch (Exception e) {
return Result.error(e);
}
} }
/** /**

2
src/main/java/com/ynxbd/common/bean/pay/PayCasebook.java
Unescape View File

@ -24,7 +24,7 @@ public class PayCasebook extends Order {
// 模板名称 // 模板名称
private String useToName; private String useToName;
// 获取方式; 0自提 1邮寄 // 获取方式：0自提; 1邮寄
private int getWay; private int getWay;
// 地址 // 地址

65
src/main/java/com/ynxbd/common/dao/CasebookDao.java
Unescape View File

@ -14,19 +14,24 @@ public class CasebookDao {
* @param casebook 信息 * @param casebook 信息
* @return 是否成功 * @return 是否成功
*/ */
public long insert(PayCasebook casebook, String openId, String patientId) { public boolean insert(PayCasebook casebook, String openId, String patientId) {
String sql = "insert into pay_casebook(ApplyTime, UpdateTime, TreatNum, PatientName, UseToNo, UseToName, GetWay, Address, Phone, OpenID, PatientID) values (now(),now(),?,?,?,?,?,?,?,?,?)"; String sql = "insert into pay_casebook(ApplyTime, UpdateTime, OpenID, PatientID, PatientName, TreatNum, UseToNo, UseToName, GetWay, Address, Phone, ApplyId, PayStatus, OutTradeNo, TotalFee, PayMoney) values (now(),now(),?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
return DataBase.insertGetId(sql, ps -> { return DataBase.insert(sql, ps -> {
ps.setString(1, casebook.getTreatNum()); ps.setString(1, openId);
ps.setString(2, casebook.getPatientName()); ps.setString(2, patientId);
ps.setString(3, casebook.getUseToNo()); ps.setString(3, casebook.getPatientName());
ps.setString(4, casebook.getUseToName()); ps.setString(4, casebook.getTreatNum());
ps.setInt(5, casebook.getGetWay()); ps.setString(5, casebook.getUseToNo());
ps.setString(6, casebook.getAddress()); ps.setString(6, casebook.getUseToName());
ps.setString(7, casebook.getPhone()); ps.setInt(7, casebook.getGetWay());
ps.setString(8, openId); ps.setString(8, casebook.getAddress());
ps.setString(9, patientId); ps.setString(9, casebook.getPhone());
}); ps.setString(10, casebook.getApplyId());
ps.setInt(11, casebook.getPayState());
ps.setString(12, casebook.getOutTradeNo());
ps.setBigDecimal(13, casebook.getTotalFee());
ps.setBigDecimal(14, casebook.getPayMoney());
}) > 0;
} }
// 补充申请id // 补充申请id
@ -71,7 +76,7 @@ public class CasebookDao {
} }
public boolean updatePrepayInfo(String applyId, String treatNum, BigDecimal totalFee, String outTradeNo) { public boolean updatePrepayInfo(String applyId, String treatNum, BigDecimal totalFee, String outTradeNo) {
String sql = "update pay_casebook set updateTime=now(), payStatus=-1, payMoney=?, totalFee=?, outTradeNo=? where applyId=? and treatNum=? and payStatus != 0"; String sql = "update pay_casebook set updateTime=now(), payStatus=-1, payMoney=?, totalFee=?, outTradeNo=? where applyId=? and treatNum=? and payStatus !=0";
return DataBase.update(sql, ps -> { return DataBase.update(sql, ps -> {
ps.setBigDecimal(1, totalFee); ps.setBigDecimal(1, totalFee);
ps.setBigDecimal(2, totalFee); ps.setBigDecimal(2, totalFee);
@ -82,17 +87,13 @@ public class CasebookDao {
} }
// 查询是已有相同的申请记录
public boolean selectIsExit(String openid, String patientId, String treatNum, String getWay, String useToNo, String useToName) { public List<PayCasebook> selectListByTreat(String patientId, String treatNum) {
String sql = "select * from pay_casebook where Date(applyTime) = CurDate() and openid=? and patientId=? and treatNum=? and getWay=? and useToNo=? and useToName=? and (payStatus is null or payStatus=-1) and applyId is not null"; String sql = "select * from pay_casebook where Date(applyTime) = CurDate() and patientId=? and treatNum=? and applyId is not null";
return !DataBase.select(sql, PayCasebook.class, ps -> { return DataBase.select(sql, PayCasebook.class, ps -> {
ps.setString(1, openid); ps.setString(1, patientId);
ps.setString(2, patientId); ps.setString(2, treatNum);
ps.setString(3, treatNum); });
ps.setString(4, getWay);
ps.setString(5, useToNo);
ps.setString(6, useToName);
}).isEmpty();
} }
public PayCasebook selectOrder(String applyId, String treatNum) { public PayCasebook selectOrder(String applyId, String treatNum) {
@ -121,6 +122,20 @@ public class CasebookDao {
} }
// // 查询是已有相同的申请记录
// public boolean selectIsExit(String openid, String patientId, String treatNum, String getWay, String useToNo, String useToName) {
// String sql = "select * from pay_casebook where Date(applyTime) = CurDate() and openid=? and patientId=? and treatNum=? and getWay=? and useToNo=? and useToName=? and (payStatus is null or payStatus=-1) and applyId is not null";
// return !DataBase.select(sql, PayCasebook.class, ps -> {
// ps.setString(1, openid);
// ps.setString(2, patientId);
// ps.setString(3, treatNum);
// ps.setString(4, getWay);
// ps.setString(5, useToNo);
// ps.setString(6, useToName);
// }).isEmpty();
// }
// public boolean selectIsPay(String patientId, String treatNum, String applyId, String getWay, String useToName) { // public boolean selectIsPay(String patientId, String treatNum, String applyId, String getWay, String useToName) {
// String sql = "select * from pay_casebook where patientId=? and treatNum = ? and applyId = ? and getWay = ? and useToName = ? and payStatus = 0"; // String sql = "select * from pay_casebook where patientId=? and treatNum = ? and applyId = ? and getWay = ? and useToName = ? and payStatus = 0";
// return !DataBase.select(sql, PayCasebook.class, ps -> { // return !DataBase.select(sql, PayCasebook.class, ps -> {

15
src/main/java/com/ynxbd/common/helper/lis/RMLisHelper.java
Unescape View File

@ -121,7 +121,11 @@ public class RMLisHelper {
*/ */
public static JsonResult getJsonResult(String method, Map<String, Object> params) { public static JsonResult getJsonResult(String method, Map<String, Object> params) {
String responseXml = getResponseXml(method, params); String responseXml = getResponseXml(method, params);
return JsonResult.xmlToBean(responseXml, JsonResultEnum.SYS_RM_LIS); JsonResult jsonResult = JsonResult.xmlToBean(responseXml, JsonResultEnum.SYS_RM_LIS);
if (jsonResult == null) {
return createTimeoutResult();
}
return jsonResult;
} }
@ -138,4 +142,13 @@ public class RMLisHelper {
return getJsonResult(method, requestParams); return getJsonResult(method, requestParams);
} }
/**
* xml响应数据组装成为JSON数据
*
* @return 封装好的对象
*/
protected static JsonResult createTimeoutResult() {
return JsonResult.createTimeoutResult("【RMLis】请求超时", JsonResultEnum.SYS_RM_LIS);
}
} }

130
src/main/java/com/ynxbd/common/service/CasebookService.java
Unescape View File

@ -18,39 +18,62 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List;
@Slf4j @Slf4j
public class CasebookService { public class CasebookService {
public Result placeOrder(MerchantEnum merchantEnum, String ip, String openid, String patientId, String treatNum, String totalFee, String applyId, String getWay, String useToName) { // 下单
if (openid == null || patientId == null || totalFee == null) { public Result placeOrder(MerchantEnum merchantEnum, String ip, String openId, String patientId, String patientName, String treatNum, BigDecimal totalFee, String applyId, Integer getWay, String useToNo, String useToName, String address, String phone) throws ServiceException {
if (openId == null || patientId == null || patientName == null || treatNum == null || totalFee == null || applyId == null || getWay == null || useToName == null) {
return Result.error(ResultEnum.PARAM_IS_DEFECT); return Result.error(ResultEnum.PARAM_IS_DEFECT);
} }
if (new BigDecimal(totalFee).compareTo(BigDecimal.ZERO) == 0) { if (totalFee.compareTo(BigDecimal.ZERO) == 0) {
return Result.error(ResultEnum.PAY_MONEY_IS_ZERO); return Result.error(ResultEnum.PAY_MONEY_IS_ZERO);
} }
PayCasebook order = selectOrderByApplyId(applyId, treatNum); PayCasebook order = selectOrderByApplyId(applyId, treatNum);
String outTradeNo = CodeHelper.getOutTradeNo(merchantEnum); String outTradeNo = CodeHelper.getOutTradeNo(merchantEnum);
log.info("{} [病历]查询订单 order=[{}]", merchantEnum.NAME, JsonHelper.toJsonString(order)); if (order == null) {
if (order != null) { PayCasebook addInfo = new PayCasebook();
addInfo.setTreatNum(treatNum);
addInfo.setPatientName(patientName);
addInfo.setUseToNo(useToNo);
addInfo.setUseToName(useToName);
addInfo.setGetWay(getWay);
addInfo.setAddress(address);
addInfo.setPhone(phone);
// =========================
addInfo.setApplyId(applyId);
addInfo.setOutTradeNo(outTradeNo);
addInfo.setTotalFee(totalFee);
addInfo.setPayMoney(totalFee);
addInfo.setPayStatus(-1); // 待支付
if (!addResApply(addInfo, openId, patientId)) {
log.info("[病历复印]预约申请信息存储失败 patientId={}, openId={}, patientId={}", patientId, openId, patientId);
return Result.error(ResultEnum.SPECIFIED_QUESTIONED_USER_NOT_EXIST);
}
} else {
log.info("{} [病历复印]下单-查询到订单 order=[{}]", merchantEnum.NAME, JsonHelper.toJsonString(order));
if (order.hasPayStatusPaid()) { if (order.hasPayStatusPaid()) {
log.info("{} [病历]订单已支付 applyId={}, outTradeNo={}", merchantEnum.NAME, applyId, order.getOutTradeNo()); log.info("{} [病历复印]订单已支付 applyId={}, outTradeNo={}", merchantEnum.NAME, applyId, order.getOutTradeNo());
return Result.error(ResultEnum.PAY_REPEAT); return Result.error(ResultEnum.PAY_REPEAT);
} }
if (ObjectUtils.isEmpty(order.getOutTradeNo())) { if (!ObjectUtils.isEmpty(order.getOutTradeNo())) {
outTradeNo = order.getOutTradeNo(); outTradeNo = order.getOutTradeNo();
} }
}
if (!updatePrepayInfo(applyId, treatNum, new BigDecimal(totalFee), outTradeNo)) { if (!updatePrepayInfo(applyId, treatNum, totalFee, outTradeNo)) {
log.info("{} [病历]下单信息存储失败 applyId-{}, patientId={},treatNum-{}", merchantEnum.NAME, applyId, patientId, treatNum); log.info("{} [病历复印]下单信息存储失败 applyId={}, patientId={}, treatNum={}", merchantEnum.NAME, applyId, patientId, treatNum);
return Result.error(ResultEnum.SPECIFIED_QUESTIONED_USER_NOT_EXIST); return Result.error(ResultEnum.SPECIFIED_QUESTIONED_USER_NOT_EXIST);
} }
}
String body = "病历复印缴费 住院号：" + treatNum; String body = "病历复印 住院号：" + treatNum;
JSONObject respJson = PayService.createOrder(merchantEnum, openid, patientId, totalFee, outTradeNo, PQREnum.CASEBOOK.CODE, ip, body); JSONObject respJson = PayService.createOrder(merchantEnum, openId, patientId, totalFee.toString(), outTradeNo, PQREnum.CASEBOOK.CODE, ip, body);
if (respJson == null) { if (respJson == null) {
return Result.error(ResultEnum.PAY_ERROR); // 支付异常 return Result.error(ResultEnum.PAY_ERROR); // 支付异常
} }
@ -58,22 +81,37 @@ public class CasebookService {
} }
// /**
// * [病历复印]判断【今天】是否存在预约记录
// *
// * @param openId openId
// * @param patientId 患者id
// * @param treatNum 住院号
// * @param getWay 方式
// * @param useToNo 模板号
// * @param useToName 模板名称
// * @return bool
// */
// public boolean hasResInfo(String openId, String patientId, String treatNum, String getWay, String useToNo, String useToName) throws ServiceException {
// if (ObjectUtils.isEmpty(openId) || ObjectUtils.isEmpty(patientId) || ObjectUtils.isEmpty(treatNum) || ObjectUtils.isEmpty(useToNo) || ObjectUtils.isEmpty(useToName)) {
// throw new ServiceException(ResultEnum.PARAM_IS_DEFECT);
// }
// return new CasebookDao().selectIsExit(openId, patientId, treatNum, getWay, useToNo, useToName);
// }
/** /**
* [病历复印]判断【今天】是否存在预约记录 * [病历复印]查询今日预约申请的数据
* *
* @param openId openId
* @param patientId 患者id * @param patientId 患者id
* @param treatNum 住院号 * @param treatNum 住院号
* @param getWay 方式
* @param useToNo 模板号
* @param useToName 模板名称
* @return bool * @return bool
*/ */
public boolean hasResInfo(String openId, String patientId, String treatNum, String getWay, String useToNo, String useToName) throws ServiceException { public List<PayCasebook> queryListByTreat(String patientId, String treatNum) throws ServiceException {
if (ObjectUtils.isEmpty(openId) || ObjectUtils.isEmpty(patientId) || ObjectUtils.isEmpty(treatNum) || ObjectUtils.isEmpty(useToNo) || ObjectUtils.isEmpty(useToName)) { if (ObjectUtils.isEmpty(patientId) || ObjectUtils.isEmpty(treatNum)) {
throw new ServiceException(ResultEnum.PARAM_IS_DEFECT); throw new ServiceException(ResultEnum.PARAM_IS_DEFECT);
} }
return new CasebookDao().selectIsExit(openId, patientId, treatNum, getWay, useToNo, useToName); return new CasebookDao().selectListByTreat(patientId, treatNum);
} }
@ -86,11 +124,10 @@ public class CasebookService {
* @param outTradeNo 订单号 * @param outTradeNo 订单号
* @return bool * @return bool
*/ */
public boolean updatePrepayInfo(String applyId, String treatNum, BigDecimal totalFee, String outTradeNo) { public boolean updatePrepayInfo(String applyId, String treatNum, BigDecimal totalFee, String outTradeNo) throws ServiceException {
log.info("[病历复印]更新下单信息 applyId={}, treatNum={}, totalFee={}, outTradeNo={}", applyId, treatNum, totalFee, totalFee); log.info("[病历复印]更新下单信息 applyId={}, treatNum={}, totalFee={}, outTradeNo={}", applyId, treatNum, totalFee, outTradeNo);
if (ObjectUtils.isEmpty(applyId) || totalFee.compareTo(BigDecimal.ZERO) == 0 || ObjectUtils.isEmpty(outTradeNo)) { if (ObjectUtils.isEmpty(applyId) || totalFee.compareTo(BigDecimal.ZERO) == 0 || ObjectUtils.isEmpty(outTradeNo)) {
log.error("[病历复印]更新下单信息失败 applyId={}, totalFee={}, outTradeNo={}", applyId, totalFee, totalFee); throw new ServiceException(ResultEnum.PARAM_IS_DEFECT);
return false;
} }
return new CasebookDao().updatePrepayInfo(applyId, treatNum, totalFee, outTradeNo); return new CasebookDao().updatePrepayInfo(applyId, treatNum, totalFee, outTradeNo);
} }
@ -116,34 +153,32 @@ public class CasebookService {
* @param casebook 订单信息 * @param casebook 订单信息
* @return bool * @return bool
*/ */
public long addResApply(PayCasebook casebook, String openId, String patientId) { public boolean addResApply(PayCasebook casebook, String openId, String patientId) {
if (casebook == null) { if (casebook == null || ObjectUtils.isEmpty(casebook.getApplyId())) {
log.info("casebook is null"); return false;
return -1;
} }
return new CasebookDao().insert(casebook, openId, patientId); return new CasebookDao().insert(casebook, openId, patientId);
} }
public PayCasebook queryOrderByOutTradeNo(String outTradeNo) {
/** if (ObjectUtils.isEmpty(outTradeNo)) {
* 预约成功后，记录申请id return null;
* }
* @param id id return new CasebookDao().selectByOutTradeNo(outTradeNo);
* @param applyId 申请id
* @return bool
*/
public boolean updateApplyIdById(long id, String applyId) {
return new CasebookDao().updateApplyIdById(id, applyId);
} }
// 支付回调通知 // 支付回调通知
public void paidNotify(MerchantEnum merchantEnum, String openid, BigDecimal totalFee, String outTradeNo, String bankTransNo, String payInfo) { public void paidNotify(MerchantEnum merchantEnum, String openid, BigDecimal totalFee, String outTradeNo, String bankTransNo, String payInfo) {
CasebookDao casebookDao = new CasebookDao(); PayCasebook order = queryOrderByOutTradeNo(outTradeNo);
PayCasebook order = casebookDao.selectByOutTradeNo(outTradeNo); if (order == null) {
log.error("[病历复印][回调]未找到订单 outTradeNo={}, bankTransNo={}, totalFee={}", outTradeNo, bankTransNo, totalFee);
return;
}
String applyId = order.getApplyId(); String applyId = order.getApplyId();
if (ObjectUtils.isEmpty(applyId)) { if (ObjectUtils.isEmpty(applyId)) {
log.error("[病历复印]回调:病历申请ID缺失 outTradeNo={}, bankTransNo={}, applyId={}", outTradeNo, bankTransNo, applyId); log.error("[病历复印][回调]病历申请ID缺失 outTradeNo={}, bankTransNo={}, applyId={}", outTradeNo, bankTransNo, applyId);
return; return;
} }
@ -152,6 +187,7 @@ public class CasebookService {
return; return;
} }
CasebookDao casebookDao = new CasebookDao();
String tradeNo = PEnum.CASEBOOK.toTradeNo(bankTransNo); String tradeNo = PEnum.CASEBOOK.toTradeNo(bankTransNo);
if (!casebookDao.updatePayStateOk(outTradeNo, bankTransNo)) { if (!casebookDao.updatePayStateOk(outTradeNo, bankTransNo)) {
log.info("[病历复印]修改支付状态失败 outTradeNo={}, bankTransNo={}, applyId={}", outTradeNo, bankTransNo, applyId); log.info("[病历复印]修改支付状态失败 outTradeNo={}, bankTransNo={}, applyId={}", outTradeNo, bankTransNo, applyId);
@ -191,5 +227,17 @@ public class CasebookService {
// return false; // return false;
// } // }
// return new CasebookDao().selectIsPay(patientId, treatNum, applyId, getWay, useToName); // return new CasebookDao().selectIsPay(patientId, treatNum, applyId, getWay, useToName);
// }
//
// /**
// * 预约成功后，记录申请id
// *
// * @param id id
// * @param applyId 申请id
// * @return bool
// */
// public boolean updateApplyIdById(long id, String applyId) {
// return new CasebookDao().updateApplyIdById(id, applyId);
// } // }
} }

Write Preview
Loading…
Cancel
Save