Merge branch 'feature/zxh/订单新增商品spu数量字段-20220914' into qa

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

@@ -2359,6 +2359,7 @@ public class OrderAdapter {
         productBean1.setParentType(productBean.getProductType());
         productBean1.setSonProducts(new ArrayList<>());
         productBean1.setUnit(productBean.getUnit());
+        productBean1.setProductSpuQuantity(productBean.getProductSpuQuantity());
         return productBean1;
     }
 

order-application-service/src/main/java/cn/freemud/entities/dto/OrderPrintDto.java

@@ -132,6 +132,11 @@ public class OrderPrintDto {
         private List<ProductsBean> materialProducts;
         // 商品单位
         private String unit;
+
+        /**
+         * 订单新增商品SPU数量字段  https://cf.freemudvip.com/pages/viewpage.action?pageId=209356052
+         */
+        private Integer productSpuQuantity;
     }
 
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/adapter/OrderCenterSdkAdapter.java

@@ -352,6 +352,7 @@ public class OrderCenterSdkAdapter {
         productBean.setProductForeignProperty(orderItemResp.getProductForeignProperty());
         productBean.setExtInfo(orderItemResp.getExtInfo());
         productBean.setNote(orderItemResp.getNote());
+        productBean.setProductSpuQuantity(orderItemResp.getProductSpuQuantity());
 
         // 套餐
         productBean.setParentProductId(orderItemResp.getParentProductId());

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/entities/v1/ProductBeanV1.java

@@ -188,4 +188,8 @@ public class ProductBeanV1 {
      */
     private Boolean isSendGoods;
 
+    /**
+     * 订单新增商品SPU数量字段  https://cf.freemudvip.com/pages/viewpage.action?pageId=209356052
+     */
+    private Integer productSpuQuantity;
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderItemResp.java

@@ -130,4 +130,9 @@ public class OrderItemResp {
     //加购人包装费
     private Long packPrice;
 
+    /**
+     * 订单新增商品SPU数量字段  https://cf.freemudvip.com/pages/viewpage.action?pageId=209356052
+     */
+    private Integer productSpuQuantity;
+
 }