根据请求协议返回链接

debug
王绍全 2 weeks ago
parent 4516c95876
commit 679067d51e
  1. 4
      src/main/java/com/ynxbd/common/action/pay/MedicalAction.java
  2. 4
      src/main/java/com/ynxbd/wx/wxfactory/WxMedHelper.java

@ -13,6 +13,7 @@ import com.ynxbd.common.dao.his.HisMedDao;
import com.ynxbd.common.helper.common.AesMicroHelper; import com.ynxbd.common.helper.common.AesMicroHelper;
import com.ynxbd.common.helper.common.DateHelper; import com.ynxbd.common.helper.common.DateHelper;
import com.ynxbd.common.helper.common.HttpHelper; import com.ynxbd.common.helper.common.HttpHelper;
import com.ynxbd.common.helper.common.ParamHelper;
import com.ynxbd.common.result.JsonResult; import com.ynxbd.common.result.JsonResult;
import com.ynxbd.common.result.Result; import com.ynxbd.common.result.Result;
import com.ynxbd.common.result.ResultEnum; import com.ynxbd.common.result.ResultEnum;
@ -48,7 +49,7 @@ public class MedicalAction extends BaseAction {
@Action("getFeeDetails") @Action("getFeeDetails")
public Result getFeeDetails(String callNo, String payCode, String openid, String qrCode, String patientId, String cardNo, String realName, BigDecimal totalFee, Boolean isSplitTime, String ybAttrib, String ybBZCode, String ybBZName) { public Result getFeeDetails(String callNo, String payCode, String openid, String qrCode, String patientId, String cardNo, String realName, BigDecimal totalFee, Boolean isSplitTime, String ybAttrib, String ybBZCode, String ybBZName) {
try { try {
log.info("[医保]上传明细下单 callNo={}, payCode={}, openid={}, qrCode={}, patientId={}, totalFee={}, ybAttrib={}, ybBZCode={}, ybBZName={}", callNo, payCode, openid, qrCode, patientId, totalFee, ybAttrib, ybBZCode, ybBZName); log.info("[医保]上传明细下单 callNo={}, payCode={}, openid={}, qrCode={}, patientId={}, cardNo={}, realName={}, totalFee={}, ybAttrib={}, ybBZCode={}, ybBZName={}", callNo, payCode, openid, qrCode, patientId, ParamHelper.hideIdCardNo(cardNo), realName, totalFee, ybAttrib, ybBZCode, ybBZName);
if (callNo == null || payCode == null || openid == null || qrCode == null || patientId == null || cardNo == null || totalFee == null) { if (callNo == null || payCode == null || openid == null || qrCode == null || patientId == null || cardNo == null || totalFee == null) {
return Result.error(ResultEnum.PARAM_IS_DEFECT); return Result.error(ResultEnum.PARAM_IS_DEFECT);
} }
@ -75,6 +76,7 @@ public class MedicalAction extends BaseAction {
case RECIPE: case RECIPE:
String treatNum = getString("treatNum"); String treatNum = getString("treatNum");
String recipeJson = getString("recipeJson"); // 处方JSON集 [{ recipeId: item.id, recipeFee: item.amount }] String recipeJson = getString("recipeJson"); // 处方JSON集 [{ recipeId: item.id, recipeFee: item.amount }]
log.info("[医保-处方]上传明细下单 treatNum={}, recipeJson={}", treatNum, recipeJson);
if (treatNum == null || recipeJson == null) { if (treatNum == null || recipeJson == null) {
return Result.error(ResultEnum.PARAM_IS_DEFECT); return Result.error(ResultEnum.PARAM_IS_DEFECT);
} }

@ -236,8 +236,8 @@ public class WxMedHelper {
JSONObject jsonObj = new JSONObject(); JSONObject jsonObj = new JSONObject();
String authUrl = WxFactory.Medical.Common().getAuthUrl(WeChatConfig.getWebReqURL(isHttps) + callbackUrl); String authUrl = WxFactory.Medical.Common().getAuthUrl(WeChatConfig.reqProtocolToWebURL(isHttps) + callbackUrl);
log.info("[医保] authUrl={}", authUrl); log.info("[医保]授权URL={}", authUrl);
if (ObjectUtils.isEmpty(authUrl)) { if (ObjectUtils.isEmpty(authUrl)) {
jsonObj.put("url", "config_error"); jsonObj.put("url", "config_error");
} else { } else {

Loading…
Cancel
Save