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

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

@@ -2767,6 +2767,9 @@ public class OrderSdkAdapter {
         if(CollectionUtils.isNotEmpty(product.getSpecialCodes())) {
             extInfo.setSpecialCodes(product.getSpecialCodes());
         }
+        if(CollectionUtils.isNotEmpty(product.getSpecialAttrs())) {
+            extInfo.setSpecialAttrs(product.getSpecialAttrs());
+        }
         if (0 != product.getTax()){
             extInfo.setTax(product.getTax());
         }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java

@@ -177,4 +177,6 @@ public class CreateOrderProductRequest extends BaseConfig {
     private String classificationName;
 
     private List<String> specialCodes;
+
+    private List<OrderSpecialExtraAttrRequest> specialAttrs;
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java

@@ -72,4 +72,6 @@ public class OrderProductAddInfoDto extends BaseConfig {
     private String thirdCensusCategoryName;
 
     private List<String> specialCodes;
+
+    private List<OrderSpecialExtraAttrRequest> specialAttrs;
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderSpecialExtraAttrRequest.java

+package com.freemud.sdk.api.assortment.order.request.order;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderSpecialExtraAttrRequest {
+    /**
+     * 属性名
+     */
+    private String attributeName;
+    /**
+     * 入机code
+     */
+    private String specialCode;
+
+
+}

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

@@ -2281,7 +2281,13 @@ public class OrderAdapter {
         createOrderProductDemoDto.setClassificationId(cartGoodsDetailDto.getClassificationId());
         createOrderProductDemoDto.setClassificationName(cartGoodsDetailDto.getClassificationName());
         if(CollectionUtils.isNotEmpty(cartGoodsDetailDto.getSpecialExtra())) {
-            createOrderProductDemoDto.setSpecialCodes(cartGoodsDetailDto.getSpecialExtra().stream().map(ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra::getSpecialCode).collect(Collectors.toList()));
+//            createOrderProductDemoDto.setSpecialCodes(cartGoodsDetailDto.getSpecialExtra().stream().map(ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra::getSpecialCode).collect(Collectors.toList()));
+            createOrderProductDemoDto.setSpecialAttrs(new ArrayList<>());
+            createOrderProductDemoDto.setSpecialCodes(new ArrayList<>());
+            cartGoodsDetailDto.getSpecialExtra().stream().forEach(o -> {
+                createOrderProductDemoDto.getSpecialAttrs().add(new OrderSpecialExtraAttrRequest(o.getAttributeName(), o.getSpecialCode()));
+                createOrderProductDemoDto.getSpecialCodes().add(o.getSpecialCode());
+            });
         }
         return createOrderProductDemoDto;
     }