Merge remote-tracking branch 'origin/qa' into qa

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

@@ -2565,14 +2565,17 @@ public class OrderSdkAdapter {
         for (CreateOrderProductRequest productRequest : products) {
             // 普通商品 订单转换
             productRequest.setOpid(index);
-            originalAmount += updateOrderItemAndSettlement(orderItemList, orderSettlementCreateReqList, productRequest, partnerId, "");
+            originalAmount += updateOrderItemAndSettlement(orderItemList, orderSettlementCreateReqList, productRequest, partnerId, "", false);
             if (ProductTypeEnum.MATERIAL_PRODUCT.getCode().equals(productRequest.getProductType())) {
                 if (CollectionUtils.isNotEmpty(productRequest.getMaterialProduct())) {
                     // 父类商品productId=productId+seq
                     String partnerProductId = productRequest.getProductId() + "_" + index;
-                    productRequest.getMaterialProduct().stream().forEach(
-                        material -> updateOrderItemAndSettlement(orderItemList, orderSettlementCreateReqList, material, partnerId, partnerProductId)
-                    );
+                    for (CreateOrderProductRequest material: productRequest.getMaterialProduct()){
+                        index++;
+                        material.setOpid(index);
+                        material.setSpecification(material.getProductId());
+                        updateOrderItemAndSettlement(orderItemList, orderSettlementCreateReqList, material, partnerId, partnerProductId, true);
+                    }
                 }
             }
             // 如果是套餐商品，需要转换当前商品行子集ComboProduct&GroupProduct（固定商品、可选商品）
@@ -2580,7 +2583,7 @@ public class OrderSdkAdapter {
                 // 父类商品productId=productId+seq
                 String partnerProductId = productRequest.getProductId() + "_" + index;
                 if (CollectionUtils.isNotEmpty(productRequest.getComboProduct())) {
-                    productRequest.getComboProduct().forEach(combo -> updateOrderItemAndSettlement(orderItemList, orderSettlementCreateReqList, combo, partnerId, partnerProductId));
+                    productRequest.getComboProduct().forEach(combo -> updateOrderItemAndSettlement(orderItemList, orderSettlementCreateReqList, combo, partnerId, partnerProductId, false));
                 }
             }
             index++;
@@ -2598,7 +2601,7 @@ public class OrderSdkAdapter {
      * @param parentProductId              套餐父商品Id
      * @return
      */
-    private Long updateOrderItemAndSettlement(List<OrderItemCreateReq> orderItemList, List<OrderSettlementCreateReq> orderSettlementCreateReqList, CreateOrderProductRequest product, String partnerId, String parentProductId) {
+    private Long updateOrderItemAndSettlement(List<OrderItemCreateReq> orderItemList, List<OrderSettlementCreateReq> orderSettlementCreateReqList, CreateOrderProductRequest product, String partnerId, String parentProductId, Boolean isMaterial) {
         OrderItemCreateReq orderItemCreateReq = new OrderItemCreateReq();
         orderItemCreateReq.setId(product.getId());
         orderItemCreateReq.setPartnerId(partnerId);
@@ -2716,7 +2719,7 @@ public class OrderSdkAdapter {
 
         orderItemCreateReq.setExtInfo(JSONObject.toJSONString(extInfo));
         orderItemList.add(orderItemCreateReq);
-        if (product.getTotalDiscountAmount() != null && product.getTotalDiscountAmount() > 0L) {
+        if (product.getTotalDiscountAmount() != null && product.getTotalDiscountAmount() > 0L && !isMaterial) {
             //优惠信息转换
             OrderSettlementCreateReq orderSettlementCreateReq = new OrderSettlementCreateReq();
             orderSettlementCreateReq.setProductId(product.getSpecification());

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.0.8-SNAPSHOT</version>
+            <version>2.0.13-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -251,6 +251,28 @@ public class OrderAdapter {
         return createOrderDto;
     }
 
+    private List<CreateOrderAccountRequest> getMaterialAccounts(CreateOrderProductRequest createOrderProductDto, ShoppingCartGoodsDto.CartGoodsDetailDto material) {
+        List<CreateOrderAccountRequest> orderAccountDtos = createOrderProductDto.getAccounts();
+        if (CollectionUtils.isEmpty(orderAccountDtos)){
+            orderAccountDtos = new ArrayList<>();
+        }
+        List<ActivityDiscountsDto> activityDiscountsDtos = material.getActivityDiscountsDtos();
+        for (ActivityDiscountsDto activityDiscountsDto : activityDiscountsDtos) {
+            CreateOrderAccountRequest createOrderAccountDto = CreateOrderAccountRequest.builder()
+                    .accountId(activityDiscountsDto.getActivityCode())
+                    .name(activityDiscountsDto.getActivityName())
+                    .price(activityDiscountsDto.getDiscountAmount().longValue())
+                    .accountType(getQueryOrderAccountType(getOrderAccountType(activityDiscountsDto.getActivityType())))
+                    .sequence(createOrderProductDto.getSequence())
+                    .productId(material.getSpuId())
+                    .discountQty(createOrderProductDto.getNumber())
+                    .build();
+            orderAccountDtos.add(createOrderAccountDto);
+        }
+        return orderAccountDtos;
+
+    }
+
     public CreateFatherSonOrderRequest convertFatherSonOrderRequest(CreateOrderVo createOrderVo, ShoppingCartGoodsDto shoppingCartGoodsDto,
                                                                     OrderExtendedReq orderExtendedReq,StoreResponse.BizVO storeResponseDto,
                                                                     String appId) {
@@ -1941,7 +1963,7 @@ public class OrderAdapter {
         if (cartGoodsDetailDto.getProductType() != null && (cartGoodsDetailDto.getProductType() == ProductType.MATERIALPRODUCT_UPPRICE.getCode())) {
             List<CreateOrderProductRequest> materialProducts = new ArrayList<>();
             cartGoodsDetailDto.getMaterialList().forEach(product -> {
-                materialProducts.add(convent2OrderProductDemo(product));
+                materialProducts.add(convent2OrderProductMaterial(product));
             });
             createOrderProductDemoDto.setMaterialProduct(materialProducts);
         }
@@ -1951,6 +1973,35 @@ public class OrderAdapter {
         return createOrderProductDemoDto;
     }
 
+    private CreateOrderProductRequest convent2OrderProductMaterial(ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto) {
+        CreateOrderProductRequest createOrderProductDemoDto = new CreateOrderProductRequest();
+        createOrderProductDemoDto.setProductId(cartGoodsDetailDto.getSpuId());
+        createOrderProductDemoDto.setProductName(cartGoodsDetailDto.getSpuName());
+        createOrderProductDemoDto.setSpecification(cartGoodsDetailDto.getSkuId());
+        createOrderProductDemoDto.setSpecificationName(cartGoodsDetailDto.getSkuName());
+        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());
+        if (CollectionUtils.isNotEmpty(cartGoodsDetailDto.getActivityDiscountsDtos())) {
+            createOrderProductDemoDto.setAccounts(getMaterialAccounts(createOrderProductDemoDto, cartGoodsDetailDto));
+        }
+        return createOrderProductDemoDto;
+    }
+
     public CreateOrderProductRequest convent2OrderProductDemo(ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto) {
         CreateOrderProductRequest createOrderProductDemoDto = new CreateOrderProductRequest();
         createOrderProductDemoDto.setProductId(cartGoodsDetailDto.getSpuId());

order-application-service/src/main/resources/application-qa.properties

@@ -9,4 +9,4 @@ apollo.meta=http://public-apollo-configservice.koderover-qa-apollo-config.svc:80
 env=uat
 apollo.cluster=default
 apollo.bootstrap.enabled=true
-apollo.bootstrap.namespaces=micro_progeram_commons,order_service
+apollo.bootstrap.namespaces=order_service,micro_progeram_commons

shopping-cart-application-service/src/main/resources/application-qa.properties

@@ -8,4 +8,4 @@ apollo.meta=http://public-apollo-configservice.koderover-qa-apollo-config.svc:80
 env=uat
 apollo.cluster=default
 apollo.bootstrap.enabled=true
-apollo.bootstrap.namespaces=micro_progeram_commons,shopping_cart
+apollo.bootstrap.namespaces=shopping_cart,micro_progeram_commons