营地

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/dto/CampsiteShopAdminPageDTO.java

@@ -53,6 +53,12 @@ public class CampsiteShopAdminPageDTO implements Serializable {
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Long crtTime;
 
+    /**
+     * 开业时间
+     */
+    @ApiModelProperty(value = "开业时间")
+    private Long shopStartTime;
+
     /**
      * 上下架状态 0-创建状态  1-上架 2-下架
      */

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/vo/CampsiteShopAdminPageVo.java

@@ -55,6 +55,11 @@ public class CampsiteShopAdminPageVo implements Serializable {
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Long crtTime;
 
+    /**
+     * 开业时间
+     */
+    @ApiModelProperty(value = "开业时间 ")
+    private Long shopStartTime;
     /**
      * 上下架状态 0-创建状态  1-上架 2-下架
      */

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/biz/CampsiteShopBiz.java

@@ -130,7 +130,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper,CampsiteShop> {
         }
 
         //筛选时间处理
-        Long startTime = campsiteShopAdminFindDTO.getStartTime();
+      /*  Long startTime = campsiteShopAdminFindDTO.getStartTime();
         Long endTime = campsiteShopAdminFindDTO.getEndTime();
         if (startTime==null || endTime ==null){
             Long processTime = startTime!=null?startTime:(endTime!=null?endTime:null);
@@ -141,7 +141,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper,CampsiteShop> {
         }else {
             campsiteShopAdminFindDTO.setStartTime(processStartTime(startTime));
             campsiteShopAdminFindDTO.setEndTime(processEndTime(endTime));
-        }
+        }*/
         PageDataVO<CampsiteShopAdminPageDTO> campsiteShopAdminpageDTOPageDataVO = PageDataVO.pageInfo(campsiteShopAdminFindDTO.getPage(),campsiteShopAdminFindDTO.getLimit(),()->mapper.findCampsiteShops(campsiteShopAdminFindDTO));
         List<CampsiteShopAdminPageDTO> campsiteShopAdminPageDTOS = campsiteShopAdminpageDTOPageDataVO.getData();
         if (log.isDebugEnabled()){

xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteShopMapper.xml

@@ -52,15 +52,22 @@
     </select>
 
     <select id="findCampsiteShops" parameterType="com.xxfc.platform.campsite.dto.CampsiteShopAdminFindDTO" resultType="com.xxfc.platform.campsite.dto.CampsiteShopAdminPageDTO">
-     SELECT `id`,`name`,`hot`,`crt_time` as `crtTime`,`sale_state` as
+     SELECT `id`,`name`,`hot`,`crt_time` as `crtTime`,`start_time` as `shopStartTime`,`sale_state` as
         `saleState` FROM `campsite_shop`
       where `is_del`=0
           <if test="startTime != null and endTime!=null">
-              and crt_time between #{startTime} and #{endTime}
+              and start_time between #{startTime} and #{endTime}
           </if>
+        <if test="startTime != null and endTime==null">
+            and <![CDATA[ start_time >= #{startTime} ]]>
+        </if>
+        <if test="endTime != null and startTime==null">
+            and <![CDATA[ start_time <= #{endTime} ]]>
+        </if>
             <if test="name != null and name != ''">
                and `name` like concat('%',#{name},'%')
             </if>
+
     </select>
 
     <update id="updateCampsiteStatus">

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

@@ -159,9 +159,11 @@ public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> {
         if (effectRows==0){
             return effectRows;
         }
-        //保存标签轮播图
-        tourTagBannerDTOS.stream().peek(tourTagBannerDTO -> tourTagBannerDTO.setTagId(tourTagDTO.getId())).count();
-        tourTagBannerBiz.saveBatch(tourTagBannerDTOS,userDTO);
+        if (CollectionUtils.isNotEmpty(tourTagBannerDTOS)) {
+            //保存标签轮播图
+            tourTagBannerDTOS.stream().peek(tourTagBannerDTO -> tourTagBannerDTO.setTagId(tourTagDTO.getId())).count();
+            tourTagBannerBiz.saveBatch(tourTagBannerDTOS, userDTO);
+        }
          return  effectRows;
     }
 
@@ -205,7 +207,9 @@ public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> {
          if (log.isDebugEnabled()){
              log.debug("更改标签对应的轮播图信息：[{}]",tourTagBannerDTOS);
          }
-         tourTagBannerDTOS.stream().filter(tourTagBannerDTO -> Objects.isNull(tourTagBannerDTO.getTagId())).peek(tourTagBannerDTO -> tourTagBannerDTO.setTagId(tourTagDTO.getId())).count();
+         if (CollectionUtils.isNotEmpty(tourTagBannerDTOS)){
+             tourTagBannerDTOS.stream().filter(tourTagBannerDTO -> Objects.isNull(tourTagBannerDTO.getTagId())).peek(tourTagBannerDTO -> tourTagBannerDTO.setTagId(tourTagDTO.getId())).count();
+         }
         tourTagBannerBiz.updateTourBannerByBatch(tourTagBannerDTOS,userDTO);
         return effrows;
     }