[feat]

1、增加查询条件；2、修改自测bug

application-webadmin/src/main/java/com/tourism/webadmin/app/website/dto/TourismProjectToWebDto.java

@@ -92,6 +92,7 @@ public class TourismProjectToWebDto {
     @Schema(description = "国家id。")
     private String countryId;
 
-
+    @Schema(description = "是否有拼团(0:否 1:是)")
+    private Integer hasGroup;
 
 }

application-webadmin/src/main/java/com/tourism/webadmin/app/website/service/impl/TourismProjectToWebServiceImpl.java

@@ -67,19 +67,6 @@ public class TourismProjectToWebServiceImpl implements TourismProjectToWebServic
 
     @Override
     public MyPageData<TourismProjectVo> list(TourismProjectToWebDto tourismProjectDtoFilter) {
-//        if(tourismProjectDtoFilter.getBelongTab() == null){
-//            return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST,"所属分类(belongTab)不能为空!");
-//        }
-        //如果belongTab小于1000并且大于10.则表明查询的是一级菜单
-//        if(tourismProjectDtoFilter.getBelongTab() !=null && tourismProjectDtoFilter.getBelongTab()>=10 && tourismProjectDtoFilter.getBelongTab()<1000){
-//            DirectoryInfo filter = new DirectoryInfo();
-//            filter.setParentId(tourismProjectDtoFilter.getBelongTab());
-//            filter.setEnable(1);
-//            List<DirectoryInfo> directoryInfoList = tourismProjectService.getDirectoryInfoList(filter, null);
-//            tourismProjectDtoFilter.setBelongTab(null);
-//            tourismProjectDtoFilter.setDirectoryInfoIds(directoryInfoList.stream().map(DirectoryInfo::getId).collect(toList()));
-//        }
-
         if(StringUtils.isEmpty(tourismProjectDtoFilter.getAreaId()) && StringUtils.isEmpty(tourismProjectDtoFilter.getCountryId())){
             //判断是否为全部的地区
         }else if(StringUtils.isNotEmpty(tourismProjectDtoFilter.getAreaId()) && StringUtils.isEmpty(tourismProjectDtoFilter.getCountryId())){
@@ -151,8 +138,11 @@ public class TourismProjectToWebServiceImpl implements TourismProjectToWebServic
             // 匹配团购信息
             TourProjectGroupPurchase tourProjectGroupPurchase = collect.get(Long.valueOf(item.getId()));
             if(tourProjectGroupPurchase != null) {
+                item.setHasGroup(1);
                 item.setLowestPrice(tourProjectGroupPurchase.getAdultPrice());
                 item.setGroupPeopleCount(tourProjectGroupPurchase.getMaxCount());
+            }else {
+                item.setHasGroup(0);
             }
         });
 
@@ -182,6 +172,8 @@ public class TourismProjectToWebServiceImpl implements TourismProjectToWebServic
         // 如果有日期列表，则说明有团购，值是1
         if(dates != null && dates.size() > 0) {
             tourismProjectVo.setHasGroup(1);
+        }else {
+            tourismProjectVo.setHasGroup(0);
         }
 
         if(tourismProjectVo != null) {

application-webadmin/src/main/java/com/tourism/webadmin/back/dao/mapper/TourismProjectMapper.xml

@@ -177,6 +177,10 @@
 
     <select id="getTourismProjectList" resultMap="BaseResultMap" parameterType="com.tourism.webadmin.back.model.TourismProject">
         SELECT * FROM tour_tourism_project
+        <!-- 如果选择拼团查询条件，则拼写如下sql -->
+        <if test="tourismProjectFilter.hasGroup != null and tourismProjectFilter.hasGroup != '' and tourismProjectFilter.hasGroup == 1">
+            inner join (select project_id,count(0) from tour_project_group_purchase group by project_id) t1 on tour_tourism_project.id = t1.project_id
+        </if>
         <where>
             <include refid="filterRef"/>
         </where>
@@ -236,14 +240,4 @@
             ORDER BY ${orderBy}
         </if>
     </select>
-
-    <select id="getTourismProjectList" resultMap="BaseResultMap" parameterType="com.tourism.webadmin.back.model.TourismProject">
-        SELECT * FROM tour_tourism_project
-        <where>
-            <include refid="filterRef"/>
-        </where>
-        <if test="orderBy != null and orderBy != ''">
-            ORDER BY ${orderBy}
-        </if>
-    </select>
 </mapper>

application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourismProject.java

@@ -287,4 +287,7 @@ public class TourismProject extends BaseModel {
             constantDictClass = IsWinnowDestination.class)
     @TableField(exist = false)
     private Map<String, Object> isWinnowDestinationDictMap;
+
+    @TableField(exist = false)
+    private Integer hasGroup;
 }

application-webadmin/src/main/java/com/tourism/webadmin/back/service/impl/TourProjectGroupPurchaseServiceImpl.java

@@ -140,6 +140,7 @@ public class TourProjectGroupPurchaseServiceImpl extends BaseService<TourProject
 
     @Override
     public List<TourProjectGroupPurchase> getLowestPriceGroupPurchase(List<Long> projectIds) {
+        if(CollUtil.isEmpty(projectIds)) return new ArrayList<>();
         Date endTime = new Date();
         return tourProjectGroupPurchaseMapper.getLowestPriceGroupPurchaseList(projectIds, endTime);
     }