Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/AuthBootstrap.java

 package com.github.wxiaoqi.security.auth;
 
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import tk.mybatis.spring.annotation.MapperScan;
 
 /**
  * Created by Ace on 2017/6/2.

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/AdminBootstrap.java

@@ -2,7 +2,6 @@ package com.github.wxiaoqi.security.admin;
 
 import com.ace.cache.EnableAceCache;
 import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
@@ -10,6 +9,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+import tk.mybatis.spring.annotation.MapperScan;
 
 
 /**

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/Feign/ActivityFeign.java

@@ -22,14 +22,18 @@ public interface ActivityFeign {
     public String led(@RequestParam(value = "userId") Integer userId);
 
     @ApiOperation("单个优惠卷信息")
-    @RequestMapping(value = "/info/{no}", method = RequestMethod.GET)
+    @RequestMapping(value = "/user/info/{no}", method = RequestMethod.GET)
     public UserCouponVo info(@PathVariable(value = "no") String no);
 
     @ApiOperation("优惠卷使用")
-    @RequestMapping(value = "/use", method = RequestMethod.POST)
+    @RequestMapping(value = "/user/use", method = RequestMethod.POST)
     public ObjectRestResponse use(
             @RequestParam(value = "userId") Integer userId,
             @RequestParam(value = "TickerNo") String TickerNo,
             @RequestParam(value = "orderNo") String orderNo);
 
+    @ApiOperation("优惠卷取消使用")
+    @RequestMapping(value = "/user/cancelUse", method = RequestMethod.POST)
+    public ObjectRestResponse cancelUse(@RequestParam(value = "TickerNo",defaultValue ="" ) String TickerNo);
+
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/UserCouponBiz.java

@@ -116,6 +116,30 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
         updateSelectiveById(userCoupon);
     }
 
+    //取消使用优惠卷
+    public void cancelTickerNo(String TickerNo){
+        if (StringUtils.isBlank(TickerNo)){
+            log.error("----参数不能为空");
+            return;
+        }
+        Example example=new Example(UserCoupon.class);
+        example.createCriteria().andEqualTo("TickerNo",TickerNo).andEqualTo("isDel",0);
+        List<UserCoupon> list=selectByExample(example);
+        if(list.size()==0){
+            log.error(TickerNo+"----优惠卷不存在");
+            return;
+        }
+        UserCoupon userCoupon=list.get(0);
+       if (userCoupon!=null&&userCoupon.getIsUse()!=1){
+           log.error(TickerNo+"----没有领优惠卷");
+           return;
+       }
+        userCoupon.setIsUse(0);
+        userCoupon.setOrderNo("");
+        userCoupon.setUseTime(0L);
+        updateSelectiveById(userCoupon);
+    }
+
 
 
 

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/UserCouponController.java

@@ -35,6 +35,8 @@ public class UserCouponController extends ActivityBaseController<UserCouponBiz>
     public UserCouponVo info(@PathVariable String no) {
         return baseBiz.getUserCoupon(no);
     }
+
+
     @ApiOperation("优惠卷使用")
     @RequestMapping(value = "/use", method = RequestMethod.POST)
     public ObjectRestResponse use(
@@ -46,6 +48,14 @@ public class UserCouponController extends ActivityBaseController<UserCouponBiz>
         return ObjectRestResponse.succ();
     }
 
+    @ApiOperation("优惠卷取消使用")
+    @RequestMapping(value = "/cancelUse", method = RequestMethod.POST)
+    public ObjectRestResponse cancelUse(
+            @RequestParam(value = "TickerNo",defaultValue ="" ) String TickerNo){
+        baseBiz.cancelTickerNo(TickerNo);
+        return ObjectRestResponse.succ();
+    }
+
 
 
 }
\ No newline at end of file

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

@@ -13,7 +13,7 @@ import tk.mybatis.spring.annotation.MapperScan;
 /**
  * @author libin
  * @version 1.0
- * @description TODO
+ * @description 营地
  * @data 2019/6/17 10:51
  */
 @SpringBootApplication(scanBasePackages = {

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

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.TypeReference;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.campsite.dto.*;
 import com.xxfc.platform.campsite.vo.*;
-import jdk.nashorn.internal.ir.LiteralNode;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
@@ -19,6 +18,8 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -50,7 +51,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper,CampsiteShop> {
      */
     public PageDataVO<CampsiteShopPageVo> findCampsiteShopPageByType(Integer type,Integer pageNo,Integer pageSize) {
          //根据type类型查找店铺
-        PageDataVO<CampsiteShopPageDTO> pageDataVO = PageDataVO.pageInfo(pageNo, pageSize, () -> mapper.findCampsiteShopsByType(type));
+        PageDataVO<CampsiteShopPageDTO> pageDataVO = PageDataVO.pageInfo(pageNo, pageSize, () -> mapper.findAllCampsiteShopsByType(type));
         List<CampsiteShopPageDTO> campsiteShopPageDTOS = pageDataVO.getData();
 
         PageDataVO<CampsiteShopPageVo> campsiteShopPageDataVO = new PageDataVO<>();
@@ -142,7 +143,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper,CampsiteShop> {
             campsiteShopAdminFindDTO.setStartTime(processStartTime(startTime));
             campsiteShopAdminFindDTO.setEndTime(processEndTime(endTime));
         }*/
-        PageDataVO<CampsiteShopAdminPageDTO> campsiteShopAdminpageDTOPageDataVO = PageDataVO.pageInfo(campsiteShopAdminFindDTO.getPage(),campsiteShopAdminFindDTO.getLimit(),()->mapper.findCampsiteShops(campsiteShopAdminFindDTO));
+        PageDataVO<CampsiteShopAdminPageDTO> campsiteShopAdminpageDTOPageDataVO = PageDataVO.pageInfo(campsiteShopAdminFindDTO.getPage(),campsiteShopAdminFindDTO.getLimit(),()->mapper.findAllCampsiteShops(campsiteShopAdminFindDTO));
         List<CampsiteShopAdminPageDTO> campsiteShopAdminPageDTOS = campsiteShopAdminpageDTOPageDataVO.getData();
         if (log.isDebugEnabled()){
             log.debug("查询结果：【{}】",campsiteShopAdminPageDTOS);
@@ -257,7 +258,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper,CampsiteShop> {
      * @return
      */
     public int updateCampsiteSatus(int id) {
-        return mapper.updateCampsiteStatus(id,1);
+        return mapper.updateCampsiteStatusById(id,1);
     }
 
     /**
@@ -267,7 +268,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper,CampsiteShop> {
      * @return
      */
     public int updateCampsiteSaleStatus(Integer id, Integer status) {
-        return mapper.updateCampsiteSaleStatus(id,status);
+        return mapper.updateCampsiteSaleStatusById(id,status);
     }
 
     /**
@@ -276,7 +277,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper,CampsiteShop> {
      * @param name
      * @return
      */
-    public Boolean campsiteNameExist(Integer id, String name) {
+    public Boolean chekcCampsiteNameExist(Integer id, String name) {
           int  count = mapper.checkNameExist(id,name);
           if (count == 0) {
               return false;
@@ -290,11 +291,13 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper,CampsiteShop> {
      * @return
      */
     private long processStartTime(Long time){
-        Date processStartDate = new Date(time);
-        processStartDate.setHours(0);
-        processStartDate.setMinutes(0);
-        processStartDate.setSeconds(0);
-        return processStartDate.getTime();
+       return LocalDateTime.ofInstant(new Date(time).toInstant(), ZoneOffset.ofHours(+8))
+                .withHour(0)
+                .withMinute(0)
+                .withSecond(0)
+                .withNano(0)
+                .toInstant(ZoneOffset.ofHours(+8))
+                .toEpochMilli();
     }
 
     /**
@@ -303,11 +306,13 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper,CampsiteShop> {
      * @return
      */
     private long processEndTime(Long time){
-        Date processEndDate = new Date(time);
-        processEndDate.setHours(23);
-        processEndDate.setMinutes(59);
-        processEndDate.setSeconds(59);
-        return processEndDate.getTime();
+      return   LocalDateTime.ofInstant(new Date(time).toInstant(), ZoneOffset.ofHours(+8))
+              .withHour(23)
+              .withMinute(59)
+              .withSecond(59)
+              .withNano(999)
+              .toInstant(ZoneOffset.ofHours(+8))
+              .toEpochMilli();
     }
     /**
      * 根据经纬度，计算两点间的距离

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

@@ -12,7 +12,6 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.Instant;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -34,7 +33,7 @@ public class CampsiteShopCarouselBiz extends BaseBiz<CampsiteShopCarouselMapper,
      * @return
      */
     public List<CampsiteShopCarouselDetailDTO> findByCampsiteShopId(Integer id) {
-        return mapper.findCarousesByShopId(id);
+        return mapper.findAllCarousesByShopId(id);
     }
 
     /**
@@ -55,7 +54,7 @@ public class CampsiteShopCarouselBiz extends BaseBiz<CampsiteShopCarouselMapper,
         if (log.isDebugEnabled()){
             log.debug("更新的营地id:【{}】的轮播图信息id:【{}】",shopId,ids);
         }
-        int effectRows = mapper.updateCarouseStatus(ids, shopId, 1);
+        int effectRows = mapper.updateCarouseStatusByIdsAndShopId(ids, shopId, 1);
         if (CollectionUtils.isEmpty(shopCarouselDTOS)){
             return effectRows;
         }

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

@@ -35,7 +35,7 @@ public class CampsiteShopTagBiz extends BaseBiz<CampsiteShopTagMapper,CampsiteSh
      * @return
      */
     public List<CampsiteShopTagDTO> findByCampsiteShopId(Integer id) {
-        return mapper.findByCampsiteShopId(id);
+        return mapper.findAllByCampsiteShopId(id);
     }
 
     /**
@@ -44,7 +44,7 @@ public class CampsiteShopTagBiz extends BaseBiz<CampsiteShopTagMapper,CampsiteSh
      * @return
      */
     public Map<Integer, List<String>> findByCampsiteShopIds(List<Integer> campsiteShopIds) {
-         List<CampsiteShopTagDTO> campsiteShopTagDTOS = mapper.findByCampsiteShopIds(campsiteShopIds);
+         List<CampsiteShopTagDTO> campsiteShopTagDTOS = mapper.findAllByCampsiteShopIds(campsiteShopIds);
          if (CollectionUtils.isEmpty(campsiteShopTagDTOS)){
              return null;
          }

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

@@ -32,7 +32,7 @@ public class CampsiteTagBiz extends BaseBiz<CampsiteTagMapper,CampsiteTag> {
      * @return
      */
     public List<CampsiteTagListVo> findCampsiteTags() {
-        List<CampsiteTagListDTO> campsiteTagListDTOS = mapper.findCampsiteTags();
+        List<CampsiteTagListDTO> campsiteTagListDTOS = mapper.findAllCampsiteTags();
         if (CollectionUtils.isEmpty(campsiteTagListDTOS)){
             return  null;
         }
@@ -46,7 +46,7 @@ public class CampsiteTagBiz extends BaseBiz<CampsiteTagMapper,CampsiteTag> {
      * @return
      */
     public int updateCampsiteTagStatus(Integer tagId) {
-       return mapper.updateCampsiteTagStatus(tagId,1);
+       return mapper.updateCampsiteTagStatusById(tagId,1);
     }
 
     /**
@@ -57,7 +57,7 @@ public class CampsiteTagBiz extends BaseBiz<CampsiteTagMapper,CampsiteTag> {
      */
     public PageDataVO<CampsiteTagVo> findCampsiteTagsPage(Integer page, Integer limit) {
         PageDataVO<CampsiteTagVo> tagVoPageDataVO = new PageDataVO<>();
-        PageDataVO<CampsiteTag> pageDataVO = PageDataVO.pageInfo(page, limit, () -> mapper.finCampsiteTagsAll());
+        PageDataVO<CampsiteTag> pageDataVO = PageDataVO.pageInfo(page, limit, () -> mapper.findAllCampsiteTagsBydelStatus());
         List<CampsiteTag> campsiteTags = pageDataVO.getData();
         if (CollectionUtils.isEmpty(campsiteTags)){
             return tagVoPageDataVO;
@@ -74,7 +74,7 @@ public class CampsiteTagBiz extends BaseBiz<CampsiteTagMapper,CampsiteTag> {
      * @return
      */
     public int updateCampsiteTagIsSearchStatus(Integer id, Integer status) {
-       return   mapper.updateCampsiteTagIsearchStatus(id,status);
+       return   mapper.updateCampsiteTagIsearchStatusById(id,status);
     }
 
     /**

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/mapper/CampsiteShopCarouselMapper.java

@@ -23,9 +23,21 @@ public interface CampsiteShopCarouselMapper extends Mapper<CampsiteShopCarousel>
      * @param shopId
      * @return
      */
-    List<CampsiteShopCarouselDetailDTO> findCarousesByShopId(Integer shopId);
+    List<CampsiteShopCarouselDetailDTO> findAllCarousesByShopId(Integer shopId);
 
-    int updateCarouseStatus(@Param("ids") List<Integer> ids, @Param("shopId") Integer shopId, @Param("status") int status);
+    /**
+     * 根据营地id和轮播ids更新轮播状态
+     * @param ids
+     * @param shopId
+     * @param status
+     * @return
+     */
+    int updateCarouseStatusByIdsAndShopId(@Param("ids") List<Integer> ids, @Param("shopId") Integer shopId, @Param("status") int status);
 
+    /**
+     * 批量保存轮播信息
+     * @param shopCarouselDTOS
+     * @return
+     */
     int saveBatch(@Param("sc") List<CampsiteShopCarouselDTO> shopCarouselDTOS);
 }

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/mapper/CampsiteShopMapper.java

@@ -24,7 +24,7 @@ public interface CampsiteShopMapper extends Mapper<CampsiteShop> {
      * 根据店铺类型查找店铺列表
      * @param typeId
      */
-    List<CampsiteShopPageDTO> findCampsiteShopsByType(@Param("typeId") Integer typeId);
+    List<CampsiteShopPageDTO> findAllCampsiteShopsByType(@Param("typeId") Integer typeId);
 
     /**
      * 根据店铺id查询
@@ -38,7 +38,7 @@ public interface CampsiteShopMapper extends Mapper<CampsiteShop> {
      * @param campsiteShopAdminFindDTO
      * @return
      */
-    List<CampsiteShopAdminPageDTO> findCampsiteShops(CampsiteShopAdminFindDTO campsiteShopAdminFindDTO);
+    List<CampsiteShopAdminPageDTO> findAllCampsiteShops(CampsiteShopAdminFindDTO campsiteShopAdminFindDTO);
 
     /**
      * 更新店铺的状态
@@ -46,7 +46,7 @@ public interface CampsiteShopMapper extends Mapper<CampsiteShop> {
      * @param status
      * @return
      */
-    int updateCampsiteStatus(@Param("id") int id,@Param("status") int status);
+    int updateCampsiteStatusById(@Param("id") int id,@Param("status") int status);
 
     /**
      * 更新店铺的上下架状态
@@ -54,7 +54,7 @@ public interface CampsiteShopMapper extends Mapper<CampsiteShop> {
      * @param status
      * @return
      */
-    int updateCampsiteSaleStatus(@Param("id") Integer id, @Param("status") Integer status);
+    int updateCampsiteSaleStatusById(@Param("id") Integer id, @Param("status") Integer status);
 
     /**
      * 检验营地名称

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/mapper/CampsiteShopTagMapper.java

@@ -2,9 +2,7 @@ package com.xxfc.platform.campsite.mapper;
 
 import com.xxfc.platform.campsite.dto.CampsiteShopTagDTO;
 import com.xxfc.platform.campsite.entity.CampsiteShopTag;
-import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
@@ -19,22 +17,39 @@ import java.util.List;
 public interface CampsiteShopTagMapper extends Mapper<CampsiteShopTag> {
 
     /**
-     * 根据店铺id查询
+     * 根据营地id查询
      * @param shopId
      * @return
      */
-    List<CampsiteShopTagDTO> findByCampsiteShopId(Integer shopId);
+    List<CampsiteShopTagDTO> findAllByCampsiteShopId(Integer shopId);
 
     /**
-     * 根据店铺ids查询
+     * 根据营地ids查询
      * @param campsiteShopIds
      * @return
      */
-    List<CampsiteShopTagDTO> findByCampsiteShopIds(@Param("cspIds") List<Integer> campsiteShopIds);
+    List<CampsiteShopTagDTO> findAllByCampsiteShopIds(@Param("cspIds") List<Integer> campsiteShopIds);
 
-    int updateCampsiteTagStatus(@Param("ids") List<Long> ids,@Param("status") Integer status, @Param("shopId") Integer shopId);
+    /**
+     * 根据营地id 更新标签营地与类型对应的关系状态
+     * @param ids
+     * @param status
+     * @param shopId
+     * @return
+     */
+    int updateCampsiteTagStatusByIdsAndShopId(@Param("ids") List<Long> ids,@Param("status") Integer status, @Param("shopId") Integer shopId);
 
+    /**
+     * 批量保存营地与类型对应的关系
+     * @param shopTagDTOS
+     * @return
+     */
     int saveBatch(@Param("stgdtos") List<CampsiteShopTagDTO> shopTagDTOS);
 
+    /**
+     * 根据营地id删除营地与类型对应的关系
+     * @param shopId
+     * @return
+     */
     int deleteByShopId(Integer shopId);
 }

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/mapper/CampsiteTagMapper.java

@@ -4,7 +4,6 @@ import com.xxfc.platform.campsite.dto.CampsiteTagDTO;
 import com.xxfc.platform.campsite.dto.CampsiteTagListDTO;
 import com.xxfc.platform.campsite.entity.CampsiteTag;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Update;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
@@ -23,7 +22,7 @@ public interface CampsiteTagMapper extends Mapper<CampsiteTag> {
      * 查询可用营地列表
      * @return
      */
-    List<CampsiteTagListDTO> findCampsiteTags();
+    List<CampsiteTagListDTO> findAllCampsiteTags();
 
     /**
      * 更新类型的删除状态
@@ -31,11 +30,14 @@ public interface CampsiteTagMapper extends Mapper<CampsiteTag> {
      * @param status
      * @return
      */
-    @Update("update `campsite_tag` set `is_del`=#{status} where `id`=#{tagId}")
-    int updateCampsiteTagStatus(@Param("tagId") Integer tagId, @Param("status") int status);
+    int updateCampsiteTagStatusById(@Param("tagId") Integer tagId, @Param("status") int status);
 
 
-    List<CampsiteTagDTO> finCampsiteTagsAll();
+    /**
+     * 查询全部营地类型
+     * @return
+     */
+    List<CampsiteTagDTO> findAllCampsiteTagsBydelStatus();
 
     /**
      * 更改筛选条件状态
@@ -43,7 +45,7 @@ public interface CampsiteTagMapper extends Mapper<CampsiteTag> {
      * @param status
      * @return
      */
-    int updateCampsiteTagIsearchStatus(@Param("id") Integer id, @Param("status") Integer status);
+    int updateCampsiteTagIsearchStatusById(@Param("id") Integer id, @Param("status") Integer status);
 
 
     /**

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/rest/CampsiteShopController.java

@@ -23,42 +23,33 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @RequestMapping("/campsiteShop")
-@Api(value = "营地店铺",tags = "App营地店铺")
-public class CampsiteShopController extends BaseController<CampsiteShopBiz,CampsiteShop> {
-
-
-     /**
-      * 营地分页查询
-      * @param type
-      * @param pageNo
-      * @param pageSize
-      * @return
-      */
-     @ApiOperation("分页查询营地列表")
-     @GetMapping("/app/unauth/shops")
-     @IgnoreClientToken
-     public ObjectRestResponse<PageDataVO<CampsiteShopVo>> findCampsiteShopPageByType(@RequestParam(value = "type",required = false) Integer type,
-                                                                                      @RequestParam(value = "pageNo",required = false,defaultValue ="1") Integer pageNo,
-                                                                                      @RequestParam(value = "pageSize",required = false,defaultValue ="6") Integer pageSize){
-          PageDataVO<CampsiteShopPageVo> pageDataVO = getBaseBiz().findCampsiteShopPageByType(type,pageNo,pageSize);
-          return ObjectRestResponse.succ(pageDataVO);
-     }
-
-
-     /**
-      * 根据店铺id 查询
-      * @param id
-      * @param longitude 经度
-      * @param latitude 纬度
-      * @return
-      */
-     @ApiOperation("查询营地详情")
-     @GetMapping("/app/unauth/shop")
-     @IgnoreClientToken
-     public ObjectRestResponse<CampsiteShopDetailVo> findCampsiteShopDetailById(@RequestParam("id") Integer id,@RequestParam("longitude") Double longitude,@RequestParam("latitude") Double latitude){
-          CampsiteShopDetailVo campsiteShopDetailVo = getBaseBiz().findCampsiteShopDetailById(id,longitude,latitude);
-          return ObjectRestResponse.succ(campsiteShopDetailVo);
-     }
+@Api(tags = "App营地店铺")
+public class CampsiteShopController extends BaseController<CampsiteShopBiz, CampsiteShop> {
+
+
+    @ApiOperation("分页查询营地列表")
+    @GetMapping("/app/unauth/shops")
+    @IgnoreClientToken
+    public ObjectRestResponse<PageDataVO<CampsiteShopVo>> findCampsiteShopPageByType(@RequestParam(value = "type", required = false) Integer type,
+                                                                                     @RequestParam(value = "pageNo", required = false, defaultValue = "1") Integer pageNo,
+                                                                                     @RequestParam(value = "pageSize", required = false, defaultValue = "6") Integer pageSize) {
+        PageDataVO<CampsiteShopPageVo> pageDataVO = getBaseBiz().findCampsiteShopPageByType(type, pageNo, pageSize);
+        return ObjectRestResponse.succ(pageDataVO);
+    }
+
+
+    /**
+     * @param longitude 经度
+     * @param latitude  纬度
+     * @return
+     */
+    @ApiOperation("查询营地详情")
+    @GetMapping("/app/unauth/shop")
+    @IgnoreClientToken
+    public ObjectRestResponse<CampsiteShopDetailVo> findCampsiteShopDetailById(@RequestParam("id") Integer id, @RequestParam("longitude") Double longitude, @RequestParam("latitude") Double latitude) {
+        CampsiteShopDetailVo campsiteShopDetailVo = getBaseBiz().findCampsiteShopDetailById(id, longitude, latitude);
+        return ObjectRestResponse.succ(campsiteShopDetailVo);
+    }
 
 
 }
\ No newline at end of file

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/rest/CampsiteTagController.java

@@ -26,10 +26,7 @@ import java.util.List;
 @Api(tags = "App营地类型")
 public class CampsiteTagController extends BaseController<CampsiteTagBiz,CampsiteTag> {
 
-    /**
-     * 查询营地类型列表
-     * @return
-     */
+
      @GetMapping("/app/unauth/tags")
      @IgnoreClientToken
      @ApiOperation(value = "营地类型列表")

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/rest/admin/CampsiteShopAdminController.java

@@ -21,14 +21,10 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @RequestMapping("/admin/campsiteShop")
-@Api(value = "营地店铺",tags = "后台营地店铺")
+@Api(tags = "后台营地店铺")
 public class CampsiteShopAdminController extends BaseController<CampsiteShopBiz,CampsiteShop> {
 
-    /**
-     * 按条件分页查询 营地列表
-     * @param campsiteShopAdminFindDTO
-     * @return
-     */
+
     @ApiOperation(value = "营地列表")
     @PostMapping("/pages")
     public ObjectRestResponse<PageDataVO<CampsiteShopAdminPageVo>> findCampsiteShopPage(@RequestBody CampsiteShopAdminFindDTO campsiteShopAdminFindDTO){
@@ -36,11 +32,8 @@ public class CampsiteShopAdminController extends BaseController<CampsiteShopBiz,
         return ObjectRestResponse.succ(pageVoPageDataVO);
     }
 
-    /**
-     * 营地保存
-     * @param campsiteShopAdminDTO
-     * @return
-     */
+
+    @ApiOperation("营地保存")
     @PostMapping("/save")
     public ObjectRestResponse<Void> saveCampistieShop(@RequestBody CampsiteShopAdminDTO campsiteShopAdminDTO){
         int effectRows = getBaseBiz().saveCampsiteShop(campsiteShopAdminDTO);
@@ -50,11 +43,7 @@ public class CampsiteShopAdminController extends BaseController<CampsiteShopBiz,
         return ObjectRestResponse.createDefaultFail();
     }
 
-    /**
-     * 营地逻辑删除
-     * @param id
-     * @return
-     */
+    @ApiOperation("逻辑删除")
     @Override
     public ObjectRestResponse<CampsiteShop> remove(@PathVariable(value = "id") int id) {
         int effectRows = getBaseBiz().updateCampsiteSatus(id);
@@ -64,12 +53,6 @@ public class CampsiteShopAdminController extends BaseController<CampsiteShopBiz,
         return  ObjectRestResponse.createDefaultFail();
     }
 
-    /**
-     * 营地上下架
-     * @param id
-     * @param status
-     * @return
-     */
     @ApiOperation("营地上下架")
     @PutMapping("/saleStatus")
     public ObjectRestResponse<Void> updateSaleStatus(@RequestParam("id") Integer id,@RequestParam("status") Integer status){
@@ -80,14 +63,16 @@ public class CampsiteShopAdminController extends BaseController<CampsiteShopBiz,
         return  ObjectRestResponse.createDefaultFail();
     }
 
+    @ApiOperation("检验营地名称")
     @GetMapping("/exist")
     public ObjectRestResponse<Boolean> checkCampsiteNameExist(@RequestParam(value = "id",required = false) Integer id,@RequestParam("name") String name){
-        Boolean exist =  getBaseBiz().campsiteNameExist(id,name==null?"":name.trim());
+        Boolean exist =  getBaseBiz().chekcCampsiteNameExist(id,name==null?"":name.trim());
         return ObjectRestResponse.succ(exist);
     }
 
+    @ApiOperation("营地编辑查询")
     @GetMapping("/campsite/{id}")
-    public ObjectRestResponse<CampsiteShopAdminVO> findByCampsiteId(@PathVariable("id") Integer id){
+    public ObjectRestResponse<CampsiteShopAdminVO> findByCampsiteId(@PathVariable(value = "id") Integer id){
           CampsiteShopAdminVO campsiteShopAdminVO = getBaseBiz().findByCampsiteId(id);
           return ObjectRestResponse.succ(campsiteShopAdminVO);
     }

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/rest/admin/CampsiteTagAdminController.java

@@ -22,11 +22,7 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = "后台*营地类型")
 public class CampsiteTagAdminController extends BaseController<CampsiteTagBiz,CampsiteTag> {
 
-    /**
-     * 根据id逻辑删除
-     * @param id
-     * @return
-     */
+    @ApiOperation("逻辑删除")
     @Override
     public ObjectRestResponse<CampsiteTag> remove(@PathVariable("id") int id) {
         int effectRows = getBaseBiz().updateCampsiteTagStatus(id);
@@ -43,6 +39,7 @@ public class CampsiteTagAdminController extends BaseController<CampsiteTagBiz,Ca
         return ObjectRestResponse.succ(tagVoPageDataVO);
     }
 
+    @ApiOperation("筛选状态更改")
     @PutMapping("/searchStatus")
     public ObjectRestResponse<Void> updateIsSearchStatus(@RequestParam("id") Integer id,@RequestParam("status") Integer status){
        int effectRows =  getBaseBiz().updateCampsiteTagIsSearchStatus(id,status);
@@ -52,6 +49,7 @@ public class CampsiteTagAdminController extends BaseController<CampsiteTagBiz,Ca
         return ObjectRestResponse.createDefaultFail();
     }
 
+    @ApiOperation("校验营地类型名称")
     @GetMapping("/exist")
     public ObjectRestResponse<Boolean> checkTagNameExist(@RequestParam(value = "id",required = false) Integer id,@RequestParam("name") String name){
          Boolean exist =  getBaseBiz().checkTagNameExist(id,name==null?"":name.trim());

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

@@ -13,11 +13,13 @@
         <result property="isDel" column="is_del"/>
     </resultMap>
 
-    <select id="findCarousesByShopId" resultType="com.xxfc.platform.campsite.dto.CampsiteShopCarouselDetailDTO">
+    <!--根据营地id查询全部-->
+    <select id="findAllCarousesByShopId" resultType="com.xxfc.platform.campsite.dto.CampsiteShopCarouselDetailDTO">
         select `id` as `id`,`img_url`as `imgUrl`,`url`as `url` from `campsite_shop_carousel` where shop_id=#{shopId} and `is_del`=0;
     </select>
 
-    <update id="updateCarouseStatus">
+    <!--更新轮播图状态-->
+    <update id="updateCarouseStatusByIdsAndShopId">
         update `campsite_shop_carousel` set `is_del`=#{status} where `shop_id`=#{shopId}
         <if test="ids != null and ids.size() != 0">
             and `id` not in <foreach collection="ids" item="id" open="(" close=")" separator=",">
@@ -26,6 +28,7 @@
         </if>
     </update>
 
+    <!--批量保存-->
     <insert id="saveBatch" >
         insert into `campsite_shop_carousel` (`shop_id`,`img_url`)values
         <foreach collection="sc" item="s" separator=",">

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

@@ -34,7 +34,8 @@
         <result property="saleState" column="sale_state"/>
     </resultMap>
 
-    <select id="findCampsiteShopsByType" resultType="com.xxfc.platform.campsite.dto.CampsiteShopPageDTO">
+    <!--根据类型查询全部-->
+    <select id="findAllCampsiteShopsByType" resultType="com.xxfc.platform.campsite.dto.CampsiteShopPageDTO">
         select cs.id as `id`,cs.name as `name`,cs.logo as `logo`,cs.url as `url`,cs.province_name as `provinceName`,cs.city_name as `cityName`,
         cs.longitude as `longitude`,cs.latitude as `latitude`,cs.hot as `hot`,cs.crt_time as `crtTime`,ct.id as `storeId`,ct.name as `storeTypeName`
         FROM `campsite_shop_tag`  cst
@@ -46,12 +47,14 @@
         </if>
     </select>
 
+    <!--根据id查询详情-->
     <select id="findCampsiteShopDetailById" resultType="com.xxfc.platform.campsite.dto.CampsiteShopDetailDTO">
         select `name` as `name`,`province_name` as `provinceName`,`city_name` as `cityName`,`address` as `address`,
         `content` as `content`,`configure` as `configure`,`longitude` as `longitude`,`latitude` as `latitude` from `campsite_shop` where `id`=#{id}
     </select>
 
-    <select id="findCampsiteShops" parameterType="com.xxfc.platform.campsite.dto.CampsiteShopAdminFindDTO" resultType="com.xxfc.platform.campsite.dto.CampsiteShopAdminPageDTO">
+    <!--根据查询条件分页查询-->
+    <select id="findAllCampsiteShops" parameterType="com.xxfc.platform.campsite.dto.CampsiteShopAdminFindDTO" resultType="com.xxfc.platform.campsite.dto.CampsiteShopAdminPageDTO">
      SELECT `id`,`name`,`hot`,`crt_time` as `crtTime`,`start_time` as `shopStartTime`,`sale_state` as
         `saleState` FROM `campsite_shop`
       where `is_del`=0
@@ -70,14 +73,17 @@
 
     </select>
 
-    <update id="updateCampsiteStatus">
+    <!--根据id更新营地状态-->
+    <update id="updateCampsiteStatusById">
         update `campsite_shop` set `is_del`=#{status} where `id`=#{id}
     </update>
 
-    <update id="updateCampsiteSaleStatus">
+    <!--根据id更新营地上下架状态-->
+    <update id="updateCampsiteSaleStatusById">
         update `campsite_shop` set `sale_state`=#{status} where `id`=#{id}
     </update>
 
+    <!--检验营地名称是否存在-->
     <select id="checkNameExist" resultType="int">
         select count(`id`) from `campsite_shop` where `name`=#{name}
         <if test="id != null">

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

@@ -13,7 +13,8 @@
         <result property="isDel" column="is_del"/>
     </resultMap>
 
-    <select id="findByCampsiteShopIds" resultType="com.xxfc.platform.campsite.dto.CampsiteShopTagDTO">
+    <!--根据营地ids 查询全部-->
+    <select id="findAllByCampsiteShopIds" resultType="com.xxfc.platform.campsite.dto.CampsiteShopTagDTO">
           select cst.shop_id as `shopId`,cst.tag_id as `tagId`,ct.name as `name` from `campsite_shop_tag` as `cst` inner join `campsite_tag` as `ct` on cst.tag_id=ct.id where cst.is_del=0
           and cst.shop_id in
           <foreach collection="cspIds" item="spid" separator="," open="(" close=")">
@@ -21,11 +22,13 @@
           </foreach>
     </select>
 
-    <select id="findByCampsiteShopId" resultType="com.xxfc.platform.campsite.dto.CampsiteShopTagDTO">
+    <!--根据营地id查询 全部-->
+    <select id="findAllByCampsiteShopId" resultType="com.xxfc.platform.campsite.dto.CampsiteShopTagDTO">
         select ct.id as `id`,ct.name as `name` from campsite_shop_tag as `cst` left join campsite_tag as `ct` on cst.tag_id=ct.id where `shop_id`=#{shopId}
     </select>
 
-    <update id="updateCampsiteTagStatus">
+    <!--根据营地类型id和营地id更新关系状态-->
+    <update id="updateCampsiteTagStatusByIdsAndShopId">
         update `campsite_shop_tag` set `is_del`=#{status} where `shop_id`=#{shopId}
         <if test="ids != null and ids.size() != 0">
             and `id` not in <foreach collection="ids" item="id" open="(" close=")" separator=",">
@@ -35,6 +38,7 @@
 
     </update>
 
+    <!--批量保存-->
     <insert id="saveBatch">
         insert into `campsite_shop_tag`(`shop_id`,`tag_id`,`crt_time`)values
         <foreach collection="stgdtos" item="stg" separator=",">
@@ -42,9 +46,9 @@
         </foreach>
     </insert>
 
+    <!--根据营地id删除-->
     <delete id="deleteByShopId">
         delete  from `campsite_shop_tag` where `shop_id`=#{shopId} ;
-
     </delete>
 
 </mapper>
\ No newline at end of file

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

@@ -28,18 +28,27 @@
         <result property="tagUrl" column="tag_url"/>
     </resultMap>
 
-    <select id="findCampsiteTags" resultType="com.xxfc.platform.campsite.dto.CampsiteTagListDTO">
+    <!--App*查询全部营地类型-->
+    <select id="findAllCampsiteTags" resultType="com.xxfc.platform.campsite.dto.CampsiteTagListDTO">
         select `id`,`name` from `campsite_tag` where `is_del`=0 and `is_search`=1;
     </select>
 
-    <select id="finCampsiteTagsAll" resultMap="campsiteTagDTOMap">
+    <!--后台*查询全部营地类型-->
+    <select id="findAllCampsiteTagsBydelStatus" resultMap="campsiteTagDTOMap">
         select * from `campsite_tag` where `is_del`=0
     </select>
 
-    <update id="updateCampsiteTagIsearchStatus">
+    <!--更新营地类型状态-->
+     <update id="updateCampsiteTagStatusById">
+         update `campsite_tag` set `is_del`=#{status} where `id`=#{tagId}
+     </update>
+
+    <!--更新营地类型是否作为筛选条件-->
+    <update id="updateCampsiteTagIsearchStatusById">
         update `campsite_tag` set `is_search`=#{status} where `id`=#{id}
     </update>
 
+    <!--检验营地类型名称是否存在-->
     <select id="checkTagNameExist" resultType="int">
         select count(`id`) from `campsite_tag` where `name`=#{name}
         <if test="id != null">