Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseUserMember.java

@@ -72,9 +72,16 @@ public class BaseUserMember implements Serializable {
 	    /**
      *  剩余天数
      */
-    @Column(name = "s_number")
+    @Column(name = "rent_free_days")
 	@ApiModelProperty(value = "剩余天数")
-    private Integer sNumber;
+    private Integer rentFreeDays;
+
+
+	//折扣
+	@Column(name = "discount")
+	@ApiModelProperty(value = "折扣")
+	private Integer discount;
+
 	
 	    /**
      *  有效期;0代表永久

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java

@@ -6,6 +6,7 @@ import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -22,6 +23,12 @@ import java.util.List;
 public interface UserFeign {
     @RequestMapping(value = "/public/userinfo-by-token")
     public ObjectRestResponse<UserDTO> userinfoByToken(@RequestParam("token") String token);
+
+    /**
+     * token获取用户信息
+     * @param token
+     * @return
+     */
     @RequestMapping(value = "/public/app/userinfo-by-token")
     public ObjectRestResponse<AppUserDTO> userDetailByToken(@RequestParam("token") String token);
 
@@ -35,9 +42,26 @@ public interface UserFeign {
     public ObjectRestResponse authentication( @RequestParam(value="userId")Integer  userId,
                                               @RequestParam(value="idNumber")String idNumber,
                                               @RequestParam(value="status")Integer  status);
-    @RequestMapping(value = "/member/levels", method = RequestMethod.GET)
+
+    /**
+     * 获取会员等级列表
+     * @return
+     */
+    @RequestMapping(value = "/member/app/unauth/levels", method = RequestMethod.GET)
     public List<BaseUserMemberLevel> levels();
 
+    /**
+     * 获取单个会员等级
+     * @return
+     */
+    @RequestMapping(value = "/member/app/unauth/level/{type}", method = RequestMethod.GET)
+    public List<BaseUserMemberLevel> level(@PathVariable Integer type);
+
+    /**
+     * 批量获取用户基本信息
+     * @param ids
+     * @return
+     */
     @RequestMapping(value = "/public/getByUserIds", method = RequestMethod.GET)
     public ObjectRestResponse<List<AppUserVo>> getByUserIds(@RequestParam("ids")List<Integer> ids);
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java

@@ -26,6 +26,8 @@ public class AppUserDTO {
 	private String idNumber;
 	private Integer certificationStatus;
 	private Integer rentFreeDays;
+	private Integer totalNumber;
+	private Integer discount;
 	private Integer memberLevel;
 	private Integer memberNo;
 	private Long cardLeave;

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/UserMemberVo.java

+package com.github.wxiaoqi.security.admin.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 用户会员
+ * 
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-06-18 19:38:56
+ */
+@Data
+public class UserMemberVo {
+
+	
+	    /**
+    *  主键id
+   */
+	@ApiModelProperty("主键id")
+    private Integer id;
+	
+	    /**
+     *  用户id
+     */
+	@ApiModelProperty(value = "用户id")
+    private Integer userId;
+	
+	    /**
+     *  会员编号
+     */
+	@ApiModelProperty(value = "会员编号")
+    private String memberNo;
+	
+	    /**
+     *  会员等级
+     */
+	@ApiModelProperty(value = "会员等级")
+    private Integer memberLevel;
+	
+	    /**
+     *  卡内余额
+     */
+	@ApiModelProperty(value = "卡内余额")
+    private Integer cardLeave;
+	
+	/**
+     *  0:未支付 1：绑定 2:解绑
+     */
+	@ApiModelProperty(value = "0:未支付 1：绑定 2:解绑")
+    private Integer isBind;
+	
+	    /**
+     *  赠送总天数
+     */
+	@ApiModelProperty(value = "赠送总天数")
+    private Integer totalNumber;
+	
+	    /**
+     *  剩余天数
+     */
+	@ApiModelProperty(value = "剩余天数")
+    private Integer rentFreeDays;
+
+	//折扣
+	@ApiModelProperty(value = "折扣")
+	private Integer discount;
+	
+	    /**
+     *  有效期;0代表永久
+     */
+	@ApiModelProperty(value = "有效期;0代表永久")
+    private Long validTime;
+	
+	    /**
+     *  创建时间
+     */
+	@ApiModelProperty(value = "创建时间", hidden = true )
+    private Long crtTime;
+	
+	    /**
+     *  更新时间
+     */
+	@ApiModelProperty(value = "更新时间", hidden = true )
+    private Long updTime;
+	
+	/**
+     *  是否删除；0-正常；1-删除
+     */
+	@ApiModelProperty(value = "是否删除；0-正常；1-删除")
+    private Integer isDel;
+	
+
+}

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

 package com.github.wxiaoqi.security.admin.biz;
 
+import com.ace.cache.annotation.Cache;
+import com.ace.cache.annotation.CacheClear;
+import com.github.wxiaoqi.security.admin.vo.UserMemberVo;
 import org.springframework.stereotype.Service;
-
 import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
 import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
@@ -18,5 +20,23 @@ import org.springframework.transaction.annotation.Transactional;
 @Transactional(rollbackFor = Exception.class)
 public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMember> {
 
+   //获取用户会员信息
+    @Cache(key = "user:member{1}")
+    public UserMemberVo getMemberInfoByUserId(Integer userId){
+        return  mapper.getInfoByUserId(userId);
+    }
+
+    //更新会员信息
+    @Override
+    @CacheClear(key = "user:member{1.userid}")
+    public  void  updateSelectiveById(BaseUserMember userMember){  super.updateSelectiveById(userMember);}
+
+
+    //用户会员信息更新
+    public  void  updUserMemberByUserId(){
+
+    }
+
+
 
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/UserMemberBiz.java → ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/UserMemberLevelBiz.java

 package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.Cache;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.github.wxiaoqi.security.admin.entity.AppUser;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
-import com.github.wxiaoqi.security.admin.entity.Group;
-import com.github.wxiaoqi.security.admin.entity.User;
-import com.github.wxiaoqi.security.admin.mapper.AppUserMapper;
 import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberLevelMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
-import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import com.github.wxiaoqi.security.common.msg.TableResultResponse;
-import com.github.wxiaoqi.security.common.util.Query;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 
-import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.DATA_ALL_TRUE;
 
 /**
  * @author keliii
  */
 @Service
-public class UserMemberBiz extends BaseBiz<BaseUserMemberLevelMapper,BaseUserMemberLevel> {
+public class UserMemberLevelBiz extends BaseBiz<BaseUserMemberLevelMapper,BaseUserMemberLevel> {
 
 
     @Transactional
+    @Cache(key="member")
     public List<BaseUserMemberLevel> getLevesls() {
-        return  mapper.selectAll();
+        Example example=new Example(BaseUserMemberLevel.class);
+        example.createCriteria().andEqualTo("isdel",0);
+        example.setOrderByClause(" level asc ");
+        return  mapper.selectByExample(example);
     }
 
+
 }

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

 package com.github.wxiaoqi.security.admin.mapper;
 
 import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
+import com.github.wxiaoqi.security.admin.vo.UserMemberVo;
+import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
 /**
@@ -11,5 +13,8 @@ import tk.mybatis.mapper.common.Mapper;
  * @date 2019-06-18 19:38:56
  */
 public interface BaseUserMemberMapper extends Mapper<BaseUserMember> {
+
+    //获取用户会员信息
+    public UserMemberVo getInfoByUserId(@Param("userId")Integer userId);
 	
 }

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

@@ -3,13 +3,16 @@ package com.github.wxiaoqi.security.admin.rest;
 import com.ace.cache.annotation.Cache;
 import com.github.wxiaoqi.security.admin.biz.AppUserBiz;
 import com.github.wxiaoqi.security.admin.biz.AppUserDetailBiz;
+import com.github.wxiaoqi.security.admin.biz.BaseUserMemberBiz;
 import com.github.wxiaoqi.security.admin.entity.AppUser;
 import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.entity.Group;
 import com.github.wxiaoqi.security.admin.entity.User;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.vo.AppUserGroups;
 import com.github.wxiaoqi.security.admin.vo.AppUserInfoVo;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
+import com.github.wxiaoqi.security.admin.vo.UserMemberVo;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
@@ -18,6 +21,7 @@ import com.github.wxiaoqi.security.common.rest.CommonBaseController;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -45,6 +49,9 @@ public class AppUserController extends CommonBaseController {
     @Autowired
     AppUserDetailBiz userDetailBiz;
 
+    @Autowired
+    private BaseUserMemberBiz userMemberBiz;
+
     @GetMapping("page")
     public TableResultResponse list(@RequestParam Map<String, Object> params) {
         Query query = new Query(params);
@@ -102,17 +109,26 @@ public class AppUserController extends CommonBaseController {
      * @throws Exception
      */
     @GetMapping("/info")
-    public ObjectRestResponse<AppUserVo> getUserInfo()throws Exception {
+    public ObjectRestResponse<AppUserDTO> getUserInfo()throws Exception {
         String username = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getId();
         if (username == null) {
             throw new Exception();
         }
+        AppUserDTO userDTO=new AppUserDTO();
         Integer userid=Integer.parseInt(username);
-        AppUserVo user = userDetailBiz.getUserInfoById(userid);
-        if (user == null) {
+        AppUserVo userVo = userDetailBiz.getUserInfoById(userid);
+        if (userVo == null) {
             throw new Exception();
         }
-        return ObjectRestResponse.succ(user);
+        BeanUtils.copyProperties(userDTO,userVo);
+        if(userVo.getIsMember()!=null&&userVo.getIsMember()>0){
+            //获取用户会员信息
+            UserMemberVo memberVo=userMemberBiz.getMemberInfoByUserId(userid);
+            if(memberVo!=null){
+                BeanUtils.copyProperties(userDTO,memberVo);
+            }
+        }
+        return ObjectRestResponse.succ(userDTO);
     }
 
     /**
@@ -130,13 +146,5 @@ public class AppUserController extends CommonBaseController {
         return ObjectRestResponse.succ();
     }
 
-    @GetMapping("/findByUserId")
-    public ObjectRestResponse<AppUserDetail> findByUserId(Integer id) {
-        if(id == null || id < 0) {
-            return ObjectRestResponse.createFailedResult(500, "参数id为空");
-        }
-        AppUserDetail appUserDetail = userDetailBiz.getUserByUserid(id);
-        return ObjectRestResponse.succ(appUserDetail);
-    }
 
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/MemberController.java → ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/MemberLevelController.java

 package com.github.wxiaoqi.security.admin.rest;
 
-import com.github.wxiaoqi.security.admin.biz.AppUserDetailBiz;
-import com.github.wxiaoqi.security.admin.biz.UserBiz;
-import com.github.wxiaoqi.security.admin.biz.UserMemberBiz;
-import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
+import com.github.wxiaoqi.security.admin.biz.UserMemberLevelBiz;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
-import com.github.wxiaoqi.security.admin.entity.User;
-import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
-import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -24,14 +16,30 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("member")
-public class MemberController {
+public class MemberLevelController {
 
     @Autowired
-    private UserMemberBiz memberBiz;
+    private UserMemberLevelBiz memberBiz;
 
-    @RequestMapping(value = "/levels", method = RequestMethod.GET)
+    @RequestMapping(value = "/app/unauth/levels", method = RequestMethod.GET)
     public @ResponseBody
-    List<BaseUserMemberLevel> levels(String token) throws Exception {
+    List<BaseUserMemberLevel> levels() throws Exception {
         return memberBiz.getLevesls();
     }
+
+    @RequestMapping(value = "/app/unauth/level/{type}", method = RequestMethod.GET)
+    public @ResponseBody
+    BaseUserMemberLevel level(@PathVariable Integer type) throws Exception {
+         List<BaseUserMemberLevel> list=memberBiz.getLevesls();
+         if(type!=null){
+             if(list.size()>0){
+                 for (BaseUserMemberLevel userMemberLevel:list){
+                     if(userMemberLevel.getLevel()!=null&&userMemberLevel.getLevel()==type){
+                         return userMemberLevel;
+                     }
+                 }
+             }
+         }
+        return null;
+    }
 }

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

 package com.github.wxiaoqi.security.admin.rest;
 
-import com.github.wxiaoqi.security.admin.biz.AppUserDetailBiz;
-import com.github.wxiaoqi.security.admin.biz.AppUserLoginBiz;
-import com.github.wxiaoqi.security.admin.biz.MenuBiz;
-import com.github.wxiaoqi.security.admin.biz.UserBiz;
+import com.github.wxiaoqi.security.admin.biz.*;
 import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.entity.Group;
 import com.github.wxiaoqi.security.admin.entity.Menu;
@@ -13,6 +10,7 @@ import com.github.wxiaoqi.security.admin.rpc.service.PermissionService;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.admin.vo.FrontUser;
 import com.github.wxiaoqi.security.admin.vo.MenuTree;
+import com.github.wxiaoqi.security.admin.vo.UserMemberVo;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -45,11 +43,10 @@ public class PublicController {
     @Autowired
     private UserBiz userBiz;
 
-    @Autowired
-    private AppUserLoginBiz userLoginBiz;
-
     @Autowired
     private AppUserDetailBiz detailBiz;
+    @Autowired
+    private BaseUserMemberBiz userMemberBiz;
 
     @Autowired
     private UserAuthUtil userAuthUtil;
@@ -77,12 +74,20 @@ public class PublicController {
         }
         AppUserDTO userDTO=new AppUserDTO();
         Integer userid=Integer.parseInt(username);
-        AppUserDetail user = detailBiz.getUserByUserid(userid);
-        if (user == null) {
+        //获取用户基础信息
+        AppUserVo userVo = detailBiz.getUserInfoById(userid);
+        if (userVo == null) {
             throw new BaseException(ResultCode.NOTEXIST_CODE);
         }
-        BeanUtils.copyProperties(userDTO,user);
-        return new ObjectRestResponse<AppUserDetail>().rel(true).data(user);
+        BeanUtils.copyProperties(userDTO,userVo);
+        if(userVo.getIsMember()!=null&&userVo.getIsMember()>0){
+            //获取用户会员信息
+             UserMemberVo memberVo=userMemberBiz.getMemberInfoByUserId(userid);
+             if(memberVo!=null){
+                 BeanUtils.copyProperties(userDTO,memberVo);
+             }
+        }
+        return new ObjectRestResponse<AppUserDetail>().rel(true).data(userDTO);
     }
 
     @GetMapping("/getByUserIds")

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -12,7 +12,7 @@
     <result column="status"  property="status" />
     <result column="id_number"  property="idNumber" />
     <result column="certification_status"  property="certificationStatus" />
-    <result column="isMember"  property="is_member" />
+    <result column="is_member"  property="isMember" />
     <result column="nickname"  property="nickname" />
     <result column="realname"  property="realname" />
     <result column="headimgurl"  property="headimgurl" />

ace-modules/ace-admin/src/main/resources/mapper/BaseUserMemberMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.github.wxiaoqi.security.admin.mapper.BaseUserMemberMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.github.wxiaoqi.security.admin.vo.UserMemberVo" id="baseUserMemberMap">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="memberNo" column="member_no"/>
+        <result property="memberLevel" column="member_level"/>
+        <result property="cardLeave" column="card_leave"/>
+        <result property="isBind" column="is_bind"/>
+        <result property="totalNumber" column="total_number"/>
+        <result property="rentFreeDays" column="rent_free_days"/>
+        <result property="validTime" column="valid_time"/>
+        <result property="crtTime" column="crt_time"/>
+        <result property="updTime" column="upd_time"/>
+        <result property="isDel" column="is_del"/>
+    </resultMap>
+
+    <select id="getInfoByUserId" resultMap="baseUserMemberMap">
+          select  * from  base_user_member where  user_id=#{userId} and is_del=0 limit 1
+    </select>
+
+</mapper>
\ No newline at end of file

xx-campsite/pom.xml

@@ -7,12 +7,13 @@
         <groupId>com.github.wxiaoqi</groupId>
         <version>2.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>xx-campsite</artifactId>
-    <packaging>pom</packaging>
+    <groupId>com.xxfc.platform</groupId>
     <modules>
         <module>xx-campsite-api</module>
         <module>xx-campsite-server</module>
     </modules>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>pom</packaging>
+    <artifactId>xx-campsite</artifactId>
+
 </project>
\ No newline at end of file

xx-campsite/xx-campsite-api/pom.xml

@@ -3,15 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>xx-campsite</artifactId>
-        <groupId>com.github.wxiaoqi</groupId>
+        <groupId>com.xxfc.common</groupId>
+        <artifactId>xx-common-platform</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
+    <groupId>com.xxfc.platform</groupId>
     <artifactId>xx-campsite-api</artifactId>
-     <name>xx-campsite-api</name>
-    <description>The xxfc campsite api</description>
     <dependencies>
         <dependency>
             <groupId>com.github.wxiaoqi</groupId>

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

@@ -17,14 +17,9 @@ import java.io.Serializable;
  */
 @Data
 @Table(name = "campsite_shop")
-@ApiModel(value = "营地店铺vo" )
+@ApiModel(value = "营地店铺dto" )
 public class CampsiteShopDTO implements Serializable {
     private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty("主键id")
-    private Integer id;
-
     /**
      * 店铺名称
      */
@@ -164,10 +159,9 @@ public class CampsiteShopDTO implements Serializable {
     private Long updTime;
 
     /**
-     * 是否删除：0-正常；1-删除
+     * 热度值
      */
-    @ApiModelProperty(value = "是否删除：0-正常；1-删除")
-    private Integer isDel;
-
+    @ApiModelProperty(value = "热度值")
+    private Integer hot;
 
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/entity/CampsiteShop.java

@@ -196,5 +196,17 @@ public class CampsiteShop implements Serializable {
     @ApiModelProperty(value = "是否删除：0-正常；1-删除")
     private Integer isDel;
 
+    /**
+     * 热度值
+     */
+    @Column(name = "hot")
+    @ApiModelProperty(value = "热度值")
+    private Integer hot;
 
+    /**
+     * 上下架状态 0-创建状态  1-上架 2-下架
+     */
+    @Column(name = "sale_state")
+    @ApiModelProperty(value = "上下架状态 0-创建状态  1-上架 2-下架")
+    private Integer saleState;
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/entity/CampsiteTag.java

@@ -59,9 +59,9 @@ public class CampsiteTag implements Serializable {
     /**
      * 创建时间
      */
-    @Column(name = "ctr_time")
+    @Column(name = "crt_time")
     @ApiModelProperty(value = "创建时间")
-    private Long ctrTime;
+    private Long crtTime;
 
     /**
      * 更新时间
@@ -77,5 +77,10 @@ public class CampsiteTag implements Serializable {
     @ApiModelProperty(value = "是否删除:0-正常；1-删除")
     private Integer isDel;
 
-
+    /**
+     * 标签底图
+     */
+    @Column(name = "tag_url")
+    @ApiModelProperty(value = "标签底图")
+   private String tagUrl;
 }

xx-campsite/xx-campsite-server/pom.xml

@@ -3,25 +3,36 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>xx-campsite</artifactId>
-        <groupId>com.github.wxiaoqi</groupId>
+        <groupId>com.xxfc.common</groupId>
+        <artifactId>xx-common-platform-web</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
+    <groupId>com.xxfc.platform</groupId>
     <artifactId>xx-campsite-server</artifactId>
-    <name>xx-campsite-server</name>
     <description>the xxfc travel Campsite</description>
 
      <dependencies>
          <dependency>
-             <groupId>com.github.wxiaoqi</groupId>
+             <groupId>com.xxfc.platform</groupId>
              <artifactId>xx-campsite-api</artifactId>
              <version>2.0-SNAPSHOT</version>
          </dependency>
-         <dependency>
-             <groupId>com.xxfc.common</groupId>
-             <artifactId>xx-common-platform-web</artifactId>
-             <version>2.0-SNAPSHOT</version>
-         </dependency>
      </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
\ No newline at end of file

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

@@ -36,4 +36,13 @@ public class CampsiteTagBiz extends BaseBiz<CampsiteTagMapper,CampsiteTag> {
         List<CampsiteTagListVo> campsiteTagListVos = JSONObject.parseObject(JSONObject.toJSONString(campsiteTagListDTOS),new TypeReference<List<CampsiteTagListVo>>(){});
         return campsiteTagListVos;
     }
+
+    /**
+     * 更新营地类型状态
+     * @param tagId
+     * @return
+     */
+    public int updateCampsiteTagStatus(Integer tagId) {
+       return mapper.updateCampsiteTagStatus(tagId,1);
+    }
 }
\ No newline at end of file

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

@@ -2,6 +2,8 @@ package com.xxfc.platform.campsite.mapper;
 
 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;
@@ -21,4 +23,13 @@ public interface CampsiteTagMapper extends Mapper<CampsiteTag> {
      * @return
      */
     List<CampsiteTagListDTO> findCampsiteTags();
+
+    /**
+     * 更新类型的删除状态
+     * @param tagId
+     * @param status
+     * @return
+     */
+    @Update("update `campsite_tag` set `is_del`=#{status} where `id`=#{tagId}")
+    int updateCampsiteTagStatus(@Param("tagId") Integer tagId, @Param("status") int status);
 }

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

@@ -6,7 +6,10 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.campsite.biz.CampsiteTagBiz;
 import com.xxfc.platform.campsite.entity.CampsiteTag;
 import com.xxfc.platform.campsite.vo.CampsiteTagListVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -15,11 +18,12 @@ import java.util.List;
 /**
  * @author libin
  * @version 1.0
- * @description 店铺类型
+ * @description 营地类型
  * @data 2019/6/17 13:36
  */
 @RestController
 @RequestMapping("campsiteTag")
+@Api(tags = "营地类型")
 public class CampsiteTagController extends BaseController<CampsiteTagBiz,CampsiteTag> {
 
     /**
@@ -28,9 +32,23 @@ public class CampsiteTagController extends BaseController<CampsiteTagBiz,Campsit
      */
      @GetMapping("/app/unauth/tags")
      @IgnoreClientToken
+     @ApiOperation(value = "营地列表")
     public ObjectRestResponse<CampsiteTagListVo> findCampstieTags(){
          List<CampsiteTagListVo> campsiteTagListVolist = getBaseBiz().findCampsiteTags();
          return ObjectRestResponse.succ(campsiteTagListVolist);
      }
 
+    /**
+     * 根据id逻辑删除
+     * @param id
+     * @return
+     */
+    @Override
+    public ObjectRestResponse<CampsiteTag> remove(@PathVariable("id") int id) {
+        int effectRows = getBaseBiz().updateCampsiteTagStatus(id);
+        if (effectRows>0){
+            ObjectRestResponse.succ();
+        }
+        return ObjectRestResponse.createDefaultFail();
+    }
 }
\ No newline at end of file

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

@@ -10,7 +10,7 @@
         <result property="name" column="name"/>
         <result property="isSearch" column="is_search"/>
         <result property="rank" column="rank"/>
-        <result property="ctrTime" column="ctr_time"/>
+        <result property="crtTime" column="crt_time"/>
         <result property="updTime" column="upd_time"/>
         <result property="isDel" column="is_del"/>
     </resultMap>

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

@@ -54,7 +54,7 @@
     <!--查询旅游路线列表-->
     <select id="getGoodList" parameterType="java.util.Map" resultMap="tourGoodMap">
         SELECT * from tour_good t
-        where  t.is_del=1 AND  t.status=1
+        where  t.is_del=0 AND  t.status=1
         <if test="params.query != null and params.query != ''">
             and (t.`name` like CONCAT('%',#{params.query},'%') or t.introduce like CONCAT('%',#{params.query},'%'))
         </if>