Merge remote-tracking branch 'origin/dev' into dev

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

@@ -86,6 +86,7 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper, OrderRefund> {
         OrderPay orderPay = list.get(0);
         String out_trade_no = orderPay.getTradeNo();
         boolean flag = false;
+        boolean isFreeze2PayComplete = false;
         if (orderPay.getPayWay() == 2 && orderPay.getPayType() == 1) {
             log.info("======支付宝APP支付退款中===========");
             flag = payBiz.alipayOrderRefund(out_trade_no, orderPay.getSerialNumber(), refundAmount, refundDesc,
@@ -101,10 +102,10 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper, OrderRefund> {
             if(orderRefundVo.getFreeze2PayAmount() != null && orderRefundVo.getFreeze2PayAmount() != 0) {
                 log.info("======预授权转支付===========");
                 String refundTradeNo = Snowflake.build() + "";
-                boolean isComplete = payBiz.tradePay(refundTradeNo,
+                isFreeze2PayComplete = payBiz.tradePay(refundTradeNo,
                         orderPay.getSerialNumber(), orderRefundVo.getFreeze2PayAmount(),
                         orderRefundVo.getFreeze2PayDesc(), orderRefundVo.getFreeze2PayDesc());
-                if (isComplete) {
+                if (isFreeze2PayComplete) {
                     OrderRefund orderRefund = new OrderRefund();
                     BeanUtils.copyProperties(orderRefund, orderRefundVo);
                     if (StringUtils.isNotBlank(orderRefundVo.getFreeze2PayDesc())) {
@@ -120,6 +121,11 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper, OrderRefund> {
                     orderRefund.setOutRefundNo(out_trade_no);
                     orderRefund.setSerialNumber(orderPay.getSerialNumber());
                     insertSelective(orderRefund);
+
+                    //如果退款是不成功的，则out_refund_no = refundTradeNo
+                    if(!flag) {
+                        out_refund_no = refundTradeNo;
+                    }
                 }
             }
         } else if(orderPay.getPayWay() == 1){
@@ -142,7 +148,12 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper, OrderRefund> {
             insertSelective(orderRefund);
             return JsonResultUtil.createSuccessResultWithObj(out_refund_no);
         }
-        return JsonResultUtil.createFailedResult(40004, "退款失败！");
+
+        if(flag || isFreeze2PayComplete) {
+            return JsonResultUtil.createSuccessResultWithObj(out_refund_no);
+        }else {
+            return JsonResultUtil.createFailedResult(40004, "退款失败！");
+        }
     }
 
     public ObjectRestResponse tradeRefund(String tradNo, Integer refundAmount, String refundReason, String outRequestNo) {