调用配送关闭

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));

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMallServiceImpl.java

@@ -939,9 +939,6 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
 
     public Long calculateDeliveryAmount(String partnerId,String province,List<CartGoods> cartGoodsList) {
         Long deliveryAmount = 0L;
-        if(1==1){
-            return deliveryAmount;
-        }
         //区code 为空则运费为0
         if (StringUtils.isBlank(province)) {
             return deliveryAmount;