Merge branch 'master-alipay-change' into base-modify

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

@@ -340,10 +340,8 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> implements In
         AlipayFundAuthOrderAppFreezeRequest request = new AlipayFundAuthOrderAppFreezeRequest();
         BigDecimal realAmount = new BigDecimal(orderPayVo.getAmount().toString()).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_UP);
         request.setBizContent("{" +
-                "\"auth_code\":\"" + orderPayVo.getTradeNo() + "\"," +
-                "\"auth_code_type\":\"bar_code\"," +
-                "\"out_order_no\":\"" + orderPayVo.getOrderNo() + "\"," +
-                "\"out_request_no\":\"" + orderPayVo.getOrderNo() + "\"," +
+                "\"out_order_no\":\"" + orderPayVo.getTradeNo() + "\"," +
+                "\"out_request_no\":\"" + orderPayVo.getTradeNo() + "\"," +
                 "\"order_title\":\"" + orderPayVo.getSubject() + "\"," +
                 "\"product_code\":\"PRE_AUTH_ONLINE\"," +
                 "\"pay_timeout\":\"1d\"," +
@@ -648,13 +646,13 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> implements In
     public static void main(String[] args) throws AlipayApiException {
         OrderPayBiz orderPayBiz = new OrderPayBiz();
         OrderPayVo orderPayVo = new OrderPayVo();
-        orderPayVo.setOrderNo("20191024121000010004");
-        orderPayVo.setTradeNo("2019102410002001530572255591");
+        orderPayVo.setOrderNo("20191024142517000001");
+        orderPayVo.setTradeNo("2019102410002001530572454194");
         orderPayVo.setAmount(2);
         orderPayVo.setBody("扣除租车订单费用");
         orderPayVo.setSubject("租车订单交易费用");
-        orderPayBiz.fundAuthOrderUnFreeze(orderPayVo, "");
-        //orderPayBiz.alipayOrderRefund("20190806134440000001","2019080622001421530542309594", 3, "xxxx", "");
+       // orderPayBiz.fundAuthOrderUnFreeze(orderPayVo, "");
+        orderPayBiz.alipayOrderRefund("20191024142517000001","2019102422001421530513284677", 2, "xxxx", "");
         //orderPayBiz.tradePay(orderPayVo, "");
         //orderPayBiz.fundAuthCancel(orderPayVo, "");
     }