Merge remote-tracking branch 'origin/feature/2.0.1-collageOrder-刘鹏飞' into…

Merge remote-tracking branch 'origin/feature/2.0.1-collageOrder-刘鹏飞' into feature/2.0.1-collageOrder-刘鹏飞

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

@@ -2181,6 +2181,9 @@ public class OrderAdapter {
         createOrderProductDemoDto.setTaxId(cartGoodsDetailDto.getTaxId());
         createOrderProductDemoDto.setClassificationId(cartGoodsDetailDto.getClassificationId());
         createOrderProductDemoDto.setClassificationName(cartGoodsDetailDto.getClassificationName());
+        createOrderProductDemoDto.setUserId(cartGoodsDetailDto.getUserId());
+        createOrderProductDemoDto.setNickName(cartGoodsDetailDto.getUserName());
+        createOrderProductDemoDto.setPhotoUrl(cartGoodsDetailDto.getPhotoUrl());
         return createOrderProductDemoDto;
     }
 

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

@@ -214,7 +214,7 @@ public class ShoppingCartGoodsDto {
         /**
          * 加购人昵称
          */
-        private String nickName;
+        private String userName;
 
         /**
          * 加购人头像