Merge branches 'develop' and 'feature/20200604_统计分类编号维护_wuping' of…

Merge branches 'develop' and 'feature/20200604_统计分类编号维护_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

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

@@ -1910,7 +1910,7 @@ public class OrderAdapter {
         createOrderProductDemoDto.setWeight(cartGoodsDetailDto.getWeight());
         createOrderProductDemoDto.setUnit(cartGoodsDetailDto.getUnit());
         createOrderProductDemoDto.setStapleFood(0);
-        createOrderProductDemoDto.setCategory(cartGoodsDetailDto.getCategory());
+        createOrderProductDemoDto.setCategory(cartGoodsDetailDto.getClassificationId());
         return createOrderProductDemoDto;
     }
 

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

@@ -176,7 +176,9 @@ public class ShoppingCartGoodsDto {
 //        private String productCode;
 
         /** 商品统计分类编号**/
-        private String category;
+        private String classificationId;
+
+        private String setClassificationName;
         /**
          * 是否限制库存
          * 用于创建订单时，是否扣减库存