diff --git a/src/main/java/com/ynxbd/ali/helper/AliHelper.java b/src/main/java/com/ynxbd/ali/helper/AliHelper.java index a3631a5..ed00aa7 100644 --- a/src/main/java/com/ynxbd/ali/helper/AliHelper.java +++ b/src/main/java/com/ynxbd/ali/helper/AliHelper.java @@ -445,16 +445,16 @@ public class AliHelper { * 交易通知去重 * * @param outTradeNo 商户订单号，64个字符以内，可包含字母、数字、下划线，需保证在商户端不重复 - * @param isMIPay 是否为医保支付 + * @param isMedOrder 是否为医保订单 */ - public static Order paidNotify(String outTradeNo, boolean isMIPay) { + public static Order paidNotify(String outTradeNo, boolean isMedOrder) { Order order = new Order(); // 已处理 去重 if (KEYS.isContainsKey(outTradeNo)) { order.setErrorMsg("【支付宝】[重复请求]下单信息去重 outTradeNo=" + outTradeNo); return order; } - if (isMIPay) { + if (isMedOrder) { return AliMedHelper.queryTrade(outTradeNo, null); } return queryTransaction(outTradeNo); diff --git a/src/main/java/com/ynxbd/common/action/MedicalInsuranceAction.java b/src/main/java/com/ynxbd/common/action/MedicalInsuranceAction.java index edd1630..0e87d13 100644 --- a/src/main/java/com/ynxbd/common/action/MedicalInsuranceAction.java +++ b/src/main/java/com/ynxbd/common/action/MedicalInsuranceAction.java @@ -2,7 +2,7 @@ package com.ynxbd.common.action; import com.ynxbd.common.action.base.BaseAction; import com.ynxbd.common.bean.HisChronic; -import com.ynxbd.common.dao.his.HisMIDao; +import com.ynxbd.common.dao.his.HisMedDao; import com.ynxbd.common.helper.common.JsonHelper; import com.ynxbd.common.result.Result; import org.apache.struts2.convention.annotation.Action; @@ -20,7 +20,7 @@ public class MedicalInsuranceAction extends BaseAction { */ @Action("getBillInfo") public Result getBillInfo(String queryNumType, String queryNumber, String begDate, String endDate) { - return HisMIDao.getBillInfo(queryNumType, queryNumber, begDate, endDate); + return HisMedDao.getBillInfo(queryNumType, queryNumber, begDate, endDate); } /** @@ -29,6 +29,6 @@ public class MedicalInsuranceAction extends BaseAction { */ @Action("getChronicList") public Result getChronicList(String idCardNo){ - return Result.success(JsonHelper.parseArray(HisMIDao.getChronicList(idCardNo).getDataMapString("DiseaseInfo"), HisChronic.class)); + return Result.success(JsonHelper.parseArray(HisMedDao.getChronicList(idCardNo).getDataMapString("DiseaseInfo"), HisChronic.class)); } } 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 11e9b7f..3fc1aa7 100644 --- a/src/main/java/com/ynxbd/common/action/pay/MedicalAction.java +++ b/src/main/java/com/ynxbd/common/action/pay/MedicalAction.java @@ -9,7 +9,7 @@ import com.ynxbd.common.bean.pay.Recipe; import com.ynxbd.common.bean.pay.Register; import com.ynxbd.common.config.interceptor.AesDecode; import com.ynxbd.common.dao.RecipeDao; -import com.ynxbd.common.dao.his.HisMIDao; +import com.ynxbd.common.dao.his.HisMedDao; import com.ynxbd.common.helper.common.AesMicroHelper; import com.ynxbd.common.helper.common.DateHelper; import com.ynxbd.common.helper.common.HttpHelper; @@ -69,7 +69,7 @@ public class MedicalAction extends BaseAction { if (!DateHelper.isToday(reg.getRegDate())) { return Result.error("医保支付仅支持今日挂号"); } - medicalInfo = new MedicalService().hisRegMIUploadFeeDetails(merchantEnum, qrCode, openid, patientId, cardNo, realName, reg, isSplitTime); + medicalInfo = new MedicalService().hisRegMedUploadDetails(merchantEnum, qrCode, openid, patientId, cardNo, realName, reg, isSplitTime); break; case RECIPE: @@ -78,7 +78,7 @@ public class MedicalAction extends BaseAction { if (treatNum == null || recipeJson == null) { return Result.error(ResultEnum.PARAM_IS_DEFECT); } - medicalInfo = new MedicalService().hisRxUploadFeeDetails(merchantEnum, qrCode, openid, patientId, cardNo, realName, treatNum, recipeJson, totalFee, ybAttrib, ybBZCode, ybBZName); + medicalInfo = new MedicalService().hisRxUploadDetails(merchantEnum, qrCode, openid, patientId, cardNo, realName, treatNum, recipeJson, totalFee, ybAttrib, ybBZCode, ybBZName); break; default: @@ -97,7 +97,7 @@ public class MedicalAction extends BaseAction { */ @Action("getRefundAuthUrl") public Result getRefundAuthUrl() { - JSONObject respJson = WxMedicalHelper.getMdAuthUrl("wx-medical-refund.html", null); + JSONObject respJson = WxMedHelper.getMdAuthUrl("wx-medical-refund.html", null); return Result.success(respJson); } @@ -109,7 +109,7 @@ public class MedicalAction extends BaseAction { if (ObjectUtils.isEmpty(url)) { return Result.error(ResultEnum.PARAM_IS_INVALID); } - JSONObject respJson = WxMedicalHelper.getMdAuthRedirectUrl(url); + JSONObject respJson = WxMedHelper.getMdAuthRedirectUrl(url); return Result.success(respJson); } @@ -124,7 +124,7 @@ public class MedicalAction extends BaseAction { @Action("getMedicalAuthUrl") public Result getMedicalAuthUrl(String url) { - JSONObject respJson = WxMedicalHelper.getMdAuthUrl(url, null); + JSONObject respJson = WxMedHelper.getMdAuthUrl(url, null); return Result.success(respJson); } @@ -145,7 +145,7 @@ public class MedicalAction extends BaseAction { if (!DateHelper.getCurDate().equals(AesMicroHelper.decode(key))) { return Result.error(ResultEnum.PARAM_IS_INVALID); } - return Result.success(WxMedicalHelper.downBill(billDate, billType)); + return Result.success(WxMedHelper.downBill(billDate, billType)); } @@ -213,8 +213,8 @@ public class MedicalAction extends BaseAction { /** * HIS医保退费（线上） */ - @Action("refundMI") - public Result refundMI(String payCode, String callNo, String openid, String qrCode, String outTradeNo, @AesDecode String tradeNo) { + @Action("refundMed") + public Result refundMed(String payCode, String callNo, String openid, String qrCode, String outTradeNo, @AesDecode String tradeNo) { // tradeNo = Base64Helper.decodeEn(tradeNo); log.info("[医保退费] callNo={}, openid={}, qrCode={}, outTradeNo={}, tradeNo={}", callNo, openid, qrCode, outTradeNo, tradeNo); if (openid == null || qrCode == null || outTradeNo == null || tradeNo == null) { @@ -279,8 +279,8 @@ public class MedicalAction extends BaseAction { /** * 获取需要退费的订单 */ - @Action("getRefundMIOrders") - public Result getRefundMIOrders(String openid, String begDate, String endDate) { + @Action("getRefundMedOrders") + public Result getRefundMedOrders(String openid, String begDate, String endDate) { log.info("[医保]查询需退费订单 openid={}, begDate={}, endDate={}", openid, begDate, endDate); RecipeDao recipeDao = new RecipeDao(); List orders = recipeDao.selectRefundList(openid, begDate, endDate); @@ -302,7 +302,7 @@ public class MedicalAction extends BaseAction { if (merchantEnum == null) { return Result.error(ResultEnum.PAY_TYPE_ERROR); } - JsonResult jsonResult = HisMIDao.getMIAccounts(merchantEnum, mdUserId); + JsonResult jsonResult = HisMedDao.getMedAccounts(merchantEnum, mdUserId); return Result.success(jsonResult); } @@ -326,7 +326,7 @@ public class MedicalAction extends BaseAction { } if (merchantEnum.equals(MerchantEnum.WX_MEDICAL)) { - MIOrder order = WxMedicalHelper.queryOrder(WxCacheHelper.getAccessToken(), outTradeNo, medTransId); + WxMedOrder order = WxMedHelper.queryOrder(WxCacheHelper.getAccessToken(), outTradeNo, medTransId); order.setOrderObj(orderObj); if (order.isOk()) { return Result.success(order); @@ -350,7 +350,7 @@ public class MedicalAction extends BaseAction { */ @Action("queryRefund") public Result queryRefund(String accessToken, String outTradeNo, String mdTransId) { - MedicalRefundInfo info = WxMedicalHelper.queryRefund(accessToken, outTradeNo, mdTransId); + MedicalRefundInfo info = WxMedHelper.queryRefund(accessToken, outTradeNo, mdTransId); return Result.success(info); } @@ -371,7 +371,7 @@ public class MedicalAction extends BaseAction { public Result payNotify() { try { log.info("[微信医保]回调通知..."); - MedicalNotify notifyInfo = WxMedicalHelper.paidMINotify(request); + MedicalNotify notifyInfo = WxMedHelper.paidMedNotify(request); // 成功返回 Result.respXml(MdRespHelper.respOk(WxMedConfig.PAY_KEY)); 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 41765bb..b5065b2 100644 --- a/src/main/java/com/ynxbd/common/action/pay/MedicalTestAction.java +++ b/src/main/java/com/ynxbd/common/action/pay/MedicalTestAction.java @@ -10,8 +10,8 @@ import com.ynxbd.common.bean.his.HisTreat; import com.ynxbd.common.bean.pay.Recipe; import com.ynxbd.common.config.interceptor.AesDecode; import com.ynxbd.common.dao.RecipeDao; -import com.ynxbd.common.dao.his.HisMIDao; -import com.ynxbd.common.dao.his.HisMITestDao; +import com.ynxbd.common.dao.his.HisMedDao; +import com.ynxbd.common.dao.his.HisMedTestDao; import com.ynxbd.common.dao.his.HisTreatDao; import com.ynxbd.common.helper.common.DateHelper; import com.ynxbd.common.helper.common.JsonHelper; @@ -21,8 +21,8 @@ import com.ynxbd.common.result.ResultEnum; import com.ynxbd.common.result.ServiceException; import com.ynxbd.common.service.RecipeService; import com.ynxbd.wx.wxfactory.WxCacheHelper; -import com.ynxbd.wx.wxfactory.WxMedicalHelper; -import com.ynxbd.wx.wxfactory.bean.MIOrder; +import com.ynxbd.wx.wxfactory.WxMedHelper; +import com.ynxbd.wx.wxfactory.bean.WxMedOrder; import com.ynxbd.wx.wxfactory.medical.WxMedConfig; import lombok.extern.slf4j.Slf4j; import org.apache.struts2.convention.annotation.Action; @@ -57,7 +57,7 @@ public class MedicalTestAction extends BaseAction { } int days = DateHelper.intervalDays(begDate, endDate, true); - List hisRecipes = HisMITestDao.devUnPayList(patientId, days); + List hisRecipes = HisMedTestDao.devUnPayList(patientId, days); List dataList = new ArrayList<>(); for (HisRecipe hisRecipe : hisRecipes) { @@ -82,7 +82,7 @@ public class MedicalTestAction extends BaseAction { return Result.error("环境错误"); } - List hisRecipeList = HisMITestDao.devPaidRecipeList(patientId, begDate, endDate); + List hisRecipeList = HisMedTestDao.devPaidRecipeList(patientId, begDate, endDate); return Result.success(new RecipeService().filterPaidList(hisRecipeList)); } @@ -130,7 +130,7 @@ public class MedicalTestAction extends BaseAction { @Action("queryWxOrder") public Result queryWxOrder(String accessToken, String outTradeNo, String medTransId) { log.info("[微信医保]订单查询 outTradeNo={}, medTransId={}", outTradeNo, medTransId); - MIOrder order = WxMedicalHelper.queryOrder(accessToken, outTradeNo, medTransId); + WxMedOrder order = WxMedHelper.queryOrder(accessToken, outTradeNo, medTransId); if (order.isOk()) { return Result.success(order); } @@ -142,8 +142,8 @@ public class MedicalTestAction extends BaseAction { * [医保]HIS退费 * */ - @Action("his_mi_refund") - public Result his_mi_refund(String payAuthNo, String tradeNo) { + @Action("his_med_refund") + public Result his_med_refund(String payAuthNo, String tradeNo) { log.info("[医保]HIS退费 payAuthNo={}, tradeNo={}", payAuthNo, tradeNo); Recipe recipe = new RecipeDao().selectByTradeNo(tradeNo); if (recipe == null) { @@ -158,14 +158,14 @@ public class MedicalTestAction extends BaseAction { String bankTransNo = recipe.getBankTransNo(); BigDecimal cashFee = recipe.getPayMoney(); - JsonResult jsonResult = HisMIDao.miRefund(MerchantEnum.ALI_MEDICAL, payAuthNo, chrgBchno.substring(1), bankTransNo, ("R" + tradeNo), cashFee); + JsonResult jsonResult = HisMedDao.medRefund(MerchantEnum.ALI_MEDICAL, payAuthNo, chrgBchno.substring(1), bankTransNo, ("R" + tradeNo), cashFee); return Result.success(jsonResult); } @Action("wx_med_refund_test") public Result wx_med_refund_test() throws ServiceException { - WxMedicalHelper.refundCash("", "", new BigDecimal(""), "人工退费"); + WxMedHelper.refundCash("", "", new BigDecimal(""), "人工退费"); return Result.success(); } @@ -180,7 +180,7 @@ public class MedicalTestAction extends BaseAction { public Result wx_med_add_order(String outTradeNo) { try { log.info("[医保]补充订单数据 outTradeNo={}", outTradeNo); - MIOrder order = WxMedicalHelper.queryOrder(WxCacheHelper.getAccessToken(), outTradeNo, null); + WxMedOrder order = WxMedHelper.queryOrder(WxCacheHelper.getAccessToken(), outTradeNo, null); if (order == null || !order.isOk()) { return Result.error("订单未找到"); } diff --git a/src/main/java/com/ynxbd/common/bean/pay/MICreateOrder.java b/src/main/java/com/ynxbd/common/bean/pay/MedCreateOrder.java similarity index 92% rename from src/main/java/com/ynxbd/common/bean/pay/MICreateOrder.java rename to src/main/java/com/ynxbd/common/bean/pay/MedCreateOrder.java index 4f76660..029a262 100644 --- a/src/main/java/com/ynxbd/common/bean/pay/MICreateOrder.java +++ b/src/main/java/com/ynxbd/common/bean/pay/MedCreateOrder.java @@ -8,11 +8,12 @@ import org.apache.commons.lang3.ObjectUtils; import java.util.Map; +// 创建订单后返回的信息 @Setter @Getter @ToString @NoArgsConstructor -public class MICreateOrder { +public class MedCreateOrder { private Boolean isHasMerOrder; diff --git a/src/main/java/com/ynxbd/common/dao/his/HisMIDao.java b/src/main/java/com/ynxbd/common/dao/his/HisMedDao.java similarity index 81% rename from src/main/java/com/ynxbd/common/dao/his/HisMIDao.java rename to src/main/java/com/ynxbd/common/dao/his/HisMedDao.java index cb4d207..5a2e88c 100644 --- a/src/main/java/com/ynxbd/common/dao/his/HisMIDao.java +++ b/src/main/java/com/ynxbd/common/dao/his/HisMedDao.java @@ -9,7 +9,7 @@ import com.ynxbd.common.helper.common.DateHelper; import com.ynxbd.common.helper.common.JsonHelper; import com.ynxbd.common.helper.his.HisEnum; import com.ynxbd.common.helper.his.HisHelper; -import com.ynxbd.common.helper.his.HisMIHelper; +import com.ynxbd.common.helper.his.HisMedHelper; import com.ynxbd.common.result.JsonResult; import com.ynxbd.common.result.Result; import com.ynxbd.common.result.ResultEnum; @@ -24,7 +24,7 @@ import java.util.Map; // HIS医保接口 @Slf4j -public class HisMIDao { +public class HisMedDao { /** * [医保处方]上传明细（请求地址不通） @@ -36,7 +36,7 @@ public class HisMIDao { * @param recipeJson 处方json * @param totalFee 总金额 */ - public static JsonResult rxMIUploadFeeDetails(MerchantEnum merchantEnum, String payAuthNo, String cardNo, String openid, String patientId, String treatNum, String recipeJson, BigDecimal totalFee, String ybAttrib, String ybBZCode, String ybBZName) { + public static JsonResult rxMedUploadDetails(MerchantEnum merchantEnum, String payAuthNo, String cardNo, String openid, String patientId, String treatNum, String recipeJson, BigDecimal totalFee, String ybAttrib, String ybBZCode, String ybBZName) { List recipeList = JsonHelper.parseArray(recipeJson, Recipe.class); if (recipeList == null || recipeList.isEmpty()) { return HisHelper.createErrorResult("处方数量为 0 或 数据转换失败"); @@ -63,16 +63,16 @@ public class HisMIDao { params.put("YBBZCode", ybBZCode); params.put("YBBZName", ybBZName); } - return HisMIHelper.getJsonResultByMer(merchantEnum.IS_DEV, HisEnum.AP_Pay_Invoice, merchantEnum, params); + return HisMedHelper.getJsonResultByMer(merchantEnum.IS_DEV, HisEnum.AP_Pay_Invoice, merchantEnum, params); } /** * [医保挂号]分时段挂号 */ - public static JsonResult regMIUploadFeeDetails(MerchantEnum merchantEnum, Register reg, String payAuthNo, String cardNo, Boolean isSplitTime) { + public static JsonResult regMedUploadDetails(MerchantEnum merchantEnum, Register reg, String payAuthNo, String cardNo, Boolean isSplitTime) { if (isSplitTime) { - return HisMIHelper.getJsonResultByMer(merchantEnum.IS_DEV, HisEnum.AP_Regist_New, merchantEnum, params -> { + return HisMedHelper.getJsonResultByMer(merchantEnum.IS_DEV, HisEnum.AP_Regist_New, merchantEnum, params -> { params.put("PatientID", reg.getPatientId()); params.put("PayMoney", reg.getPayMoney()); @@ -101,7 +101,7 @@ public class HisMIDao { }); } // 非分时段挂号 医保支付 - return HisMIHelper.getJsonResultByMer(merchantEnum.IS_DEV, HisEnum.AP_Regist, merchantEnum, params -> { + return HisMedHelper.getJsonResultByMer(merchantEnum.IS_DEV, HisEnum.AP_Regist, merchantEnum, params -> { params.put("PatientID", reg.getPatientId()); params.put("PayMoney", reg.getPayMoney()); params.put("DeptCode", reg.getDeptCode()); @@ -137,8 +137,8 @@ public class HisMIDao { * @param transNo HIS交易流水号 * @param bankTransNo HIS流水号 */ - public static JsonResult regMIPay(MerchantEnum merchantEnum, String mdUserId, String payDate, String payTime, String transNo, String bankTransNo, BigDecimal cashFee) { - return HisMIHelper.getJsonResultByMer(merchantEnum.IS_DEV, HisEnum.Medical_PAY, merchantEnum, params -> { + public static JsonResult regMedPay(MerchantEnum merchantEnum, String mdUserId, String payDate, String payTime, String transNo, String bankTransNo, BigDecimal cashFee) { + return HisMedHelper.getJsonResultByMer(merchantEnum.IS_DEV, HisEnum.Medical_PAY, merchantEnum, params -> { params.put("UserID_YBZF", mdUserId); params.put("PayMoney", cashFee); params.put("PayDate", payDate); @@ -156,8 +156,8 @@ public class HisMIDao { * * @param mdInfo 医保下单对象 */ - public static JsonResult placeMIOrder(MerchantEnum merchantEnum, MedicalInfo mdInfo) { - return HisMIHelper.getJsonResultByMer(merchantEnum.IS_DEV, HisEnum.Medical_PayOrders, merchantEnum, params -> { + public static JsonResult placeMedOrder(MerchantEnum merchantEnum, MedicalInfo mdInfo) { + return HisMedHelper.getJsonResultByMer(merchantEnum.IS_DEV, HisEnum.Medical_PayOrders, merchantEnum, params -> { // 授权码 params.put("PayAuthNo", mdInfo.getPayAuthNo()); // 授权token @@ -180,8 +180,8 @@ public class HisMIDao { * @param transNo HIS交易流水号 * @param bankTransNo HIS流水号 */ - public static JsonResult rxMIPay(MerchantEnum merchantEnum, String mdUserId, String payDate, String payTime, String transNo, String bankTransNo, BigDecimal cashFee) { - return HisMIHelper.getJsonResultByMer(merchantEnum.IS_DEV, HisEnum.Medical_PAY, merchantEnum, params -> { + public static JsonResult rxMedPay(MerchantEnum merchantEnum, String mdUserId, String payDate, String payTime, String transNo, String bankTransNo, BigDecimal cashFee) { + return HisMedHelper.getJsonResultByMer(merchantEnum.IS_DEV, HisEnum.Medical_PAY, merchantEnum, params -> { params.put("UserID_YBZF", mdUserId); params.put("PayMoney", cashFee); params.put("PayDate", payDate); @@ -201,8 +201,8 @@ public class HisMIDao { * @param fpNum 发票号（上传费用明细返回的 chrgBchno ，把第一位“M” 过滤后传入） */ // * @param refundType 退款类型（ALL:全部，CASH:只退现金 HI:只退医保） - public static JsonResult miRefund(MerchantEnum merchantEnum, String payAuthNo, String fpNum, String bankTransNo, String refundTradeNo, BigDecimal cashFee) { - return HisMIHelper.getJsonResultByMer(merchantEnum.IS_DEV, HisEnum.Medical_Refund, merchantEnum, params -> { + public static JsonResult medRefund(MerchantEnum merchantEnum, String payAuthNo, String fpNum, String bankTransNo, String refundTradeNo, BigDecimal cashFee) { + return HisMedHelper.getJsonResultByMer(merchantEnum.IS_DEV, HisEnum.Medical_Refund, merchantEnum, params -> { params.put("PayAuthNo", payAuthNo); // AUTH530100202206291132200000008 params.put("FPNum", fpNum); params.put("PayWay", "4"); @@ -238,8 +238,8 @@ public class HisMIDao { * 15 : 结算失败 * -1 : 状态未知 */ - public static JsonResult getMIAccounts(MerchantEnum merchantEnum, String mdUserId) { - return HisMIHelper.getJsonResultByMer(merchantEnum.IS_DEV, HisEnum.Medical_QueryOrderStatus, merchantEnum, params -> { + public static JsonResult getMedAccounts(MerchantEnum merchantEnum, String mdUserId) { + return HisMedHelper.getJsonResultByMer(merchantEnum.IS_DEV, HisEnum.Medical_QueryOrderStatus, merchantEnum, params -> { params.put("UserID_YBZF", mdUserId); }); } @@ -259,7 +259,7 @@ public class HisMIDao { return Result.error(ResultEnum.PARAM_IS_DEFECT); } - JsonResult JsonResult = HisMIHelper.getJsonResult(HisMIHelper.IS_PROD, HisEnum.Medical_Insurance_Bill, params -> { + JsonResult JsonResult = HisMedHelper.getJsonResult(HisMedHelper.IS_PROD, HisEnum.Medical_Insurance_Bill, params -> { params.put("QueryNumType", queryNumType); params.put("QueryNumber", queryNumber); params.put("BegDate", begDate); @@ -278,7 +278,7 @@ public class HisMIDao { * @param idCardNo 身份证号 */ public static JsonResult getChronicList(String idCardNo) { - return HisMIHelper.getJsonResult(HisMIHelper.IS_PROD, HisEnum.YDZF_QueryDiseaseInfo, params -> { + return HisMedHelper.getJsonResult(HisMedHelper.IS_PROD, HisEnum.YDZF_QueryDiseaseInfo, params -> { params.put("CallNo", HisHelper.WECHAT_CALL_NO); params.put("IDCardNo", idCardNo); }); diff --git a/src/main/java/com/ynxbd/common/dao/his/HisMITestDao.java b/src/main/java/com/ynxbd/common/dao/his/HisMedTestDao.java similarity index 85% rename from src/main/java/com/ynxbd/common/dao/his/HisMITestDao.java rename to src/main/java/com/ynxbd/common/dao/his/HisMedTestDao.java index 17bb64b..d93c7cd 100644 --- a/src/main/java/com/ynxbd/common/dao/his/HisMITestDao.java +++ b/src/main/java/com/ynxbd/common/dao/his/HisMedTestDao.java @@ -3,7 +3,7 @@ package com.ynxbd.common.dao.his; import com.ynxbd.common.bean.HisRecipe; import com.ynxbd.common.helper.his.HisEnum; import com.ynxbd.common.helper.his.HisHelper; -import com.ynxbd.common.helper.his.HisMIHelper; +import com.ynxbd.common.helper.his.HisMedHelper; import com.ynxbd.common.result.JsonResult; import java.util.ArrayList; @@ -11,7 +11,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class HisMITestDao { +public class HisMedTestDao { /** * [测试]查询处方 @@ -22,7 +22,7 @@ public class HisMITestDao { public static List devUnPayList(String patientId, int days) { List resultList = new ArrayList<>(); - JsonResult jsonResult = HisMIHelper.getJsonResult(HisMIHelper.IS_DEV, HisEnum.AP_Query_UnPay_Invoice, params -> { + JsonResult jsonResult = HisMedHelper.getJsonResult(HisMedHelper.IS_DEV, HisEnum.AP_Query_UnPay_Invoice, params -> { params.put("PatientID", patientId); params.put("IsLastWeekFlag", days <= 7 ? "1" : ""); params.put("CallNo", HisHelper.WECHAT_CALL_NO); @@ -56,7 +56,7 @@ public class HisMITestDao { params.put("RecipeID", ""); params.put("StartTime", begDate); params.put("EndTime", endDate); - JsonResult jsonResult = HisMIHelper.getJsonResult(HisMIHelper.IS_DEV, HisEnum.AP_Query_OutpatientFee, params); + JsonResult jsonResult = HisMedHelper.getJsonResult(HisMedHelper.IS_DEV, HisEnum.AP_Query_OutpatientFee, params); if (!jsonResult.success()) { // 请求失败 return resultList; diff --git a/src/main/java/com/ynxbd/common/dao/his/HisRecipeDao.java b/src/main/java/com/ynxbd/common/dao/his/HisRecipeDao.java index 705a446..54baf97 100644 --- a/src/main/java/com/ynxbd/common/dao/his/HisRecipeDao.java +++ b/src/main/java/com/ynxbd/common/dao/his/HisRecipeDao.java @@ -5,7 +5,7 @@ import com.ynxbd.common.bean.enums.MerchantEnum; import com.ynxbd.common.bean.xk.medicalRecipe; import com.ynxbd.common.helper.his.HisEnum; import com.ynxbd.common.helper.his.HisHelper; -import com.ynxbd.common.helper.his.HisMIHelper; +import com.ynxbd.common.helper.his.HisMedHelper; import com.ynxbd.common.result.JsonResult; import com.ynxbd.common.result.Result; import com.ynxbd.wx.config.WeChatConfig; @@ -100,7 +100,7 @@ public class HisRecipeDao { public Result uploadRxMI(String treatNum, String personID, String recipes) { List resultList = new ArrayList<>(); - JsonResult jsonResult = HisMIHelper.getJsonResult(HisMIHelper.IS_PROD, HisEnum.XK_MEDICAL_RECIPE, params -> { + JsonResult jsonResult = HisMedHelper.getJsonResult(HisMedHelper.IS_PROD, HisEnum.XK_MEDICAL_RECIPE, params -> { params.put("PersonID", personID); params.put("MZNum", treatNum); params.put("CallNo", HisHelper.WECHAT_CALL_NO); diff --git a/src/main/java/com/ynxbd/common/helper/his/HisMIHelper.java b/src/main/java/com/ynxbd/common/helper/his/HisMedHelper.java similarity index 98% rename from src/main/java/com/ynxbd/common/helper/his/HisMIHelper.java rename to src/main/java/com/ynxbd/common/helper/his/HisMedHelper.java index bf022ca..892139e 100644 --- a/src/main/java/com/ynxbd/common/helper/his/HisMIHelper.java +++ b/src/main/java/com/ynxbd/common/helper/his/HisMedHelper.java @@ -7,7 +7,7 @@ import com.ynxbd.common.result.JsonResultEnum; import java.util.HashMap; import java.util.Map; -public class HisMIHelper { +public class HisMedHelper { public final static boolean IS_PROD = false; // false为生产环境 public final static boolean IS_DEV = true; // true为测试环境 diff --git a/src/main/java/com/ynxbd/common/service/MedicalService.java b/src/main/java/com/ynxbd/common/service/MedicalService.java index 5de1f4f..a903e96 100644 --- a/src/main/java/com/ynxbd/common/service/MedicalService.java +++ b/src/main/java/com/ynxbd/common/service/MedicalService.java @@ -9,7 +9,7 @@ import com.ynxbd.common.bean.enums.MerchantEnum; import com.ynxbd.common.bean.pay.*; import com.ynxbd.common.dao.RecipeDao; import com.ynxbd.common.dao.RegisterDao; -import com.ynxbd.common.dao.his.HisMIDao; +import com.ynxbd.common.dao.his.HisMedDao; import com.ynxbd.common.helper.common.CodeHelper; import com.ynxbd.common.helper.common.JsonHelper; import com.ynxbd.common.result.JsonResult; @@ -17,10 +17,10 @@ import com.ynxbd.common.result.Result; import com.ynxbd.common.result.ResultEnum; import com.ynxbd.common.result.ServiceException; import com.ynxbd.wx.config.WeChatConfig; -import com.ynxbd.wx.wxfactory.WxMedicalHelper; +import com.ynxbd.wx.wxfactory.WxMedHelper; import com.ynxbd.wx.wxfactory.WxPayHelper; import com.ynxbd.wx.wxfactory.bean.MedicalInfo; -import com.ynxbd.wx.wxfactory.bean.MIOrder; +import com.ynxbd.wx.wxfactory.bean.WxMedOrder; import com.ynxbd.wx.wxfactory.bean.MedicalUserInfo; import com.ynxbd.wx.wxfactory.bean.OrderMIEnum; import com.ynxbd.wx.wxfactory.medical.WxMedConfig; @@ -69,7 +69,7 @@ public class MedicalService { if (merchantEnum == MerchantEnum.ALI_MEDICAL) { // 支付宝医保 payAuthNo = qrCode; } else { - MedicalUserInfo userInfo = WxMedicalHelper.getUserInfo(openid, qrCode, cardNo, realName); + MedicalUserInfo userInfo = WxMedHelper.getUserInfo(openid, qrCode, cardNo, realName); payAuthNo = userInfo.getPayAuthNo(); } return payAuthNo; @@ -86,11 +86,11 @@ public class MedicalService { * @param realName 真实姓名 * @param reg 挂号信息 */ - public MedicalInfo hisRegMIUploadFeeDetails(MerchantEnum merchantEnum, String qrCode, String openid, String patientId, String cardNo, String realName, Register reg, Boolean isSplitTime) throws ServiceException { + public MedicalInfo hisRegMedUploadDetails(MerchantEnum merchantEnum, String qrCode, String openid, String patientId, String cardNo, String realName, Register reg, Boolean isSplitTime) throws ServiceException { String payAuthNo = getPayAuthNo(merchantEnum, openid, qrCode, cardNo, realName); log.info("[医保]上传明细：patientId={}, cardNo={}, realName={}, reg={}", patientId, cardNo, realName, reg); - JsonResult result = HisMIDao.regMIUploadFeeDetails(merchantEnum, reg, payAuthNo, cardNo, isSplitTime); - return hisMIPlaceOrder(merchantEnum, payAuthNo, result); + JsonResult result = HisMedDao.regMedUploadDetails(merchantEnum, reg, payAuthNo, cardNo, isSplitTime); + return hisMedPlaceOrder(merchantEnum, payAuthNo, result); } /** @@ -105,19 +105,19 @@ public class MedicalService { * @param recipeJson 处方json * @param totalFee 订单金额 */ - public MedicalInfo hisRxUploadFeeDetails(MerchantEnum merchantEnum, String qrCode, String openid, String patientId, String cardNo, String realName, String treatNum, String recipeJson, BigDecimal totalFee, String ybAttrib, String ybBZCode, String ybBZName) throws ServiceException { + public MedicalInfo hisRxUploadDetails(MerchantEnum merchantEnum, String qrCode, String openid, String patientId, String cardNo, String realName, String treatNum, String recipeJson, BigDecimal totalFee, String ybAttrib, String ybBZCode, String ybBZName) throws ServiceException { String payAuthNo; if (merchantEnum == MerchantEnum.ALI_MEDICAL) { payAuthNo = qrCode; } else { - MedicalUserInfo userInfo = WxMedicalHelper.getUserInfo(openid, qrCode, cardNo, realName); + MedicalUserInfo userInfo = WxMedHelper.getUserInfo(openid, qrCode, cardNo, realName); payAuthNo = userInfo.getPayAuthNo(); } // 测试报告内容[2] log.info("{}[HIS医保上传明细] req={patientId:{}, treatNum={}, totalFee:{}, cardNo:{}, recipeJson:{}}", merchantEnum.NAME, patientId, treatNum, totalFee, cardNo, recipeJson); - JsonResult result = HisMIDao.rxMIUploadFeeDetails(merchantEnum, payAuthNo, cardNo, openid, patientId, treatNum, recipeJson, totalFee, ybAttrib, ybBZCode, ybBZName); - return hisMIPlaceOrder(merchantEnum, payAuthNo, result); + JsonResult result = HisMedDao.rxMedUploadDetails(merchantEnum, payAuthNo, cardNo, openid, patientId, treatNum, recipeJson, totalFee, ybAttrib, ybBZCode, ybBZName); + return hisMedPlaceOrder(merchantEnum, payAuthNo, result); } /** @@ -125,7 +125,7 @@ public class MedicalService { * * @param payAuthNo 授权码 */ - private MedicalInfo hisMIPlaceOrder(MerchantEnum merchantEnum, String payAuthNo, JsonResult result) throws ServiceException { + private MedicalInfo hisMedPlaceOrder(MerchantEnum merchantEnum, String payAuthNo, JsonResult result) throws ServiceException { if (result == null) { throw new ServiceException("[医保]返回数据为空"); } @@ -152,7 +152,7 @@ public class MedicalService { medicalInfo.setChrgBchno(chrgBchno); medicalInfo.setMdUserId(mdUserId); - JsonResult resp = HisMIDao.placeMIOrder(merchantEnum, medicalInfo); + JsonResult resp = HisMedDao.placeMedOrder(merchantEnum, medicalInfo); if (!resp.success()) { log.info("[上传明细失败] {}", resp.getMessage()); throw new ServiceException(resp.getMessage()); @@ -184,13 +184,13 @@ public class MedicalService { } // 创建医保订单 - private MICreateOrder createMIOrder(MerchantEnum merchantEnum, OrderMIEnum orderMIEnum, boolean hasDBOrder, String orderTitle, String openid, String outTradeNo, String cardNo, String realName, String ip, String payOrdId, String payAuthNo, String chrgBchno, - BigDecimal totalFee, BigDecimal insuranceFee, BigDecimal cashFee, String notifyType, - String familyType, String familyName, String familyCardNo, String medicalCardInstId, String medicalCardId) throws ServiceException { - MICreateOrder miCreateOrder = new MICreateOrder(); + private MedCreateOrder createMIOrder(MerchantEnum merchantEnum, OrderMIEnum orderMIEnum, boolean hasDBOrder, String orderTitle, String openid, String outTradeNo, String cardNo, String realName, String ip, String payOrdId, String payAuthNo, String chrgBchno, + BigDecimal totalFee, BigDecimal insuranceFee, BigDecimal cashFee, String notifyType, + String familyType, String familyName, String familyCardNo, String medicalCardInstId, String medicalCardId) throws ServiceException { + MedCreateOrder medCreateOrder = new MedCreateOrder(); if (MerchantEnum.WX_MEDICAL.equals(merchantEnum)) { - Map map = WxMedicalHelper.createOrder(orderMIEnum, + Map map = WxMedHelper.createOrder(orderMIEnum, openid, outTradeNo, chrgBchno, @@ -209,8 +209,8 @@ public class MedicalService { familyType, familyName, familyCardNo); - miCreateOrder.setIsHasMerOrder(null); - miCreateOrder.setMap(map); + medCreateOrder.setIsHasMerOrder(null); + medCreateOrder.setMap(map); } else if (MerchantEnum.ALI_MEDICAL.equals(merchantEnum)) { if (ObjectUtils.isEmpty(medicalCardId)) { @@ -236,11 +236,11 @@ public class MedicalService { medicalCardInstId, medicalCardId); - miCreateOrder.setIsHasMerOrder(order.hasTradeState()); - miCreateOrder.setMap(map); - return miCreateOrder; + medCreateOrder.setIsHasMerOrder(order.hasTradeState()); + medCreateOrder.setMap(map); + return medCreateOrder; } - return miCreateOrder; + return medCreateOrder; } @@ -289,7 +289,7 @@ public class MedicalService { log.info("[医保][处方]下单 hasDBOrder={}, openid={}, patientId={}, treatNum={}, outTradeNo={}, payOrdId={}, payAuthNo={}, totalFee={}, acctFee={}, hifpFee={}, cashFee={}, idCardNo={}, realName={}, familyType={}, familyName={}, medicalCardId={}, medicalCardInstId={}", hasDBOrder, openid, patientId, treatNum, outTradeNo, payOrdId, payAuthNo, totalFee, acctFee, hifpFee, cashFee, cardNo, realName, familyType, familyName, medicalCardId, medicalCardInstId); String orderTitle = "门诊号:" + treatNum; - MICreateOrder miOrder = createMIOrder(merchantEnum, OrderMIEnum.DIAG_PAY, hasDBOrder, orderTitle, openid, outTradeNo, cardNo, realName, ip, payOrdId, payAuthNo, chrgBchno, + MedCreateOrder miOrder = createMIOrder(merchantEnum, OrderMIEnum.DIAG_PAY, hasDBOrder, orderTitle, openid, outTradeNo, cardNo, realName, ip, payOrdId, payAuthNo, chrgBchno, totalFee, insuranceFee, cashFee, notifyType, familyType, familyName, familyCardNo, medicalCardInstId, medicalCardId); @@ -383,7 +383,7 @@ public class MedicalService { log.info("[医保][挂号]下单 hasDBOrder={}, openid={}, patientId={}, treatNum={}, outTradeNo={}, payOrdId={}, payAuthNo={}, totalFee={}, acctFee={}, hifpFee={}, cashFee={}, idCardNo={}, realName={}, familyType={}, familyName={}, medicalCardId={}, medicalCardInstId={}", hasDBOrder, openid, patientId, treatNum, outTradeNo, payOrdId, payAuthNo, totalFee, acctFee, hifpFee, cashFee, cardNo, realName, familyType, familyName, medicalCardId, medicalCardInstId); String orderTitle = "挂号"; - MICreateOrder miOrder = createMIOrder(merchantEnum, OrderMIEnum.REG_PAY, hasDBOrder, orderTitle, openid, outTradeNo, cardNo, realName, ip, payOrdId, payAuthNo, chrgBchno, + MedCreateOrder miOrder = createMIOrder(merchantEnum, OrderMIEnum.REG_PAY, hasDBOrder, orderTitle, openid, outTradeNo, cardNo, realName, ip, payOrdId, payAuthNo, chrgBchno, totalFee, insuranceFee, cashFee, notifyType, familyType, familyName, familyCardNo, medicalCardInstId, medicalCardId); @@ -477,7 +477,7 @@ public class MedicalService { return false; } - JsonResult jsonResult = HisMIDao.regMIPay(merchantEnum, mdUserId, payDate, payTime, tradeNo, bankTransNo, cashFee); + JsonResult jsonResult = HisMedDao.regMedPay(merchantEnum, mdUserId, payDate, payTime, tradeNo, bankTransNo, cashFee); if (!jsonResult.success()) { String respCode = jsonResult.getCode(); String respMessage = jsonResult.getMessage(); @@ -533,7 +533,7 @@ public class MedicalService { private ApiResult autoRefund(MerchantEnum merchantEnum, String outTradeNo, String tradeNo, BigDecimal cashFee, String reason) { ApiResult apiResult = new ApiResult(); if (MerchantEnum.WX_MEDICAL == merchantEnum) { - MIOrder order = WxMedicalHelper.refundCash(outTradeNo, tradeNo, cashFee, reason); + WxMedOrder order = WxMedHelper.refundCash(outTradeNo, tradeNo, cashFee, reason); apiResult.setSuccess(order.isOk()); apiResult.setMessage(order.isOk() ? WxPayHelper.OK : order.getMessage()); } else { @@ -598,7 +598,7 @@ public class MedicalService { log.info("{} [医保][处方]更新商户信息成功 outTradeNo={}, bankTransNo={}", merchantEnum.NAME, outTradeNo, bankTransNo); } - JsonResult jsonResult = HisMIDao.rxMIPay(merchantEnum, mdUserId, payDate, payTime, tradeNo, bankTransNo, cashFee); + JsonResult jsonResult = HisMedDao.rxMedPay(merchantEnum, mdUserId, payDate, payTime, tradeNo, bankTransNo, cashFee); if (!jsonResult.success()) { String respCode = jsonResult.getCode(); String respMessage = jsonResult.getMessage(); @@ -680,7 +680,7 @@ public class MedicalService { // 医保退费-必须先执行 log.info("[医保][处方][个账]退费开始 tradeNo={}, payAuthNo={}, fpNum={}", tradeNo, payAuthNo, fpNum); - JsonResult jsonResult = HisMIDao.miRefund(MerchantEnum.WX_MEDICAL, payAuthNo, fpNum, bankTransNo, ("R" + tradeNo), cashFee); + JsonResult jsonResult = HisMedDao.medRefund(MerchantEnum.WX_MEDICAL, payAuthNo, fpNum, bankTransNo, ("R" + tradeNo), cashFee); if (!jsonResult.success()) { // 失败 log.info("[医保][处方][个账]退费失败 outTradeNo={}, bankTransNo={}, tradeNo={}", outTradeNo, bankTransNo, tradeNo); String message = jsonResult.getMessage(); @@ -715,7 +715,7 @@ public class MedicalService { String outRefundNo = ("R" + tradeNo); if (merchantEnum.equals(MerchantEnum.WX_MEDICAL)) { - MIOrder order = WxMedicalHelper.refund(outTradeNo, outRefundNo, tradeNo, cashFee, null); + WxMedOrder order = WxMedHelper.refund(outTradeNo, outRefundNo, tradeNo, cashFee, null); boolean isOk = order.isOk(); log.info("[微信][处方][现金]退费{} outTradeNo={}, bankTransNo={}, tradeNo={}", (isOk ? "成功" : "失败"), outTradeNo, bankTransNo, tradeNo); if (isOk) { @@ -771,7 +771,7 @@ public class MedicalService { if (merchantEnum == null) { return null; } - JsonResult jsonResult = HisMIDao.getMIAccounts(merchantEnum, mdUserId); + JsonResult jsonResult = HisMedDao.getMedAccounts(merchantEnum, mdUserId); if (!jsonResult.success()) { // 未找到 return null; } diff --git a/src/main/java/com/ynxbd/common/service/PayService.java b/src/main/java/com/ynxbd/common/service/PayService.java index c794dc8..ba089b6 100644 --- a/src/main/java/com/ynxbd/common/service/PayService.java +++ b/src/main/java/com/ynxbd/common/service/PayService.java @@ -15,7 +15,7 @@ import com.ynxbd.common.result.Result; import com.ynxbd.common.result.ResultEnum; import com.ynxbd.common.result.ServiceException; import com.ynxbd.common.service.cache.PayCache; -import com.ynxbd.wx.wxfactory.WxMedicalHelper; +import com.ynxbd.wx.wxfactory.WxMedHelper; import com.ynxbd.wx.wxfactory.WxPayHelper; import com.ynxbd.wx.wxfactory.bean.WxPayNotify; import lombok.extern.slf4j.Slf4j; @@ -551,7 +551,7 @@ public class PayService { */ public static JSONObject goMedical(MerchantEnum merchantEnum, PEnum pEnum) { if (MerchantEnum.WX_MEDICAL.equals(merchantEnum)) { // 微信医保（获取授权链接） - return WxMedicalHelper.getMdAuthUrl("wx-medical.html", pEnum.CODE); + return WxMedHelper.getMdAuthUrl("wx-medical.html", pEnum.CODE); } return null; } diff --git a/src/main/java/com/ynxbd/common/service/RecipeService.java b/src/main/java/com/ynxbd/common/service/RecipeService.java index 8a697b5..82ad35e 100644 --- a/src/main/java/com/ynxbd/common/service/RecipeService.java +++ b/src/main/java/com/ynxbd/common/service/RecipeService.java @@ -23,9 +23,9 @@ import com.ynxbd.common.result.ServiceException; import com.ynxbd.common.service.cache.PayCache; import com.ynxbd.wx.config.TZReserveConfig; import com.ynxbd.wx.utils.DateGenerate; -import com.ynxbd.wx.wxfactory.WxMedicalHelper; +import com.ynxbd.wx.wxfactory.WxMedHelper; import com.ynxbd.wx.wxfactory.WxPayHelper; -import com.ynxbd.wx.wxfactory.bean.MIOrder; +import com.ynxbd.wx.wxfactory.bean.WxMedOrder; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; @@ -687,7 +687,7 @@ public class RecipeService { } - MIOrder order = WxMedicalHelper.refund(outTradeNo, ("R" + payOrdId), payOrdId, cashFee, reason); + WxMedOrder order = WxMedHelper.refund(outTradeNo, ("R" + payOrdId), payOrdId, cashFee, reason); log.info("[医保]现金退费order={}", order); String refundReason = "线下现金退费"; if (!ObjectUtils.isEmpty(reason)) { diff --git a/src/main/java/com/ynxbd/common/service/RegService.java b/src/main/java/com/ynxbd/common/service/RegService.java index 158ce12..d6d2b8b 100644 --- a/src/main/java/com/ynxbd/common/service/RegService.java +++ b/src/main/java/com/ynxbd/common/service/RegService.java @@ -22,9 +22,9 @@ import com.ynxbd.common.result.ResultEnum; import com.ynxbd.common.result.ServiceException; import com.ynxbd.wx.config.MessagePushConfig; import com.ynxbd.wx.utils.DateGenerate; -import com.ynxbd.wx.wxfactory.WxMedicalHelper; +import com.ynxbd.wx.wxfactory.WxMedHelper; import com.ynxbd.wx.wxfactory.WxPayHelper; -import com.ynxbd.wx.wxfactory.bean.MIOrder; +import com.ynxbd.wx.wxfactory.bean.WxMedOrder; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; @@ -278,7 +278,7 @@ public class RegService { return Result.success(map); } - MIOrder order = WxMedicalHelper.refund(outTradeNo, ("R" + payOrdId), payOrdId, cashFee, reason); + WxMedOrder order = WxMedHelper.refund(outTradeNo, ("R" + payOrdId), payOrdId, cashFee, reason); log.info("[医保]挂号现金退费order={}", order); String refundReason = "线下现金退费"; if (!ObjectUtils.isEmpty(reason)) { diff --git a/src/main/java/com/ynxbd/wx/wxfactory/WxCacheHelper.java b/src/main/java/com/ynxbd/wx/wxfactory/WxCacheHelper.java index 4874755..9c339d3 100644 --- a/src/main/java/com/ynxbd/wx/wxfactory/WxCacheHelper.java +++ b/src/main/java/com/ynxbd/wx/wxfactory/WxCacheHelper.java @@ -72,7 +72,7 @@ public class WxCacheHelper { token.setAccessToken(cacheToken.getAccessToken()); return token; } - AccessToken respToken = WxMedicalHelper.getAccessToken(ACCESS_TOKEN_CACHE); + AccessToken respToken = WxMedHelper.getAccessToken(ACCESS_TOKEN_CACHE); if (respToken == null) { return null; } @@ -115,7 +115,7 @@ public class WxCacheHelper { token.setJsapiTicket(cacheTicket.getJsapiTicket()); return token; } - JsapiTicket respToken = WxMedicalHelper.getJsapiTicket(JSAPI_TICKET_CACHE); + JsapiTicket respToken = WxMedHelper.getJsapiTicket(JSAPI_TICKET_CACHE); if (respToken == null) { return null; } diff --git a/src/main/java/com/ynxbd/wx/wxfactory/WxMedicalHelper.java b/src/main/java/com/ynxbd/wx/wxfactory/WxMedHelper.java similarity index 95% rename from src/main/java/com/ynxbd/wx/wxfactory/WxMedicalHelper.java rename to src/main/java/com/ynxbd/wx/wxfactory/WxMedHelper.java index da38f5b..0154293 100644 --- a/src/main/java/com/ynxbd/wx/wxfactory/WxMedicalHelper.java +++ b/src/main/java/com/ynxbd/wx/wxfactory/WxMedHelper.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; @Slf4j -public class WxMedicalHelper { +public class WxMedHelper { private static final RepeatKeyHelper KEYS = new RepeatKeyHelper(60); @@ -69,7 +69,7 @@ public class WxMedicalHelper { * @param request 请求 * @return 支付信息 */ - public static MedicalNotify paidMINotify(HttpServletRequest request) throws ServiceException { + public static MedicalNotify paidMedNotify(HttpServletRequest request) throws ServiceException { try { // 转换数据对象 Map paramsMap = WxSignHelper.getReqXmlParamsMap(request); @@ -201,7 +201,7 @@ public class WxMedicalHelper { * @param outTradeNo 订单号 * @param medTransId 医保订单号 */ - public static MIOrder queryOrder(String accessToken, String outTradeNo, String medTransId) { + public static WxMedOrder queryOrder(String accessToken, String outTradeNo, String medTransId) { return WxFactory.Medical.Common().queryOrder( accessToken, WxMedConfig.MD_APP_ID, @@ -249,7 +249,7 @@ public class WxMedicalHelper { /** * [医保]退费 */ - public static MIOrder refund(String outTradeNo, String outRefundNo, String payOrdId, BigDecimal cashFee, String reason) { + public static WxMedOrder refund(String outTradeNo, String outRefundNo, String payOrdId, BigDecimal cashFee, String reason) { return WxFactory.Medical.Common().refund( WxCacheHelper.getAccessToken(), WxMedConfig.MD_APP_ID, @@ -267,7 +267,7 @@ public class WxMedicalHelper { /** * [医保]退现金部分 */ - public static MIOrder refundCash(String outTradeNo, String outRefundNo, String payOrdId, BigDecimal cashFee, String reason) { + public static WxMedOrder refundCash(String outTradeNo, String outRefundNo, String payOrdId, BigDecimal cashFee, String reason) { return WxFactory.Medical.Common().refund( WxCacheHelper.getAccessToken(), WxMedConfig.MD_APP_ID, @@ -285,7 +285,7 @@ public class WxMedicalHelper { /** * [医保]退现金部分 */ - public static MIOrder refundCash(String outTradeNo, String tradeNo, BigDecimal cashFee, String reason) { + public static WxMedOrder refundCash(String outTradeNo, String tradeNo, BigDecimal cashFee, String reason) { return refundCash(outTradeNo, "R" + tradeNo, tradeNo, cashFee, reason); } diff --git a/src/main/java/com/ynxbd/wx/wxfactory/bean/MIOrder.java b/src/main/java/com/ynxbd/wx/wxfactory/bean/WxMedOrder.java similarity index 95% rename from src/main/java/com/ynxbd/wx/wxfactory/bean/MIOrder.java rename to src/main/java/com/ynxbd/wx/wxfactory/bean/WxMedOrder.java index dcf715a..ccd1783 100644 --- a/src/main/java/com/ynxbd/wx/wxfactory/bean/MIOrder.java +++ b/src/main/java/com/ynxbd/wx/wxfactory/bean/WxMedOrder.java @@ -15,7 +15,7 @@ import java.math.BigDecimal; @Getter @ToString(callSuper = true) @NoArgsConstructor -public class MIOrder extends WxFactory.ResponseCheck.ResultBase { +public class WxMedOrder extends WxFactory.ResponseCheck.ResultBase { private String medTradeState; private String cashTradeStatus; private String insuranceTradeStatus; 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 d046277..22645a7 100644 --- a/src/main/java/com/ynxbd/wx/wxfactory/medical/Client.java +++ b/src/main/java/com/ynxbd/wx/wxfactory/medical/Client.java @@ -156,7 +156,7 @@ public class Client { } - public MIOrder queryOrder(String accessToken, String appId, String mchId, String mdPayKey, String outTradeNo, String medTransId) { + public WxMedOrder queryOrder(String accessToken, String appId, String mchId, String mdPayKey, String outTradeNo, String medTransId) { JsonResult jsonResult = WxRequestHelper.postMdXml(("https://api.weixin.qq.com/payinsurance/queryorder?access_token=" + accessToken), params -> { params.put("appid", appId); params.put("mch_id", mchId); @@ -169,10 +169,10 @@ public class Client { log.info("[医保][查询订单] req={}", JsonHelper.toJsonString(params)); }); if (!jsonResult.success()) { - return new MIOrder().createResult(jsonResult); + return new WxMedOrder().createResult(jsonResult); } log.info("[医保][查询订单] req={}", JsonHelper.toJsonString(jsonResult)); - MIOrder order = jsonResult.dataMapToBean(MIOrder.class); + WxMedOrder order = jsonResult.dataMapToBean(WxMedOrder.class); order.setCashFee(order.getCashFee().movePointLeft(2)); order.setTotalFee(order.getTotalFee().movePointLeft(2)); @@ -199,7 +199,7 @@ public class Client { * @param cashFee 退费现金 * @param reason 退费原因 */ - public MIOrder refund(String accessToken, String appId, String mchId, String mdPayKey, String outTradeNo, String outRefundNo, String payOrdId, BigDecimal cashFee, MdRefundTypeEnum mdRefundTypeEnum, String reason) { + public WxMedOrder refund(String accessToken, String appId, String mchId, String mdPayKey, String outTradeNo, String outRefundNo, String payOrdId, BigDecimal cashFee, MdRefundTypeEnum mdRefundTypeEnum, String reason) { if (reason == null) { reason = "申请退款"; } @@ -247,7 +247,7 @@ public class Client { if (!jsonResult.success()) { return new MedicalRefund().createResult(jsonResult); } - return jsonResult.dataMapToBean(MIOrder.class); + return jsonResult.dataMapToBean(WxMedOrder.class); }