处方流转授权链接获取接口调整

src/main/java/com/ynxbd/common/action/pay/MedicalAction.java

@@ -18,6 +18,7 @@ import com.ynxbd.common.result.ResultEnum;
 import com.ynxbd.common.result.ServiceException;
 import com.ynxbd.common.service.MedicalService;
 import com.ynxbd.common.service.params.RegParams;
+import com.ynxbd.wx.wxfactory.ReqParamHelper;
 import com.ynxbd.wx.wxfactory.WxCacheHelper;
 import com.ynxbd.wx.wxfactory.WxMedicalHelper;
 import com.ynxbd.wx.wxfactory.WxPayHelper;
@@ -99,11 +100,15 @@ public class MedicalAction extends BaseAction {
      * [处方流转]获取授权链接
      */
     @Action("getAuthUrl")
-    public Result getAuthUrl(String url, String callNo) {
+    public Result getAuthUrl(String url) {
-        if (ObjectUtils.isEmpty(url) || ObjectUtils.isEmpty(callNo)) {
+        if (ObjectUtils.isEmpty(url)) {
             return Result.error(ResultEnum.PARAM_IS_INVALID);
         }
-        JSONObject respJson = WxMedicalHelper.getMdAuthUrl(url, callNo);
+        url = ReqParamHelper.decode(url);
+        if (ObjectUtils.isEmpty(url)) {
+            return Result.error(ResultEnum.PARAM_IS_INVALID);
+        }
+        JSONObject respJson = WxMedicalHelper.getMdAuthUrl(url);
         return Result.success(respJson);
     }
 
@@ -115,6 +120,7 @@ public class MedicalAction extends BaseAction {
 
     /**
      * 获取对账链接
+     *
      * @param billDate 账单日期
      * @param billType 账单类型  ALL，返回当日所有订单信息，默认 SUCCESS，返回当日成功支付的订单 REFUND，返回当日退款订单
      * @param key      加密密钥

src/main/java/com/ynxbd/wx/wxfactory/WxMedicalHelper.java

@@ -12,6 +12,7 @@ import com.ynxbd.wx.wxfactory.bean.*;
 import com.ynxbd.wx.wxfactory.medical.MdConfig;
 import com.ynxbd.wx.wxfactory.utils.WxSignHelper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.ehcache.Cache;
 
 import javax.servlet.http.HttpServletRequest;
@@ -207,13 +208,23 @@ public class WxMedicalHelper {
                 medTransId);
     }
 
+
     /**
      * [医保]获取授权链接
      */
-    public static JSONObject getMdAuthUrl(String callbackUrl, String callNo) {
+    public static JSONObject getMdAuthUrl(String redirectUrl) {
-        if (callNo != null) {
+        JSONObject jsonObj = new JSONObject();
-            callNo = "?callNo=" + callNo;
+        jsonObj.put("url", WxFactory.Medical.Common().getAuthUrl(ObjectUtils.isEmpty(redirectUrl) ? "" : redirectUrl));
+        jsonObj.put("type", MerchantEnum.WX_MEDICAL.CODE);
+        return jsonObj;
     }
+
+    /**
+     * [医保]获取授权链接
+     */
+    public static JSONObject getMdAuthUrl(String callbackUrl, String callNo) {
+        callNo = ObjectUtils.isEmpty(callNo) ? "" : ("?callNo=" + callNo);
+        callbackUrl = ObjectUtils.isEmpty(callbackUrl) ? "" : callbackUrl;
         JSONObject jsonObj = new JSONObject();
         jsonObj.put("url", WxFactory.Medical.Common().getAuthUrl(WeChatConfig.getWebUrl() + callbackUrl) + callNo);
         jsonObj.put("type", MerchantEnum.WX_MEDICAL.CODE);