Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into develop

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -2620,6 +2620,7 @@ public class OrderSdkAdapter {
             return originalAmount;
         }
         Integer index = 1;
+        Integer comboIndex = 1;
         for (CreateOrderProductRequest productRequest : products) {
             // 普通商品 订单转换
             productRequest.setOpid(index);
@@ -2629,7 +2630,6 @@ public class OrderSdkAdapter {
                 // 父类商品productId=productId+seq
                 String parentProductId = productRequest.getProductId() + "_" + index;
                 if (CollectionUtils.isNotEmpty(productRequest.getComboProduct())) {
-                    Integer comboIndex = 1;
                     for(CreateOrderProductRequest combo : productRequest.getComboProduct()) {
                         combo.setOpid(comboIndex);
                         updateOrderItemAndSettlement(orderItemList, orderSettlementCreateReqList, combo, partnerId, parentProductId, false);

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

@@ -254,12 +254,35 @@ public class DeliveryAdapter {
                         deliveryComboProductInfo.setParentCode(Long.valueOf(comboProduct.getParentProductId().replace("_", "")));
                         deliveryProductInfo.setProductCode(deliveryComboProductInfo.getParentCode()+"");
 
+                        if(CollectionUtils.isNotEmpty(comboProduct.getMaterialProduct())) {
+                            comboProduct.getMaterialProduct().forEach(o -> {
+                                deliveryComboProductInfo.setProductPrice(deliveryComboProductInfo.getProductPrice() + o.getSalePrice().intValue());
+                                //餐道使用
+                                deliveryComboProductInfo.setCumulatedTotal(deliveryComboProductInfo.getCumulatedTotal() + comboProduct.getNumber() * o.getSalePrice().intValue());
+
+                                deliveryProductInfo.setProductPrice(deliveryProductInfo.getProductPrice() + o.getSalePrice().intValue());
+                                //餐道使用
+                                deliveryProductInfo.setCumulatedTotal(deliveryProductInfo.getCumulatedTotal() + comboProduct.getNumber() * o.getSalePrice().intValue());
+                            });
+                        }
+
                         productInfos.add(deliveryComboProductInfo);
                     });
                 }
+
+                if(CollectionUtils.isNotEmpty(productList.getMaterialProduct())) {
+                    productList.getMaterialProduct().forEach(o -> {
+                        deliveryProductInfo.setProductPrice(deliveryProductInfo.getProductPrice() + o.getSalePrice().intValue());
+                        //餐道使用
+                        deliveryProductInfo.setCumulatedTotal(deliveryProductInfo.getCumulatedTotal() + productList.getNumber() * o.getSalePrice().intValue());
+                    });
+                }
             });
             deliveryOrderRequestDto.setProductTotal(productInfos.stream().mapToInt(t -> t.getCumulatedTotal()).sum());
         }
+
+
+
         deliveryOrderRequestDto.setProductInfos(productInfos);
         deliveryOrderRequestDto.setOrderSource(OrderSourceType.ALIPAY.getCode().equals(order.getSource())?"Alipay":"freemud");
         if(CollectionUtils.isNotEmpty(order.getAccountList())) {

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

@@ -1950,11 +1950,13 @@ public class OrderAdapter {
                                 List<ProductVo> setMaterialProducts = new ArrayList<>();
                                 product.getMaterialProduct().forEach(materialProduct -> {
                                     ProductVo material = convent2ProductVo(materialProduct);
+                                    material.setOriginalTotalAmount(new BigDecimal(material.getOriginalPrice()).multiply(new BigDecimal(productVo.getQty())).longValue());
+                                    material.setSaleTotalAmount(new BigDecimal(material.getFinalPrice()).multiply(new BigDecimal(productVo.getQty())).longValue());
                                     setMaterialProducts.add(material);
-                                    productVo.setOriginalPrice(new BigDecimal(productVo.getOriginalPrice()).subtract(new BigDecimal(material.getOriginalPrice())).longValue());
-                                    productVo.setFinalPrice(new BigDecimal(productVo.getFinalPrice()).subtract(new BigDecimal(material.getFinalPrice())).longValue());
-                                    productVo.setOriginalTotalAmount(new BigDecimal(productVo.getOriginalTotalAmount()).subtract(new BigDecimal(material.getOriginalTotalAmount())).longValue());
-                                    productVo.setSaleTotalAmount(new BigDecimal(productVo.getSaleTotalAmount()).subtract(new BigDecimal(product.getSettlementPrice())).longValue());
+                                    productVo.setOriginalPrice(new BigDecimal(productVo.getOriginalPrice()).add(new BigDecimal(material.getOriginalPrice())).longValue());
+                                    productVo.setFinalPrice(new BigDecimal(productVo.getFinalPrice()).add(new BigDecimal(material.getFinalPrice())).longValue());
+                                    productVo.setOriginalTotalAmount(new BigDecimal(productVo.getOriginalTotalAmount()).add(new BigDecimal(material.getOriginalTotalAmount())).longValue());
+                                    productVo.setSaleTotalAmount(new BigDecimal(productVo.getSaleTotalAmount()).add(new BigDecimal(material.getSaleTotalAmount())).longValue());
                                 });
                                 comboProduct.setSetMaterialProducts(setMaterialProducts);
                             }
@@ -1966,11 +1968,13 @@ public class OrderAdapter {
                     List<ProductVo> setMaterialProducts = new ArrayList<>();
                     productBean.getMaterialProduct().forEach(product -> {
                         ProductVo material = convent2ProductVo(product);
+                        material.setOriginalTotalAmount(new BigDecimal(material.getOriginalPrice()).multiply(new BigDecimal(productVo.getQty())).longValue());
+                        material.setSaleTotalAmount(new BigDecimal(material.getFinalPrice()).multiply(new BigDecimal(productVo.getQty())).longValue());
                         setMaterialProducts.add(material);
-                        productVo.setOriginalPrice(new BigDecimal(productVo.getOriginalPrice()).subtract(new BigDecimal(material.getOriginalPrice())).longValue());
-                        productVo.setFinalPrice(new BigDecimal(productVo.getFinalPrice()).subtract(new BigDecimal(material.getFinalPrice())).longValue());
-                        productVo.setOriginalTotalAmount(new BigDecimal(productVo.getOriginalTotalAmount()).subtract(new BigDecimal(material.getOriginalTotalAmount())).longValue());
-                        productVo.setSaleTotalAmount(new BigDecimal(productVo.getSaleTotalAmount()).subtract(new BigDecimal(product.getSettlementPrice())).longValue());
+                        productVo.setOriginalPrice(new BigDecimal(productVo.getOriginalPrice()).add(new BigDecimal(material.getOriginalPrice())).longValue());
+                        productVo.setFinalPrice(new BigDecimal(productVo.getFinalPrice()).add(new BigDecimal(material.getFinalPrice())).longValue());
+                        productVo.setOriginalTotalAmount(new BigDecimal(productVo.getOriginalTotalAmount()).add(new BigDecimal(material.getOriginalTotalAmount())).longValue());
+                        productVo.setSaleTotalAmount(new BigDecimal(productVo.getSaleTotalAmount()).add(new BigDecimal(material.getSaleTotalAmount())).longValue());
                     });
                     productVo.setSetMaterialProducts(setMaterialProducts);
                 }