Merge branch 'zx_saas_goods' of http://git.dayaedu.com/yonge/mec into test

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/OutOrderInfoDto.java

@@ -23,8 +23,19 @@ public class OutOrderInfoDto {
     @ApiModelProperty(value = "合作单位",required = true)
     private String coopName;
 
+    @ApiModelProperty(value = "商品详情",required = true)
+    private List<GoodsNameDto> goodsSellDtos;
+
     private List<SellOrder> sellOrders;
 
+    public List<GoodsNameDto> getGoodsSellDtos() {
+        return goodsSellDtos;
+    }
+
+    public void setGoodsSellDtos(List<GoodsNameDto> goodsSellDtos) {
+        this.goodsSellDtos = goodsSellDtos;
+    }
+
     public String getCoopName() {
         return coopName;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentRouteOrderServiceImpl.java

@@ -534,6 +534,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                 Map<Integer, String> goodsMap = goodies.stream().collect(Collectors.toMap(Goods::getId, Goods::getName));
                 goodsSellDtos.forEach(e -> e.setGoodsName(goodsMap.get(e.getGoodsId())));
             }
+            outOrderInfoDto.setGoodsSellDtos(goodsSellDtos);
         }
         outOrderInfoDto.setCalenderId(routeOrder.getCalenderId());
         if(order.getCooperationId() != null){