Merge branch 'bugfix/20200924_修复问题临时分支'

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

@@ -160,7 +160,12 @@ public class OrderAdapter {
         for (ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto : cartGoodsDetailDtos) {
             Integer qty = cartGoodsDetailDto.getQty();
             if (qty > 0) {
-                CreateOrderProductRequest createOrderProductDto = convent2OrderProduct(cartGoodsDetailDto);
+                CreateOrderProductRequest createOrderProductDto = null;
+                if(mcCafePartnerId.equals(createOrderDto.getCompanyId())) {
+                    createOrderProductDto = convent2MCCafeOrderProduct(cartGoodsDetailDto);
+                } else {
+                    createOrderProductDto = convent2OrderProduct(cartGoodsDetailDto);
+                }
                 createOrderProductDto.setIgnoreProductPrice(1);
                 products.add(createOrderProductDto);
                 if (CollectionUtils.isNotEmpty(cartGoodsDetailDto.getActivityDiscountsDtos())) {
@@ -2120,6 +2125,30 @@ public class OrderAdapter {
         return createOrderProductDemoDto;
     }
 
+    public CreateOrderProductRequest convent2MCCafeOrderProduct(ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto) {
+        CreateOrderProductRequest createOrderProductDemoDto = convent2MCCafeOrderProductDemo(cartGoodsDetailDto);
+        //套餐
+        if (cartGoodsDetailDto.getProductType() != null && (cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT.getCode() || cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT_UPPRICE.getCode())) {
+            List<CreateOrderProductRequest> comboProducts = new ArrayList<>();
+            cartGoodsDetailDto.getComboProducts().forEach(product -> {
+                comboProducts.add(convent2OrderProductDemo(product));
+            });
+            createOrderProductDemoDto.setComboProduct(comboProducts);
+        }
+        //加料商品
+        if (cartGoodsDetailDto.getProductType() != null && (cartGoodsDetailDto.getProductType() == ProductType.MATERIALPRODUCT_UPPRICE.getCode())) {
+            List<CreateOrderProductRequest> materialProducts = new ArrayList<>();
+            cartGoodsDetailDto.getMaterialList().forEach(product -> {
+                materialProducts.add(convent2OrderProductMaterial(product));
+            });
+            createOrderProductDemoDto.setMaterialProduct(materialProducts);
+        }
+
+
+        createOrderProductDemoDto.setProductType(cartGoodsDetailDto.getProductType());
+        return createOrderProductDemoDto;
+    }
+
     private CreateOrderProductRequest convent2OrderProductMaterial(ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto) {
         CreateOrderProductRequest createOrderProductDemoDto = new CreateOrderProductRequest();
         createOrderProductDemoDto.setProductId(cartGoodsDetailDto.getSpuId());
@@ -2180,6 +2209,41 @@ public class OrderAdapter {
         return createOrderProductDemoDto;
     }
 
+    public CreateOrderProductRequest convent2MCCafeOrderProductDemo(ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto) {
+        CreateOrderProductRequest createOrderProductDemoDto = new CreateOrderProductRequest();
+        createOrderProductDemoDto.setProductId(cartGoodsDetailDto.getSpuId());
+        createOrderProductDemoDto.setProductName(cartGoodsDetailDto.getSpuName());
+        createOrderProductDemoDto.setSpecification(cartGoodsDetailDto.getSkuId());
+        createOrderProductDemoDto.setSpecificationName(cartGoodsDetailDto.getSkuName());
+        if (cartGoodsDetailDto.getProductType() != null && (cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT.getCode()
+                || cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT_UPPRICE.getCode())) {
+            createOrderProductDemoDto.setPrice(0l);
+        } else {
+            createOrderProductDemoDto.setPrice(cartGoodsDetailDto.getOriginalPrice());
+        }
+        createOrderProductDemoDto.setSalePrice(cartGoodsDetailDto.getOriginalPrice());
+        createOrderProductDemoDto.setTotalDiscountAmount(cartGoodsDetailDto.getTotalDiscountAmount() == null ? 0 : cartGoodsDetailDto.getTotalDiscountAmount().longValue());
+        createOrderProductDemoDto.setNumber(cartGoodsDetailDto.getQty());
+        createOrderProductDemoDto.setPicture(cartGoodsDetailDto.getPicture());
+        createOrderProductDemoDto.setAddInfo(cartGoodsDetailDto.getAttributeNames());
+        createOrderProductDemoDto.setDiscountId(cartGoodsDetailDto.getCouponCode());
+        createOrderProductDemoDto.setProductType(cartGoodsDetailDto.getProductType());
+        createOrderProductDemoDto.setParentProductId(cartGoodsDetailDto.getParentProductId());
+        createOrderProductDemoDto.setIsFixedProduct(cartGoodsDetailDto.getIsFixedProduct());
+        createOrderProductDemoDto.setCustomerCode(cartGoodsDetailDto.getCustomerCode());
+        createOrderProductDemoDto.setProductCode(cartGoodsDetailDto.getProductCode());
+        createOrderProductDemoDto.setHasStockProudct(cartGoodsDetailDto.isStockLimit());
+        createOrderProductDemoDto.setWeight(cartGoodsDetailDto.getWeight());
+        createOrderProductDemoDto.setUnit(cartGoodsDetailDto.getUnit());
+        createOrderProductDemoDto.setStapleFood(0);
+        createOrderProductDemoDto.setCategory(cartGoodsDetailDto.getClassificationId());
+        createOrderProductDemoDto.setTax(cartGoodsDetailDto.getTax());
+        createOrderProductDemoDto.setTaxId(cartGoodsDetailDto.getTaxId());
+        createOrderProductDemoDto.setClassificationId(cartGoodsDetailDto.getClassificationId());
+        createOrderProductDemoDto.setClassificationName(cartGoodsDetailDto.getClassificationName());
+        return createOrderProductDemoDto;
+    }
+
     /**
      * 将促销的枚举 ActivityTypeEnum 和orderAccountType 关联映射
      */

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

@@ -640,7 +640,11 @@ public class ShoppingCartMCoffeeServiceImpl {
             cartGoods.setSpuId(orderItem.getProductId());
             cartGoods.setSkuId(orderItem.getProductSpec());
             if(6 == orderItem.getProductType()) {
-                cartGoods.setGoodsType(3);
+                cartGoods.setGoodsType(com.freemud.sdk.api.assortment.shoppingcart.constant.GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType());
+            } else if(10 ==orderItem.getProductType()) {
+                cartGoods.setGoodsType(com.freemud.sdk.api.assortment.shoppingcart.constant.GoodsTypeEnum.SKU_GOODS.getGoodsType());
+            } else {
+                cartGoods.setGoodsType(com.freemud.sdk.api.assortment.shoppingcart.constant.GoodsTypeEnum.COMMON_GOODS.getGoodsType());
             }
             if(("早餐啡常搭".equals(orderItem.getProductName()) && "早餐啡常搭".equals(orderItem.getProductSpecName()))
                 || ("啡常搭".equals(orderItem.getProductName()) && "啡常搭".equals(orderItem.getProductSpecName()))) {

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java

@@ -204,18 +204,18 @@ public class CalculationServiceImpl {
         }
 
         //订单级别券优惠
-        for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults discount : calculationDiscountResult.getCouponDiscounts()) {
-            int discountAmount = (discount.getDiscountAmount() == null) ? 0 : discount.getDiscountAmount();
-            Integer discountType = discount.getActivityType();
-            if (discountType != null && discountAmount > 0) {
-                ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
-                activityDiscountsDto.setActivityCode(discount.getCouponCode());
-                activityDiscountsDto.setActivityName(discount.getActivityName());
-                activityDiscountsDto.setActivityType(discountType);
-                activityDiscountsDto.setDiscountAmount(0 - discountAmount);
-                activityDiscountsDtos.add(activityDiscountsDto);
-            }
-        }
+//        for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults discount : calculationDiscountResult.getCouponDiscounts()) {
+//            int discountAmount = (discount.getDiscountAmount() == null) ? 0 : discount.getDiscountAmount();
+//            Integer discountType = discount.getActivityType();
+//            if (discountType != null && discountAmount > 0) {
+//                ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
+//                activityDiscountsDto.setActivityCode(discount.getCouponCode());
+//                activityDiscountsDto.setActivityName(discount.getActivityName());
+//                activityDiscountsDto.setActivityType(discountType);
+//                activityDiscountsDto.setDiscountAmount(0 - discountAmount);
+//                activityDiscountsDtos.add(activityDiscountsDto);
+//            }
+//        }
         //过滤出加价购
         List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> addMoneyDiscounts = discounts.stream().filter(discount -> ActivityTypeEnum.TYPE_81.getCode().equals(discount.getType())).collect(Collectors.toList());