app接口实现demo

移除过时的退款方法

Author: egzosn

pay-java-demo/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.13.1</version>
+        <version>2.13.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>

pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayController.java

@@ -167,14 +167,14 @@ public Map toPay(Integer payId, String openid, BigDecimal price) {
      * @param price 金额
      * @return 支付预订单信息
      */
-    @RequestMapping("getOrderInfo")
+    @RequestMapping("app")
     public Map<String, Object> getOrderInfo(Integer payId, String transactionType, BigDecimal price) {
         //获取对应的支付账户操作工具（可根据账户id）
         PayResponse payResponse = service.getPayResponse(payId);
         Map<String, Object> data = new HashMap<>();
         data.put("code", 0);
         PayOrder order = new PayOrder("订单title", "摘要", null == price ? new BigDecimal(0.01) : price, UUID.randomUUID().toString().replace("-", ""), PayType.valueOf(payResponse.getStorage().getPayType()).getTransactionType(transactionType));
-        data.put("orderInfo", payResponse.getService().orderInfo(order));
+        data.put("orderInfo", payResponse.getService().app(order));
         return data;
     }
 
@@ -436,9 +436,11 @@ public Map<String, Object> refund(Integer payId, RefundOrder order) {
      * @return 返回支付方查询退款后的结果
      */
     @RequestMapping("refundquery")
-    public Map<String, Object> refundquery(QueryOrder order) {
-        PayResponse payResponse = service.getPayResponse(order.getPayId());
-        return payResponse.getService().refundquery(order.getTradeNo(), order.getOutTradeNo());
+    public Map<String, Object> refundquery(Integer payId, RefundOrder order) {
+        PayResponse payResponse = service.getPayResponse(payId);
+
+
+        return payResponse.getService().refundquery(order);
     }
 
     /**

pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayPalPayController.java

@@ -2,7 +2,9 @@
 
 
 import com.egzosn.pay.common.api.PayService;
-import com.egzosn.pay.common.bean.*;
+import com.egzosn.pay.common.bean.DefaultCurType;
+import com.egzosn.pay.common.bean.PayOrder;
+import com.egzosn.pay.common.bean.RefundOrder;
 import com.egzosn.pay.common.http.HttpConfigStorage;
 import com.egzosn.pay.paypal.api.PayPalConfigStorage;
 import com.egzosn.pay.paypal.api.PayPalPayService;

pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/UnionPayController.java

@@ -139,7 +139,7 @@ public Map<String, Object> app() {
         //APPLE支付 苹果付
 //        order.setTransactionType(UnionTransactionType.APPLE);
 
-        data.put("orderInfo", service.orderInfo(order));
+        data.put("orderInfo", service.app(order));
         return data;
     }
 
@@ -270,16 +270,6 @@ public Map<String, Object> refund(RefundOrder order) {
         return service.refund(order);
     }
 
-    /**
-     * 查询退款
-     *
-     * @param order 订单的请求体
-     * @return 返回支付方查询退款后的结果
-     */
-    @RequestMapping("refundquery")
-    public Map<String, Object> refundquery(QueryOrder order) {
-        return service.refundquery(order.getTradeNo(), order.getOutTradeNo());
-    }
 
     /**
      * 下载对账单