Merge branch 'feature/20200914-1.9.39-支付渠道对接生态-肖家炜'

order-application-service/pom.xml

@@ -77,7 +77,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>deliverycenter-sdk</artifactId>
-            <version>1.5.RELEASE</version>
+            <version>1.6.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

order-management/pom.xml

@@ -95,7 +95,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>deliverycenter-sdk</artifactId>
-            <version>1.5.RELEASE</version>
+            <version>1.6.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

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

@@ -4,12 +4,12 @@ import com.freemud.application.sdk.api.deliverycenter.dto.CreateDeliveryOrderReq
 import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
+import org.apache.commons.lang.math.NumberUtils;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Component
 public class DeliverySdkAdapter {
@@ -52,23 +52,25 @@ public class DeliverySdkAdapter {
         deliveryOrderRequestDto.setReceiverLat(new BigDecimal(order.getLatitude()));
         deliveryOrderRequestDto.setOrderTime(new Date(order.getGmtCreate()));
         deliveryOrderRequestDto.setCallbackUrl(deliveryCallBackUrl);
+        deliveryOrderRequestDto.setOrderClient(NumberUtils.toInt(order.getOrderClient()));
         // 预约单预计送到时间
         if (order.getGmtExpect() != null && order.getGmtExpect() != 0) {
             deliveryOrderRequestDto.setExpectTime(new Date(order.getGmtExpect()));
         }
         deliveryOrderRequestDto.setIsPre(order.getNewOrderType() == OrderType.RESERVED_EXPRESS.getIndex() ? 1 : 0);
-        List<CreateDeliveryOrderRequestDto.DeliveryProductInfo> productInfos = new ArrayList<>();
-        order.getProductList().forEach(productList -> {
-            if (productList.getPrice() > 0) {
-                CreateDeliveryOrderRequestDto.DeliveryProductInfo deliveryProductInfo = new CreateDeliveryOrderRequestDto.DeliveryProductInfo();
-                deliveryProductInfo.setProductCode(productList.getProductId());
-                deliveryProductInfo.setProductName(productList.getProductName());
-                deliveryProductInfo.setProductNumber(productList.getNumber());
-                deliveryProductInfo.setProductPrice(productList.getPrice().intValue());
-                productInfos.add(deliveryProductInfo);
-            }
-        });
-        deliveryOrderRequestDto.setProductInfos(productInfos);
+        Optional.ofNullable(order.getProductList())
+                .ifPresent(productList ->
+                        deliveryOrderRequestDto.setProductInfos(productList.stream()
+                                .filter(productBean -> Objects.nonNull(productBean.getPrice()))
+                                .filter(productBean -> productBean.getPrice() > 0)
+                                .map(productBean -> {
+                                    CreateDeliveryOrderRequestDto.DeliveryProductInfo deliveryProductInfo = new CreateDeliveryOrderRequestDto.DeliveryProductInfo();
+                                    deliveryProductInfo.setProductCode(productBean.getProductId());
+                                    deliveryProductInfo.setProductName(productBean.getProductName());
+                                    deliveryProductInfo.setProductNumber(productBean.getNumber());
+                                    deliveryProductInfo.setProductPrice(productBean.getPrice().intValue());
+                                    return deliveryProductInfo;
+                                }).collect(Collectors.toCollection(LinkedList::new))));
         return deliveryOrderRequestDto;
     }
 }