Merge branch 'feature/rui.zhu/关单逻辑优化' into 'master'

Feature/rui.zhu/关单逻辑优化

See merge request !148

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

@@ -146,10 +146,6 @@ public class OrderAdapterServiceImpl {
     private OrderCommonService orderCommonService;
     @Autowired
     private SellCouponOrderServiceImpl sellCouponOrderService;
-    @Value("${saas.autoRefund.client}")
-    private String autoRefundClient;
-    @Value("${saas.autoRefund.partnerId}")
-    private String autoRefundPartnerId;
     @Autowired
     private OrderCenterProperties orderCenterProperties;
     @Autowired
@@ -340,9 +336,7 @@ public class OrderAdapterServiceImpl {
             }
             Integer client = Integer.parseInt(orderBean.getOrderClient());
             //若是订单超时回调了 订单已取消则做退款处理
-            if (NewOrderStatus.CLOSED.getIndex().equals(orderBean.getStatusV2())
-                    && Arrays.asList(autoRefundClient.split(",")).contains(client.toString())
-                    && Arrays.asList(autoRefundPartnerId.split(",")).contains(orderBean.getCompanyId())) {
+            if (NewOrderStatus.CLOSED.getIndex().equals(orderBean.getStatusV2())) {
                 cn.freemud.management.entities.dto.request.order.OrderManagerRequest request = new cn.freemud.management.entities.dto.request.order.OrderManagerRequest();
                 request.setOrderId(orderBean.getOid());
                 request.setPartnerId(orderBean.getCompanyId());

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

@@ -931,11 +931,13 @@ public class PayServiceImpl {
             closeUnifiedOrderRequest.setVer("2");
             closeUnifiedOrderRequest.setPartnerId(orderBean.getCompanyId());
             closeUnifiedOrderRequest.setStoreId(orderBean.getShopId());
-            com.freemud.application.sdk.api.base.BaseResponse<CloseUnifiedOrderResult> cancelNewUnifiedOrder = this.cancelNewUnifiedOrder(closeUnifiedOrderRequest);
-            if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), cancelNewUnifiedOrder.getCode())
-                    || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), cancelNewUnifiedOrder.getData().getResultCode())) {
-                throw new ServiceException(ResponseResult.ORDER_PRE_PAYMENT_CLOSE_FAILED);
-            }
+            // 不关心支付关单结果，不判断是否关闭预定单成功
+            this.cancelNewUnifiedOrder(closeUnifiedOrderRequest);
+//            com.freemud.application.sdk.api.base.BaseResponse<CloseUnifiedOrderResult> cancelNewUnifiedOrder = this.cancelNewUnifiedOrder(closeUnifiedOrderRequest);
+//            if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), cancelNewUnifiedOrder.getCode())
+//                    || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), cancelNewUnifiedOrder.getData().getResultCode())) {
+//                throw new ServiceException(ResponseResult.ORDER_PRE_PAYMENT_CLOSE_FAILED);
+//            }
         }
         return paySuccess;
     }