创建配送单

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

@@ -100,13 +100,13 @@ public class DeliveryAdapter {
     public CreateDeliveryVo buildDeliveryOrderRequestDto(QueryOrdersResponseDto.DataBean.OrderBean order
             , StoreResponse storeInfo, String deliveryCallBackUrl, String displayOrderId ) {
 
-        SimpleDateFormat simpleDateFormat =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat simpleDateFormat =new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
 
         CreateDeliveryVo deliveryOrderRequestDto = new CreateDeliveryVo();
         OrderExtInfoDto orderExtInfoDto = JSON.parseObject(order.getExtInfo(), OrderExtInfoDto.class);
         deliveryOrderRequestDto.setInvoiceTitle(orderExtInfoDto.getInvoiceTitle());
-        deliveryOrderRequestDto.setDepatchWeight(new BigDecimal(1));
-        deliveryOrderRequestDto.setSerialNumber(order.getOtherCode());
+        deliveryOrderRequestDto.setDepatchWeight(order.getWeight());
+        //deliveryOrderRequestDto.setSerialNumber(order.getOtherCode());
         deliveryOrderRequestDto.setOrderId(order.getOid());
         deliveryOrderRequestDto.setOrderRemark(order.getRemark());
         deliveryOrderRequestDto.setOrderTotalAmount(order.getAmount().intValue());
@@ -147,6 +147,8 @@ public class DeliveryAdapter {
                 //配送费
                 deliveryOrderRequestDto.setDeliveryTotal(collect.get(0).getPrice().intValue());
             }
+        }else {
+            deliveryOrderRequestDto.setDeliveryTotal(0);
         }
         deliveryOrderRequestDto.setIsPayed(1);
         deliveryOrderRequestDto.setTenderType("WeChat");
@@ -162,23 +164,26 @@ public class DeliveryAdapter {
         //---麦咖啡餐道专用---
 
         List<ProductInfo> productInfos = new ArrayList<>();
-        order.getProductList().forEach(productList -> {
-            if (productList.getPrice() > 0) {
-                ProductInfo deliveryProductInfo = new ProductInfo();
-                deliveryProductInfo.setProductCode(productList.getProductId());
-                deliveryProductInfo.setProductName(productList.getProductName());
-                deliveryProductInfo.setProductNumber(productList.getNumber());
-                deliveryProductInfo.setProductPrice(productList.getPrice().intValue());
-                //餐道使用
-                deliveryProductInfo.setCumulatedTotal(productList.getNumber() * productList.getPrice().intValue());
-                OrderProductAddInfoDto orderProductAddInfoDto = JSON.parseObject(productList.getAddInfo(), OrderProductAddInfoDto.class);
-                deliveryProductInfo.setTaxId(orderProductAddInfoDto.getTaxId());
-                deliveryProductInfo.setTaxRate(orderProductAddInfoDto.getTax());
-                deliveryProductInfo.setParentCode(Long.valueOf(productList.getParentProductId()));
-
-                productInfos.add(deliveryProductInfo);
-            }
-        });
+        if (CollectionUtils.isNotEmpty(order.getProductList())) {
+            order.getProductList().forEach(productList -> {
+                if (productList.getPrice() > 0) {
+                    ProductInfo deliveryProductInfo = new ProductInfo();
+                    deliveryProductInfo.setProductCode(productList.getProductId());
+                    deliveryProductInfo.setProductName(productList.getProductName());
+                    deliveryProductInfo.setProductNumber(productList.getNumber());
+                    deliveryProductInfo.setProductPrice(productList.getPrice().intValue());
+                    //餐道使用
+                    deliveryProductInfo.setCumulatedTotal(productList.getNumber() * productList.getPrice().intValue());
+                    OrderProductAddInfoDto orderProductAddInfoDto = JSON.parseObject(productList.getAddInfo(), OrderProductAddInfoDto.class);
+                    deliveryProductInfo.setTaxId(StringUtils.isNotEmpty(orderProductAddInfoDto.getTaxId()) ? orderProductAddInfoDto.getTaxId() : "10");
+                    deliveryProductInfo.setTaxRate(orderProductAddInfoDto.getTax() > 0 ? orderProductAddInfoDto.getTax() : 6);
+                    deliveryProductInfo.setParentCode(Long.valueOf(productList.getParentProductId()) == 0l ? -1l : Long.valueOf(productList.getParentProductId()));
+
+                    productInfos.add(deliveryProductInfo);
+                }
+            });
+            deliveryOrderRequestDto.setProductTotal(productInfos.stream().mapToInt(t -> t.getCumulatedTotal()).sum());
+        }
         deliveryOrderRequestDto.setProductInfos(productInfos);
         deliveryOrderRequestDto.setOrderSource(OrderSourceType.ALIPAY.getCode().equals(order.getSource())?"Alipay":"freemud");
         return deliveryOrderRequestDto;