Merge branch 'feature/20210513_判断是否退运费_wanghanghang' into develop

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

@@ -2260,11 +2260,18 @@ public class OrderServiceImpl implements Orderservice {
                     QueryFreightRefundSupportedVo queryFreightRefundSupportedVo = new QueryFreightRefundSupportedVo();
                     queryFreightRefundSupportedVo.setPartnerId(orderBean.getCompanyId());
                     queryFreightRefundSupportedVo.setProvince(province);
-                    QueryFreightRefundSupportedResponse queryFreightRefundSupportedResponse = deliveryFeiginClient.isFreightRefundSupported(queryFreightRefundSupportedVo);
-                    LogUtil.info("queryFreightRefundSupportedResponse of oid:{}, {}, {}", orderBean.getOid(), orderBean.getStatus(), (null != queryFreightRefundSupportedResponse ? ToStringBuilder.reflectionToString(queryFreightRefundSupportedResponse) : null));
-                    if(null != queryFreightRefundSupportedResponse &&  RESPONSE_SUCCESS_CODE == queryFreightRefundSupportedResponse.getCode()){
-                        Boolean freightRefundSupported = queryFreightRefundSupportedResponse.getData();
-                        isRefundDeliveryFee = freightRefundSupported;
+                    //整合商城订单状态，订单状态 1 2 3不需校验直接退运费 20210513
+                    List<Integer> isRefundDeliveryFeeCodes = Arrays.asList(
+                            OrderStatus.TAKE_ORDER.getCode(), OrderStatus.WAIT_PAY.getCode(), OrderStatus.RECEIPT.getCode());
+                    if(isRefundDeliveryFeeCodes.contains(orderBean.getStatus())){
+                        isRefundDeliveryFee = true;
+                    }else{
+                        QueryFreightRefundSupportedResponse queryFreightRefundSupportedResponse = deliveryFeiginClient.isFreightRefundSupported(queryFreightRefundSupportedVo);
+                        LogUtil.info("queryFreightRefundSupportedResponse of oid:{}, {}, {}", orderBean.getOid(), orderBean.getStatus(), (null != queryFreightRefundSupportedResponse ? ToStringBuilder.reflectionToString(queryFreightRefundSupportedResponse) : null));
+                        if(null != queryFreightRefundSupportedResponse &&  RESPONSE_SUCCESS_CODE == queryFreightRefundSupportedResponse.getCode()){
+                            Boolean freightRefundSupported = queryFreightRefundSupportedResponse.getData();
+                            isRefundDeliveryFee = freightRefundSupported;
+                        }
                     }
                 }
             }else {
@@ -2277,6 +2284,7 @@ public class OrderServiceImpl implements Orderservice {
                     isRefundDeliveryFee = false;
                 }
             }
+
             // 未接单
             if (OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus())) {
                 // 拼团订单主动退款触发通知促销