Merge branch 'master-zjw' into dev

# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/pay/NotifyUrlDTO.java

@@ -9,6 +9,9 @@ public class NotifyUrlDTO {
     public static final int TYPE_APP = 1;
     public static final int TYPE_WX = 2;
 
+    public static final int PAY_WAY_WX = 1;
+    public static final int PAY_WAY_ALI = 2;
+
     //订单号
     @ApiModelProperty(value = "订单号")
     private String orderNo;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java

@@ -47,6 +47,7 @@ import java.util.*;
 
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
+import static com.xxfc.platform.order.pojo.pay.NotifyUrlDTO.PAY_WAY_ALI;
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
 /**
@@ -742,4 +743,26 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         }
         return  mapper.outStatisticalData(queryCriteria,startTime,endTime);
     }
+
+    //订单完成时，payway为 支付宝，则转支付
+    public void finishFreeze2PayAmount(BaseOrder baseOrder) {
+        try {
+            if (baseOrder.getPayWay().equals(PAY_WAY_ALI)) {
+                OrderRefundVo orv = new OrderRefundVo();
+                orv.setAmount(baseOrder.getRealAmount().multiply(new BigDecimal("100")).intValue());
+                orv.setOrderNo(baseOrder.getNo());
+                orv.setRefundAmount(0);
+                orv.setRefundDesc("非退款");
+                orv.setFreeze2PayAmount(baseOrder.getRealAmount().multiply(new BigDecimal("100")).intValue());
+                orv.setFreeze2PayDesc(StrUtil.format("冻结转支付{}", baseOrder.getRealAmount()));
+                ObjectRestResponse<String> result = thirdFeign.refund(orv);
+                String refundTradeNo = result.getData();
+                if(null == refundTradeNo) {
+                    log.error("退款没有refundTradeNo，订单号为：{}, 微服务调用结果为{}", baseOrder.getNo(), JSONUtil.toJsonStr(result));
+                }
+            }
+        }catch (Exception ex) {
+            log.error(StrUtil.format("退款异常{}，订单号为：{}", ex.getMessage(), baseOrder.getNo()), ex);
+        }
+    }
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderTourVerificationBiz.java

 package com.xxfc.platform.order.biz;
 
+import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
@@ -11,17 +12,21 @@ import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.order.pojo.order.OrderTourVerificationVO;
 import com.xxfc.platform.tour.feign.TourFeign;
 import com.xxfc.platform.tour.vo.TourGoodOrderFindVo;
+import com.xxfc.platform.universal.vo.OrderRefundVo;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.time.Instant;
 import java.time.LocalTime;
 import java.time.temporal.ChronoUnit;
 import java.util.Date;
 import java.util.List;
 
+import static com.xxfc.platform.order.pojo.pay.NotifyUrlDTO.PAY_WAY_ALI;
+
 /**
  * 旅游订单核销
  *
@@ -39,6 +44,9 @@ public class OrderTourVerificationBiz{
     private BaseOrderBiz baseOrderBiz;
     @Autowired
     private OrderTourDetailBiz tourDetailBiz;
+    @Autowired
+    private OrderAccountBiz orderAccountBiz;
+
     @Autowired
     private TourFeign tourFeign;
 
@@ -130,6 +138,8 @@ public class OrderTourVerificationBiz{
         tourDetail = tourDetailBiz.updateSelectiveByIdReT(tourDetail);
         tourFeign.updateTourGoodPersonNum(verificationId,"verification_person",total_number);
         baseOrderBiz.sendOrderMq(null,tourDetail,null, baseOrder, OrderMQDTO.ORDER_FINISH);
+        //订单完成时，payway为 支付宝，则转支付
+        orderAccountBiz.finishFreeze2PayAmount(baseOrder);
         return  ObjectRestResponse.succ(tourDetail.getVerificationId());
     }