支付map加上类型

mec-biz/src/main/java/com/ym/mec/biz/service/impl/PayServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -43,12 +44,20 @@ public class PayServiceImpl implements PayService {
     public Map getPayMap(BigDecimal amount, String orderNo, String notifyUrl, String returnUrl, String orderSubject, String orderBody) throws Exception {
         //支付通道决策
         SysAccount routingAccount = getRoutingAccount(amount);
+        HashMap<String, Object> unionPay = new HashMap<>();
+        String type = "YQPAY";
+        Map payMap;
         if (routingAccount != null) {
             //易乾支付
-            return YqPayUtil.getPayMap(amount, orderNo, notifyUrl, returnUrl, orderSubject, orderBody, routingAccount.getMerNo());
+            payMap = YqPayUtil.getPayMap(amount, orderNo, notifyUrl, returnUrl, orderSubject, orderBody, routingAccount.getMerNo());
         } else {
-            return UnionPay.getPayMap(amount, orderNo, notifyUrl, returnUrl, orderSubject);
+            type = "UNIONPAY";
+            payMap = UnionPay.getPayMap(amount, orderNo, notifyUrl, returnUrl, orderSubject);
         }
+        unionPay.put("orderNo",orderNo);
+        unionPay.put("type",type);
+        unionPay.put("payMap",payMap);
+        return  unionPay;
     }
 
     public Map<String, Object> query(String orderNo) throws Exception {

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/union/UnionPay.java

@@ -105,7 +105,6 @@ public class UnionPay {
 
         param = getOpenBodySig(wpAppId, wpAppKey, timestamp, nonce, json.toString(), "GET");
         PayMap.put("weChatPay", wpPayUrl + "?" + param);
-        PayMap.put("type","UNIONPAY");
         return PayMap;
     }
 

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/yqpay/YqPayUtil.java

@@ -62,7 +62,6 @@ public class YqPayUtil {
         }
         Map<String, Object> payMap = getRequestMap(notifyUrl, contentMap);
         payMap.put("host", payUrl);
-        payMap.put("type","YQPAY");
         return payMap;
     }