Merge branch 'KA-顺丰计算商品重量的情况-20220517' into qa

order-management/src/main/java/cn/freemud/management/adapter/DeliverySdkAdapter.java

@@ -9,6 +9,7 @@ import com.freemud.application.sdk.api.ordercenter.entities.v1.ProductBeanV1;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.math.NumberUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
@@ -17,6 +18,10 @@ import java.util.stream.Collectors;
 
 @Component
 public class DeliverySdkAdapter {
+
+    @Value("${calculate.depatch.weight.partnerId:}")
+    private List<String> calculateWeightPartnerId;
+
     /**
      * 创建配送单请求对象
      *
@@ -28,7 +33,7 @@ public class DeliverySdkAdapter {
     public CreateDeliveryOrderRequestDto buildDeliveryOrderRequestDto(OrderBeanV1 order
             , ConsoleResponseDTO<BizDTO> bizDTO, String deliveryCallBackUrl) {
         CreateDeliveryOrderRequestDto deliveryOrderRequestDto = new CreateDeliveryOrderRequestDto();
-        deliveryOrderRequestDto.setDepatchWeight(this.getDepatchWeightByOrder(order.getProductList()));
+        deliveryOrderRequestDto.setDepatchWeight(this.getDepatchWeightByOrder(order.getProductList(), order.getCompanyId()));
         deliveryOrderRequestDto.setSerialNumber(order.getOtherCode());
         deliveryOrderRequestDto.setOrderId(order.getOid());
         deliveryOrderRequestDto.setOrderRemark(order.getRemark());
@@ -78,7 +83,11 @@ public class DeliverySdkAdapter {
         return deliveryOrderRequestDto;
     }
 
-    private BigDecimal getDepatchWeightByOrder(List<ProductBeanV1> productList) {
+    private BigDecimal getDepatchWeightByOrder(List<ProductBeanV1> productList, String partnerId) {
+        if (CollectionUtils.isEmpty(calculateWeightPartnerId) || !calculateWeightPartnerId.contains(partnerId)) {
+            // 原始逻辑,都是默认传递 1kg给到配送
+            return new BigDecimal("1");
+        }
         if (CollectionUtils.isEmpty(productList)) {
             return new BigDecimal("0.5");
         }