支付宝支付

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

@@ -428,9 +428,10 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
      * @param tradNo       流水号
      * @param refundAmount 退款金额
      * @param refundReason 退款原因
+     *        outRequestNo  退款请求标示 用于分批退款，每笔退款标示不一样，同样标示不会重复退款
      * @return
      */
-    public boolean alipayOrderRefund(String outTradeNo, String tradNo, Integer refundAmount, String refundReason) {
+    public boolean alipayOrderRefund(String outTradeNo, String tradNo, Integer refundAmount, String refundReason, String outRequestNo) {
         AlipayClient alipayClient = getAlipayClient();
         AlipayTradeRefundRequest request = new AlipayTradeRefundRequest();
         BigDecimal realAmount = new BigDecimal(refundAmount.toString()).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_UP);
@@ -438,7 +439,8 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
                 "\"out_trade_no\":\"" + outTradeNo + "\"," +
                 "\"trade_no\":\"" + tradNo + "\"," +
                 "\"refund_amount\":" + realAmount + "," +
-                "\"out_request_no\":\"" + refundReason + "\"" +
+                "\"refund_reason\":\""+ refundReason + "\"," +
+                "\"out_request_no\":\"" + outRequestNo + "\"" +
                 "  }");
         try {
             log.info("支付宝退款中：outTradeNo = {}， tradNo = {}, refundAmount = {}, refundReason = {}", outTradeNo, tradNo, refundAmount, refundReason);
@@ -458,6 +460,6 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
 
     public static void main(String[] args) {
         OrderPayBiz orderPayBiz = new OrderPayBiz();
-        orderPayBiz.alipayOrderRefund("20190806140051000001","2019080622001421530542972689", 5, "xxxx");
+        orderPayBiz.alipayOrderRefund("20190806134440000001","2019080622001421530542309594", 3, "xxxx", "");
     }
 }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderRefundBiz.java

@@ -91,8 +91,7 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper, OrderRefund> {
         boolean flag = false;
         if (orderPay.getPayWay() == 2) {
             log.info("======支付宝退款中===========");
-            flag = payBiz.alipayOrderRefund(out_trade_no, orderPay.getSerialNumber(), refundAmount, refundDesc);
-
+            flag = payBiz.alipayOrderRefund(out_trade_no, orderPay.getSerialNumber(), refundAmount, refundDesc, out_trade_no + System.currentTimeMillis());
         } else if(orderPay.getPayWay() == 1){
             log.info("======微信退款中===========");
             flag = WxPayRefundUtils.refund(appid, mchId, partnerKey, out_trade_no, out_refund_no, payAmount + "",