预授权问题

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

@@ -257,7 +257,6 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
         }
         return ObjectRestResponse.createDefaultFail().getMessage();
     }
-
     /**
      * 支付宝生成支付信息
      *
@@ -439,7 +438,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
         //选填字段，信用授权订单，针对信用全免订单，传入该值完结信用订单，形成芝麻履约记录
         // model.setExtraParam("{\"unfreezeBizInfo\":\"{\\\"bizComplete\\\":\\\"true\\\"}\"}");
         request.setBizModel(model);
-        request.setNotifyUrl(notifyUrl);//异步通知地址，必填，该接口只通过该参数进行异步通知
+//        request.setNotifyUrl(notifyUrl);//异步通知地址，必填，该接口只通过该参数进行异步通知
         AlipayFundAuthOrderUnfreezeResponse response = alipayClient.execute(request);
         log.info("解冻预授权response: {}" + response.getBody());
         if (response.isSuccess()) {
@@ -463,7 +462,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
         model.setOutRequestNo(serialNumber);//与支付宝的授权资金操作流水号不能同时为空，与冻结流水号相同
         model.setRemark(refundReason); // 商户对本次撤销操作的附言描述，长度不超过100个字母或50个汉字
         request.setBizModel(model);
-        request.setNotifyUrl(notifyUrl);//异步通知地址，必填，该接口只通过该参数进行异步通知
+//        request.setNotifyUrl(notifyUrl);//异步通知地址，必填，该接口只通过该参数进行异步通知
 
         AlipayFundAuthOperationCancelResponse response = alipayClient.execute(request);
         log.info("取消预授权response: {}" + response.getBody());
@@ -494,7 +493,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
         //如果需要从一笔授权中完成多笔订单支付，保持auth_no不变，不同订单根据outTradeNo进行标识，此时auth_confirm_mode不传或者传入NOT_COMPLETE；进行到最后一笔转支付时，auth_confirm_mode传入COMPLETE由支付宝完成剩余金额自动解冻，或者商户自行调用解冻接口将剩余金额解冻。
         model.setAuthConfirmMode("NOT_COMPLETE");//传入该值用户剩余金额不会自动解冻
         request.setBizModel(model);
-        request.setNotifyUrl(notifyUrl);//异步通知地址，必填，该接口只通过该参数进行异步通知
+//        request.setNotifyUrl(notifyUrl);//异步通知地址，必填，该接口只通过该参数进行异步通知
 
         AlipayTradePayResponse response = alipayClient.execute(request);
         log.info("预授权转支付response: {}" + response.getBody());

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

@@ -86,16 +86,21 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper, OrderRefund> {
         boolean flag = false;
         if (orderPay.getPayWay() == 2 && orderPay.getPayType() == 1) {
             log.info("======支付宝APP支付退款中===========");
-            flag = payBiz.alipayOrderRefund(out_trade_no, orderPay.getSerialNumber(), refundAmount, refundDesc, out_trade_no + System.currentTimeMillis());
+            flag = payBiz.alipayOrderRefund(out_trade_no, orderPay.getSerialNumber(), refundAmount, refundDesc,
+                    out_trade_no + System.currentTimeMillis());
         } else if (orderPay.getPayWay() == 2 && orderPay.getPayType() == 2) {
             log.info("======支付宝预授权支付退款中===========");
             //需要根据实际传过来的参数类型来进行解冻或者预授权转支付
             if (orderRefundVo.getRefundAmount() != 0) { //解冻金额
-                flag = payBiz.fundAuthOrderUnFreeze(orderPay.getTradeNo() + System.currentTimeMillis(), orderPay.getSerialNumber(), orderRefundVo.getRefundAmount(), orderRefundVo.getRefundDesc());
+                flag = payBiz.fundAuthOrderUnFreeze(out_refund_no,
+                        orderPay.getSerialNumber(), orderRefundVo.getRefundAmount(), orderRefundVo.getRefundDesc());
             }
             //预授权转支付
             if(orderRefundVo.getFreeze2PayAmount() != 0) {
-                flag = payBiz.tradePay(orderPay.getTradeNo() + System.currentTimeMillis(), orderPay.getSerialNumber(), orderRefundVo.getFreeze2PayAmount(), orderRefundVo.getFreeze2PayDesc(), orderRefundVo.getFreeze2PayDesc());
+                log.info("======支付宝预授权支付退款中===========");
+                flag = payBiz.tradePay(out_refund_no,
+                        orderPay.getSerialNumber(), orderRefundVo.getFreeze2PayAmount(),
+                        orderRefundVo.getFreeze2PayDesc(), orderRefundVo.getFreeze2PayDesc());
             }
         } else if(orderPay.getPayWay() == 1){
             log.info("======微信退款中===========");