Merge branch 'feature/2.1.11-支付超时回调直接退款' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java

order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java

@@ -241,33 +241,32 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
                 log.error("paySuccessCallback_queryOrderById_faild, trackingNo:{},PaysuccessNoticeMessage:{}", LogTreadLocal.getTrackingNo(), gson.toJson(message));
                 return gson.toJson(message);
             }
-            log.info("paySuccessCallback orderBeans={}", JSON.toJSONString(orderBeans));
             QueryOrdersResponseDto.DataBean.OrderBean orderBean = orderBeans.get(OrderBeanType.SAASORDER.getCode());
             // 混合支付失败，取消订单
             if (!message.getResult_code().equals(ResponseCodeConstant.RESPONSE_SUCCESS)) {
                 return orderService.cannelComPayOrder(confirmOrderDto, orderBean);
             }
+            if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus())){
+                return orderAdapter.sendPaySuccessNoticeMessage();
+            }
             //若是app订单超时回调了 订单已取消则做退款处理
             if (OrderStatus.CALCEL.getCode().equals(orderBean.getStatus()) && OrderSourceType.SAAS.getCode().equals(orderBean.getSource())) {
                 orderService.timeOutRefund(orderBean);
                 return orderAdapter.sendPaySuccessNoticeMessage();
             }
-            if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus())){
-                return orderAdapter.sendPaySuccessNoticeMessage();
-            }
-            /*
+            /**
              * 围餐处理
              */
             if ("meals".equals(orderBean.getSource())) {
                 return orderCommonService.paySuccessCallback(message, confirmOrderDto, orderBeans);
             }
-            /*
+            /**
              * 微商城处理
              */
             if(OrderSourceType.SAASMALL.getCode().equals(orderBean.getSource())) {
                 return mallOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
             }
-            /*
+            /**
              * app订单处理
              */
             if(OrderSourceType.APP.getCode().equals(orderBean.getSource())) {
@@ -281,7 +280,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
             if(mcCafePartnerId.equals(orderBean.getCompanyId())) {
                 return mcCafeOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
             }
-            /*
+            /**
              * 默认点餐处理
              */
             return orderService.paySuccessCallback(message, confirmOrderDto, orderBeans);

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -92,6 +92,7 @@ import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
 import com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
+import com.freemud.application.sdk.api.ordercenter.request.SdkUpdateAbnormalState;
 import com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderCreateReq;
 import com.freemud.application.sdk.api.ordercenter.response.carpark.OrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse;
@@ -3708,4 +3709,34 @@ public class OrderServiceImpl implements Orderservice {
         }
         return map;
     }
+    /**
+     * 超时回调直接退款
+     * @param orderBean
+     */
+    public void timeOutRefund(QueryOrdersResponseDto.DataBean.OrderBean orderBean) {
+        //调用支付退款
+        log.info("payment timeout callback for refund orderDto={}",JSON.toJSONString(orderBean));
+        com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> response = null;
+        Long refundId = System.currentTimeMillis();
+        OrderExtInfoDto orderExtInfoDTO = gson.fromJson(orderBean.getExtInfo(), OrderExtInfoDto.class);
+        if (orderExtInfoDTO==null || StringUtils.isBlank(orderExtInfoDTO.getFmId())) {
+            return;
+        }
+        Integer state = PayRefundStatus.SUCCESS.getCode();
+        orderBean.setPayVoucher(orderExtInfoDTO.getFmId());
+        SdkUpdateAbnormalState sdkUpdateAbnormalState = new SdkUpdateAbnormalState();
+        String desc = "支付未及时回调";
+        com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, orderBean.getOid());
+        response = standardPaymentService.orderRefund(orderPayRefundRequest, LogTreadLocal.getTrackingNo());
+        log.info("payment timeout callback for refund  orderId={},request={},resp={}",orderBean.getOid(),JSON.toJSONString(orderPayRefundRequest),JSON.toJSONString(response));
+        if (response!=null || state.equals(response.getData().getRefundStatus())) {
+            sdkUpdateAbnormalState.setAbnormalDesc(desc+",退款成功");
+        } else {
+            sdkUpdateAbnormalState.setAbnormalDesc(desc+",退款失败");
+        }
+        sdkUpdateAbnormalState.setPartnerId(orderBean.getCompanyId());
+        sdkUpdateAbnormalState.setAbnormalState(4);
+        sdkUpdateAbnormalState.setOrderCode(orderBean.getOid());
+        orderSdkService.updateAbnormalState(sdkUpdateAbnormalState);
+    }
 }