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

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

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -233,7 +233,8 @@ public class OrderController {
     @ApiAnnotation(logMessage = "deleteOrderById")
     @PostMapping("/deleteOrderById")
     public BaseResponse deleteOrderById(@Validated @LogParams @RequestBody DeleteOrderVo deleteOrderVo) {
-        return orderservice.deleteOrderById(deleteOrderVo);
+        //return orderservice.deleteOrderById(deleteOrderVo);
+        return orderservice.cancelPayOrder(deleteOrderVo);
     }
 
     /**

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

@@ -102,8 +102,12 @@ import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettl
 import com.freemud.application.sdk.api.ordercenter.service.OrderDownLoadSdkService;
 import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
 import com.freemud.application.sdk.api.paymentcenter.client.request.CodePayRequest;
+import com.freemud.application.sdk.api.paymentcenter.client.request.PaymentCloseUnifiedOrderRequest;
+import com.freemud.application.sdk.api.paymentcenter.client.request.PaymentQueryRequest;
 import com.freemud.application.sdk.api.paymentcenter.client.request.SVCCardAmountRequest;
 import com.freemud.application.sdk.api.paymentcenter.client.response.CodePayResponse;
+import com.freemud.application.sdk.api.paymentcenter.client.response.PaymentCloseUnifiedOrderResponse;
+import com.freemud.application.sdk.api.paymentcenter.client.response.PaymentQueryResponse;
 import com.freemud.application.sdk.api.paymentcenter.client.response.SVCCardAmountResponse;
 import com.freemud.application.sdk.api.paymentcenter.client.service.PaymentNewService;
 import com.freemud.application.sdk.api.storecenter.request.GetListByCodesRequest;
@@ -306,11 +310,9 @@ public class OrderServiceImpl implements Orderservice {
     @Autowired
     private SvcComPayClient svcComPayClient;
 
-
     @Autowired
     private OrderRelationFactory orderRelationFactory;
 
-
     @Override
     public BaseResponse checkBeforeCreateOrder(CheckBeforeCreateOrderRequestVo requestVo) {
         String trackingNo = LogTreadLocal.getTrackingNo();
@@ -416,7 +418,7 @@ public class OrderServiceImpl implements Orderservice {
             dto.setPartnerId(partnerId);
             dto.setStoreId(storeId);
             dto.setTrackingNo(LogThreadLocal.getTrackingNo());
-            //paymentQueueService.paymentCallback(dto);
+            paymentQueueService.paymentCallback(dto);
         } catch (Exception e) {
             log.info("paymentQueueService.paymentCallback" + dto + " error" + e);
         }
@@ -438,7 +440,7 @@ public class OrderServiceImpl implements Orderservice {
             dto.setStoreId(storeId);
             dto.setPayChannelType(payChanelType);
             dto.setTrackingNo(LogThreadLocal.getTrackingNo());
-            //paymentQueueService.paymentCallback(dto);
+            paymentQueueService.paymentCallback(dto);
         } catch (Exception e) {
             log.info("paymentQueueService.paymentCallback" + dto + " error" + e);
         }
@@ -474,7 +476,6 @@ public class OrderServiceImpl implements Orderservice {
         }
         // 如果订单状态不是未支付，返回信息
         if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus()) || !OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) {
-
             return sendPaySuccessNoticeMessage();
         }
         //若该订单使用了优惠券，则移除卡包,移除失败也不退款，现在支付成功个调用核销，无需调用此功能
@@ -1721,7 +1722,7 @@ public class OrderServiceImpl implements Orderservice {
         if (!OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) {
             return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR.getCode(), "订单状态不允许取消");
         }
-        //
+        this.closeHistoryPrePay(orderBean);
         CancelOrderRequest var1 = new CancelOrderRequest();
         var1.setOrderId(deleteOrderVo.getOid());
         var1.setPartnerId(deleteOrderVo.getPartnerId());
@@ -3538,7 +3539,7 @@ public class OrderServiceImpl implements Orderservice {
                 .orElse(null);
 
         //现金+svc   现金
-        if (payPlatforms.size()==2 || payPlatforms.size()==1 && cashPay!=null) {
+        if (payPlatforms.size()==2 || (payPlatforms.size()==1 && cashPay!=null)) {
             orderPayResponse = orderAdapter.convent2OrderCombPayResponse(combPayResponse.getData().getPayPlatformResponseList(),orderBean.getCompanyId(),storeId);
             orderPayResponse.setOpenId(paymentRequest.getOpenId());
             orderPayResponse.setWxAppid(paymentRequest.getWxAppId());
@@ -3709,4 +3710,40 @@ public class OrderServiceImpl implements Orderservice {
         sdkUpdateAbnormalState.setOrderCode(orderBean.getOid());
         orderSdkService.updateAbnormalState(sdkUpdateAbnormalState);
     }
+
+    private void closeHistoryPrePay(OrderBean orderBean) {
+
+        OrderExtInfoDto extInfo = JSONObject.parseObject(orderBean.getExtInfo(), OrderExtInfoDto.class);
+        //判断当前订单是否存在预支付订单
+        if(extInfo != null && StringUtils.isNotEmpty(extInfo.getFmId())){
+            //订单状态未支付且存在预支付订单：
+            // 1.查询预支付订单支付状态
+            PaymentQueryRequest paymentQueryRequest = new PaymentQueryRequest();
+            paymentQueryRequest.setPartnerId(orderBean.getCompanyId());
+            paymentQueryRequest.setStoreId(orderBean.getShopId());
+            paymentQueryRequest.setFmId(extInfo.getFmId());
+            paymentQueryRequest.setVer("2");
+            com.freemud.application.sdk.api.base.BaseResponse<PaymentQueryResponse> queryResponseBaseResponse = paymentNewService.query(paymentQueryRequest,LogThreadLocal.getTrackingNo());
+            //判断预支付订单状态
+            if(ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), queryResponseBaseResponse.getCode())){
+                throw new ServiceException(ResponseResult.ORDER_PAY_GETPRE_MESSAGE_ERROR);
+            }
+            //判断当前预支付订单是否已经支付成功
+            if(ObjectUtils.equals(TradeState.SUCCESS.getCode(), queryResponseBaseResponse.getData().getTradeState())){
+                throw new ServiceException(ResponseResult.ORDER_HAS_PAID);
+            }
+            // 3.取消前一个预支付订单  调用支付取消预支付订单,如果预支付订单已经取消了再调用取消预支付订单接口会报错的
+            if(ObjectUtils.equals(TradeState.NOTPAY.getCode(), queryResponseBaseResponse.getData().getTradeState())) {
+                PaymentCloseUnifiedOrderRequest closeUnifiedOrderRequest = new PaymentCloseUnifiedOrderRequest();
+                closeUnifiedOrderRequest.setFmId(extInfo.getFmId());
+                closeUnifiedOrderRequest.setVer("2");
+                closeUnifiedOrderRequest.setPartnerId(orderBean.getCompanyId());
+                closeUnifiedOrderRequest.setStoreId(orderBean.getShopId());
+                com.freemud.application.sdk.api.base.BaseResponse<PaymentCloseUnifiedOrderResponse> cancelNewUnifiedOrder = paymentNewService.cancelNewUnifiedOrder(closeUnifiedOrderRequest,LogThreadLocal.getTrackingNo());
+                if(ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(),cancelNewUnifiedOrder.getCode())){
+                    throw new ServiceException(ResponseResult.ORDER_PRE_PAYMENT_CLOSE_FAILED);
+                }
+            }
+        }
+    }
 }