调用配送关闭

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -4407,7 +4407,7 @@ public class OrderAdapter {
         //校验有没有售后单,一笔订单只会存在一笔售后单,售后单展示为取消展示申请退款按钮
         AfterSalesOrderResp afterSalesOrderResp = orderBean.getAfterSalesOrderResp();
         List<Integer> orderStatusList = Arrays.asList(OrderStatus.WAIT_PAY.getCode(),OrderStatus.RECEIPT.getCode(),OrderStatus.DISTRIBUTION.getCode(),OrderStatus.COMPLETE.getCode());
-        List<Integer> afterSaleStatusList = Arrays.asList(AfterSalesStatus.PENDING.getIndex(),AfterSalesStatus.RETURNING.getIndex(),AfterSalesStatus.COMPLETE.getIndex(),AfterSalesStatus.REJECTED.getIndex());
+        List<Integer> afterSaleStatusList = Arrays.asList(AfterSalesStatus.PENDING.getIndex(),AfterSalesStatus.RETURNING.getIndex(),AfterSalesStatus.GOODS_RETURNED.getIndex());
         //已发货
         if(null !=  orderBean.getGmtDelivery()){
             if(orderStatusList.contains(orderBean.getStatus()) && (null == afterSalesOrderResp || (null !=afterSalesOrderResp &&  AfterSalesStatus.CANCEL.getIndex() == afterSalesOrderResp.getAfterSalesStatus()))){

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

@@ -2240,27 +2240,27 @@ public class OrderServiceImpl implements Orderservice {
             boolean isRefundDeliveryFee = true;
             //商城查询配送费
             if (com.freemud.sdk.api.assortment.order.enums.OrderSourceType.SAASMALL.getCode().equalsIgnoreCase(orderBean.getSource()) && StringUtils.isNotEmpty(orderBean.getExtInfo())){
-                JSONObject extInfoJsonObject = JSONObject.parseObject(orderBean.getExtInfo());
-                OrderExtInfoDto orderExtInfoDto = extInfoJsonObject.toJavaObject(OrderExtInfoDto.class);
-                if(null != orderExtInfoDto && null !=  orderExtInfoDto.getProvince()){
-                    String province = orderExtInfoDto.getProvince();
-                    QueryFreightRefundSupportedVo queryFreightRefundSupportedVo = new QueryFreightRefundSupportedVo();
-                    queryFreightRefundSupportedVo.setPartnerId(orderBean.getCompanyId());
-                    queryFreightRefundSupportedVo.setProvince(province);
-                    //整合商城订单状态，订单状态 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;
-                        }
-                    }
-                }
+//                JSONObject extInfoJsonObject = JSONObject.parseObject(orderBean.getExtInfo());
+//                OrderExtInfoDto orderExtInfoDto = extInfoJsonObject.toJavaObject(OrderExtInfoDto.class);
+//                if(null != orderExtInfoDto && null !=  orderExtInfoDto.getProvince()){
+//                    String province = orderExtInfoDto.getProvince();
+//                    QueryFreightRefundSupportedVo queryFreightRefundSupportedVo = new QueryFreightRefundSupportedVo();
+//                    queryFreightRefundSupportedVo.setPartnerId(orderBean.getCompanyId());
+//                    queryFreightRefundSupportedVo.setProvince(province);
+//                    //整合商城订单状态，订单状态 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 {
                 AssortmentOpenPlatformPartnerWxappConfig refundDeliveryFeeConfig = configMap.get(OrderRefundEnum.REFUND_DELIVERY_FEE_ENABLE.getKeyValue());
                 LogUtil.info("orderRefund of oid:{}, {}, {}", orderBean.getOid(), orderBean.getStatus(), (null != refundDeliveryFeeConfig ? ToStringBuilder.reflectionToString(refundDeliveryFeeConfig) : null));