Merge branch 'master-tiande' into dev-tiande

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourGood.java

@@ -149,4 +149,15 @@ public class TourGood implements Serializable {
 	@Column(name = "img_desc")
 	@ApiModelProperty("seo*html标签优化")
 	private String imgDesc;
+
+
+	@Column(name = "corporation_id")
+	@ApiModelProperty("公司id")
+	private Long corporationId;
+
+
+
+	@Column(name = "company_id")
+	@ApiModelProperty("门店id")
+	private Integer companyId;
 }

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/vo/TourGoodDetailVo.java

@@ -141,4 +141,13 @@ public class TourGoodDetailVo {
 
 	@ApiModelProperty("seo*html标签优化")
 	private String imgDesc;
+
+
+	@ApiModelProperty("公司id")
+	private Long corporationId;
+
+
+
+	@ApiModelProperty("门店id")
+	private Integer companyId;
 }

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/vo/TourGoodVo.java

@@ -108,6 +108,26 @@ public class TourGoodVo implements Serializable {
 	//标签id
 	@ApiModelProperty(value = "标签")
 	private String tagNames;
+
+
+
+	@ApiModelProperty("公司id")
+	private Long corporationId;
+
+
+
+	@ApiModelProperty("门店id")
+	private Integer companyId;
+
+
+
+	@ApiModelProperty("公司")
+	private String corporationName;
+
+
+
+	@ApiModelProperty("门店")
+	private String companyName;
 	
 
 }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodBiz.java

@@ -18,6 +18,11 @@ import com.xxfc.platform.tour.dto.*;
 import com.xxfc.platform.tour.entity.*;
 import com.xxfc.platform.tour.mapper.*;
 import com.xxfc.platform.tour.vo.TourGoodVo;
+import com.xxfc.platform.vehicle.entity.CompanyInfo;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import com.xxfc.platform.vehicle.pojo.CompanySearchDTO;
+import com.xxfc.platform.vehicle.pojo.CompanySearchVO;
+import com.xxfc.platform.vehicle.pojo.dto.CompanyInfoFindDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
@@ -63,6 +68,10 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
     @Autowired
     private UserFeign userFeign;
 
+
+    @Autowired
+    private VehicleFeign vehicleFeign;
+
     /**
      * 查询旅游路线列表
      *
@@ -105,7 +114,50 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
     public PageDataVO<TourGoodVo> getAll(GoodSearchDTO dto) {
         PageHelper.startPage(dto.getPage(), dto.getLimit());
         PageInfo<TourGoodVo> goodPageInfo = new PageInfo<>(mapper.findGoodList(dto));
-        return PageDataVO.pageInfo(goodPageInfo);
+        goodPageInfo.getList();
+        PageDataVO<TourGoodVo> dataVO = PageDataVO.pageInfo(goodPageInfo);
+        List<TourGoodVo> list = dataVO.getData();
+        if (list != null && list.size() > 0){
+            List<Long> corporationIds=list.stream().map(TourGoodVo::getCorporationId).distinct().collect(Collectors.toList());
+            CompanyInfoFindDTO companyInfoFindDTO=new CompanyInfoFindDTO();
+            companyInfoFindDTO.setIds(corporationIds);
+            ObjectRestResponse< List<CompanyInfo>> restResponse = vehicleFeign.listByIds(companyInfoFindDTO);
+            Map<Long,CompanyInfo> companyInfoMaps=new HashMap<>();
+            if (restResponse.getData() != null){
+                List<CompanyInfo> companyInfos=restResponse.getData();
+                if (companyInfos != null && companyInfos.size() > 0){
+                    for (CompanyInfo companyInfo:companyInfos){
+                        companyInfoMaps.put(companyInfo.getId(),companyInfo);
+                    }
+                }
+            }
+
+            List<Integer> companyIds=list.stream().map(TourGoodVo::getCompanyId).distinct().collect(Collectors.toList());
+            CompanySearchDTO companySearchDTO=new CompanySearchDTO();
+            companySearchDTO.setCompanyIds(companyIds);
+            ObjectRestResponse<List<CompanySearchVO>> restResponse1= vehicleFeign.listByIds(companySearchDTO);
+            Map<Integer,CompanySearchVO> companyMaps=new HashMap<>();
+            if (restResponse1.getData() != null){
+                List<CompanySearchVO> companySearchVOS=restResponse1.getData();
+                if (companySearchVOS != null && companySearchVOS.size() > 0){
+                    for (CompanySearchVO companySearchVO:companySearchVOS){
+                        companyMaps.put(companySearchVO.getId(),companySearchVO);
+                    }
+                }
+            }
+
+            for (TourGoodVo tourGoodVo : list){
+                CompanyInfo companyInfo=companyInfoMaps.get(tourGoodVo.getCorporationId());
+                if (companyInfo != null ){
+                    tourGoodVo.setCorporationName(companyInfo.getName());
+                }
+                CompanySearchVO companySearchVO= companyMaps.get(tourGoodVo.getCompanyId());
+                if (companySearchVO != null ){
+                    tourGoodVo.setCompanyName(companySearchVO.getName());
+                }
+            }
+        }
+        return  dataVO;
     }
 
     //获取商品列表

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodMapper.xml

@@ -25,6 +25,8 @@
         <result property="stock" column="stock"/>
         <result property="unit" column="unit"/>
         <result property="isOutside" column="is_outside"/>
+        <result property="corporationId" column="corporation_id"/>
+        <result property="companyId" column="company_id"/>
     </resultMap>
 
     <resultMap type="com.xxfc.platform.tour.vo.TourGoodVo" id="tourGoodVoMap">
@@ -49,6 +51,8 @@
         <result property="unit" column="unit"/>
         <result property="tagNames" column="tagNames"/>
         <result property="isOutside" column="is_outside"/>
+        <result property="corporationId" column="corporation_id"/>
+        <result property="companyId" column="company_id"/>
     </resultMap>
 
     <!--查询旅游路线列表-->