feats

src/main/java/com/yunzhi/shigongli/common/Constants.java

@@ -51,6 +51,11 @@ public class Constants {
     public final static String PACKAGE_NORMAL = "normal";           // 普通套餐
     public final static String PACKAGE_CASH = "cash_coupon";        // 现金抵用券
 
+    // 人员角色
+    public final static String PERSON_NORMAL = "normal";        // 普通游客
+    public final static String PERSON_HOTEL = "hotel";          // 民宿老板
+    public final static String PERSON_SHOP = "shop";            // 店铺老板
+
     // 推荐人类型
     public final static String RECOMMEND_SHOP = "shop";     // 商铺
     public final static String RECOMMEND_HOTEL = "hotel";   // 民宿

src/main/java/com/yunzhi/shigongli/common/excelConverter/LocalDateTimeConverter.java

@@ -0,0 +1,53 @@
+package com.yunzhi.shigongli.common.excelConverter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import com.yunzhi.shigongli.common.DateUtils;
+
+import java.time.LocalDateTime;
+
+public class LocalDateTimeConverter implements Converter<LocalDateTime> {
+    @Override
+    public Class supportJavaTypeKey() {
+        return LocalDateTime.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    /**
+     * 读 Excel
+     * @param cellData
+     * @param contentProperty
+     * @param globalConfiguration
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public LocalDateTime convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        // 暂时没这个业务
+        return null;
+    }
+
+    /**
+     * 写 Excel
+     * @param value
+     * @param contentProperty
+     * @param globalConfiguration
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public CellData convertToExcelData(LocalDateTime value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        if (null == value) return null;
+
+        String val = DateUtils.toString(value, "yyyy-MM-dd HH:mm:ss");
+
+        return new CellData(val);
+    }
+}

src/main/java/com/yunzhi/shigongli/common/excelConverter/LocalDayConverter.java

@@ -0,0 +1,53 @@
+package com.yunzhi.shigongli.common.excelConverter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import com.yunzhi.shigongli.common.DateUtils;
+
+import java.time.LocalDateTime;
+
+public class LocalDayConverter implements Converter<LocalDateTime> {
+    @Override
+    public Class supportJavaTypeKey() {
+        return LocalDateTime.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    /**
+     * 读 Excel
+     * @param cellData
+     * @param contentProperty
+     * @param globalConfiguration
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public LocalDateTime convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        // 暂时没这个业务
+        return null;
+    }
+
+    /**
+     * 写 Excel
+     * @param value
+     * @param contentProperty
+     * @param globalConfiguration
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public CellData convertToExcelData(LocalDateTime value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        if (null == value) return null;
+
+        String val = DateUtils.toString(value, "yyyy-MM-dd");
+
+        return new CellData(val);
+    }
+}

src/main/java/com/yunzhi/shigongli/common/excelConverter/PersonRoleConverter.java

@@ -0,0 +1,66 @@
+package com.yunzhi.shigongli.common.excelConverter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import com.yunzhi.shigongli.common.Constants;
+
+public class PersonRoleConverter implements Converter<String> {
+    @Override
+    public Class supportJavaTypeKey() {
+        return String.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    /**
+     * 读 Excel
+     * @param cellData
+     * @param contentProperty
+     * @param globalConfiguration
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public String convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        // 暂时没这个业务
+        return null;
+    }
+
+    /**
+     * 写 Excel
+     * @param value
+     * @param contentProperty
+     * @param globalConfiguration
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public CellData convertToExcelData(String value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        if (null == value) return null;
+
+        String val;
+
+        switch (value) {
+            case Constants.PERSON_NORMAL:
+                val = "游客";
+                break;
+            case Constants.PERSON_HOTEL:
+                val = "民宿老板";
+                break;
+            case Constants.PERSON_SHOP:
+                val = "商铺老板";
+                break;
+            default:
+                val = "未知";
+                break;
+        }
+
+        return new CellData(val);
+    }
+}

src/main/java/com/yunzhi/shigongli/common/excelConverter/RecommendTypeConverter.java

@@ -0,0 +1,63 @@
+package com.yunzhi.shigongli.common.excelConverter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import com.yunzhi.shigongli.common.Constants;
+
+public class RecommendTypeConverter implements Converter<String> {
+    @Override
+    public Class supportJavaTypeKey() {
+        return String.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    /**
+     * 读 Excel
+     * @param cellData
+     * @param contentProperty
+     * @param globalConfiguration
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public String convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        // 暂时没这个业务
+        return null;
+    }
+
+    /**
+     * 写 Excel
+     * @param value
+     * @param contentProperty
+     * @param globalConfiguration
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public CellData convertToExcelData(String value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        if (null == value) return null;
+
+        String val;
+
+        switch (value) {
+            case Constants.RECOMMEND_HOTEL:
+                val = "民宿分享";
+                break;
+            case Constants.RECOMMEND_SHOP:
+                val = "店铺分享";
+                break;
+            default:
+                val = "自主注册";
+                break;
+        }
+
+        return new CellData(val);
+    }
+}

src/main/java/com/yunzhi/shigongli/common/excelConverter/ShopStatusConverter.java

@@ -0,0 +1,64 @@
+package com.yunzhi.shigongli.common.excelConverter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import com.yunzhi.shigongli.common.Constants;
+
+public class ShopStatusConverter implements Converter<Integer> {
+    @Override
+    public Class supportJavaTypeKey() {
+        return Integer.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    /**
+     * 读 Excel
+     * @param cellData
+     * @param contentProperty
+     * @param globalConfiguration
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public Integer convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        // 暂时没这业务
+        return cellData.getNumberValue().intValue();
+    }
+
+    /**
+     * 写 excel
+     * @param value
+     * @param contentProperty
+     * @param globalConfiguration
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public CellData convertToExcelData(Integer value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        String result = null;
+        if (null == value) return null;
+
+        final int on = 1;
+        final int off = 0;
+
+        switch (value) {
+            case on:
+                result = "营业";
+                break;
+            case off:
+                result = "关闭";
+                break;
+            default:
+                break;
+        }
+
+        return new CellData(result);
+    }
+}

src/main/java/com/yunzhi/shigongli/controller/TaFeedbackController.java

@@ -3,10 +3,7 @@ package com.yunzhi.shigongli.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yunzhi.shigongli.common.BaseController;
-import com.yunzhi.shigongli.common.DateUtils;
-import com.yunzhi.shigongli.common.ResponseBean;
-import com.yunzhi.shigongli.common.StringUtils;
+import com.yunzhi.shigongli.common.*;
 import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.service.ITaPersonService;
 import io.swagger.annotations.Api;
@@ -24,6 +21,7 @@ import com.yunzhi.shigongli.service.ITaFeedbackService;
 import com.yunzhi.shigongli.entity.TaFeedback;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDateTime;
 
 /**
@@ -56,7 +54,7 @@ public class TaFeedbackController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/taFeedback",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = TaFeedback.class)
     public ResponseBean taFeedbackList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                        @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                        @ApiParam(value = "开始时间", example = "2021-09-01") @RequestParam(value ="start", required = false) String start,
@@ -81,6 +79,37 @@ public class TaFeedbackController extends BaseController {
         return ResponseBean.success(result);
     }
 
+
+
+    /**
+     * 导出联系我们列表
+     * @return
+     */
+    @RequestMapping(value="/admin/taFeedback/export",method= RequestMethod.GET)
+    @ApiOperation(value="导出联系我们列表", notes = "导出联系我们列表", httpMethod = "GET", response = TaFeedback.class)
+    public void expFeedbackList(@ApiParam(value = "开始时间", example = "2021-09-01") @RequestParam(value ="start", required = false) String start,
+                                @ApiParam(value = "结束时间", example = "2021-09-30") @RequestParam(value ="end", required = false) String end,
+                                HttpServletResponse response) throws Exception{
+
+        QueryWrapper<TaFeedback> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByDesc("create_date");
+
+        LocalDateTime startDate = null;
+        LocalDateTime endDate = null;
+
+        if (!StringUtils.isEmpty(start)) {
+            startDate = DateUtils.from(start + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+        }
+
+        if (!StringUtils.isEmpty(end)) {
+            endDate = DateUtils.from(end + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
+        }
+
+        IPage<TaFeedback> result = iTaFeedbackService.getProfilePage(null, startDate, endDate);
+
+        ExcelUtils.flush(response, TaFeedback.class, result.getRecords(), "联系我们");
+    }
+
     /**
      * 保存对象
      * @param taFeedback 实体对象

src/main/java/com/yunzhi/shigongli/controller/TaHotWordController.java

@@ -3,10 +3,7 @@ package com.yunzhi.shigongli.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yunzhi.shigongli.common.BaseController;
-import com.yunzhi.shigongli.common.Constants;
-import com.yunzhi.shigongli.common.ResponseBean;
-import com.yunzhi.shigongli.common.StringUtils;
+import com.yunzhi.shigongli.common.*;
 import com.yunzhi.shigongli.entity.TaHotWord;
 import com.yunzhi.shigongli.service.ITaHotWordService;
 import io.swagger.annotations.Api;
@@ -17,6 +14,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -61,6 +59,25 @@ public class TaHotWordController extends BaseController {
         return ResponseBean.success(result);
     }
 
+
+    /**
+     * 导出热词
+     * @return
+     */
+    @RequestMapping(value="/admin/hot-word/export",method= RequestMethod.GET)
+    @ApiOperation(value="导出热词", notes = "导出热词", httpMethod = "GET", response = TaHotWord.class)
+    public void expHotWordList(HttpServletResponse response) throws Exception{
+
+        QueryWrapper<TaHotWord> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", Constants.STATUS_DELETED);
+        queryWrapper.orderByAsc("search_num");
+        queryWrapper.orderByAsc("weight");
+
+        List<TaHotWord> result = iTaHotWordService.list(queryWrapper);
+
+        ExcelUtils.flush(response, TaHotWord.class, result, "热门搜索");
+    }
+
     @GetMapping("/wx/hot-word")
     @ApiOperation(value="小程序端热词列表", notes = "小程序端热词列表", httpMethod = "GET", response = TaHotWord.class)
     public ResponseBean getWxList() throws Exception{

src/main/java/com/yunzhi/shigongli/controller/TaHotelController.java

@@ -68,11 +68,26 @@ public class TaHotelController extends BaseController {
                                     @ApiParam("名称") @RequestParam(value = "hotelName",required = false) String hotelName) throws Exception{
 
 
-        IPage<TaHotel> pg = new Page<>(pageNum, pageSize);
+        IPage<HotelListVO> pg = new Page<>(pageNum, pageSize);
         IPage<HotelListVO> result = iTaHotelService.getVOListBy(pg, hotelName);
         return ResponseBean.success(result);
     }
 
+    /**
+     * 导出民宿列表
+     * @return
+     */
+    @RequestMapping(value="/{plat}/taHotel/export",method= RequestMethod.GET)
+    @ApiOperation(value="导出民宿列表", notes = "导出民宿列表", httpMethod = "GET", response = HotelListVO.class)
+    public void exportHotelList(@ApiParam("名称") @RequestParam(value = "hotelName",required = false) String hotelName,
+                                HttpServletResponse response) throws Exception{
+
+        IPage<HotelListVO> result = iTaHotelService.getVOListBy(null, hotelName);
+
+        ExcelUtils.flush(response, HotelListVO.class, result.getRecords(), "民宿列表");
+    }
+
+
     /**
      * 保存对象
      * @param taHotel 实体对象
@@ -82,6 +97,10 @@ public class TaHotelController extends BaseController {
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taHotelAdd(@ApiParam("保存内容") @RequestBody TaHotel taHotel) throws Exception{
 
+        if (null == taHotel.getStatus()) {
+            taHotel.setStatus(Constants.STATUS_READY);
+        }
+
         if (iTaHotelService.createNew(taHotel)){
             return ResponseBean.success(taHotel);
         }else {

src/main/java/com/yunzhi/shigongli/controller/TaNotificationController.java

@@ -3,10 +3,7 @@ package com.yunzhi.shigongli.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yunzhi.shigongli.common.BaseController;
-import com.yunzhi.shigongli.common.Constants;
-import com.yunzhi.shigongli.common.ResponseBean;
-import com.yunzhi.shigongli.common.StringUtils;
+import com.yunzhi.shigongli.common.*;
 import com.yunzhi.shigongli.entity.TaNotification;
 import com.yunzhi.shigongli.service.ITaNotificationService;
 import io.swagger.annotations.Api;
@@ -17,6 +14,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
 /**
  * <p>
     * 通知公告 前端控制器
@@ -44,8 +44,8 @@ public class TaNotificationController extends BaseController {
      * @return
      */
     @RequestMapping(value="/{plat}/notification",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taPvList(@ApiParam(value = "客户端", allowableValues = "wx,admin") @PathVariable String plat,
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = TaNotification.class)
+    public ResponseBean taNotificationList(@ApiParam(value = "客户端", allowableValues = "wx,admin") @PathVariable String plat,
                                  @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                  @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                  @ApiParam(value = "发布状态") @RequestParam(value ="status", required = false) Integer status) throws Exception{
@@ -62,6 +62,22 @@ public class TaNotificationController extends BaseController {
         return ResponseBean.success(result);
     }
 
+    /**
+     * Tips导出
+     * @return
+     */
+    @RequestMapping(value="/admin/notification/export",method= RequestMethod.GET)
+    @ApiOperation(value="Tips导出", notes = "Tips导出", httpMethod = "GET", response = TaNotification.class)
+    public void exportNotification(HttpServletResponse response) throws Exception{
+        QueryWrapper<TaNotification> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", Constants.STATUS_DELETED);
+        queryWrapper.orderByDesc("weight");
+        queryWrapper.orderByDesc("create_date");
+
+        List<TaNotification> result = iTaNotificationService.list(queryWrapper) ;
+        ExcelUtils.flush(response, TaNotification.class, result, "Tips列表");
+    }
+
     /**
      * 保存对象
      * @param taNotification 实体对象

src/main/java/com/yunzhi/shigongli/controller/TaPersonController.java

@@ -3,10 +3,7 @@ package com.yunzhi.shigongli.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yunzhi.shigongli.common.BaseController;
-import com.yunzhi.shigongli.common.Constants;
-import com.yunzhi.shigongli.common.ResponseBean;
-import com.yunzhi.shigongli.common.StringUtils;
+import com.yunzhi.shigongli.common.*;
 import com.yunzhi.shigongli.entity.TaHotelWorker;
 import com.yunzhi.shigongli.entity.TaPersonRole;
 import com.yunzhi.shigongli.entity.TaShopWorker;
@@ -25,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import com.yunzhi.shigongli.entity.TaPerson;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -82,6 +80,26 @@ public class TaPersonController extends BaseController {
         return ResponseBean.success(result);
     }
 
+    /**
+     * 用户列表导出
+     * @return
+     */
+    @RequestMapping(value="/admin/taPerson/export",method= RequestMethod.GET)
+    @ApiOperation(value="用户列表导出", notes = "用户列表导出", httpMethod = "GET", response = ResponseBean.class)
+    public void exportPersonList(@ApiParam("昵称") @RequestParam(value ="nickName", required = false) String nickName,
+                                         @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone,
+                                         @ApiParam("用户类型") @RequestParam(value ="personRole", required = false) String personRole,
+                                         HttpServletResponse response) throws Exception{
+
+        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(nickName), "nick_name", "%"+nickName+"%");
+        queryWrapper.like(!StringUtils.isEmpty(phone), "phone", "%"+phone+"%");
+        queryWrapper.eq(!StringUtils.isEmpty(personRole), "person_role", personRole);
+        queryWrapper.orderByDesc("create_date");
+
+        List<TaPerson> result = iTaPersonService.list(queryWrapper);
+        ExcelUtils.flush(response, TaPerson.class, result, "用户列表");
+    }
 
     /**
      * 绑定人员身份

src/main/java/com/yunzhi/shigongli/controller/TaRoomController.java

@@ -3,10 +3,7 @@ package com.yunzhi.shigongli.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yunzhi.shigongli.common.BaseController;
-import com.yunzhi.shigongli.common.Constants;
-import com.yunzhi.shigongli.common.ResponseBean;
-import com.yunzhi.shigongli.common.StringUtils;
+import com.yunzhi.shigongli.common.*;
 import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.entity.TaShopWorker;
 import com.yunzhi.shigongli.vo.RoomListVO;
@@ -25,6 +22,8 @@ import com.yunzhi.shigongli.service.ITaRoomService;
 import com.yunzhi.shigongli.entity.TaRoom;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * <p>
     * 房源 前端控制器
@@ -52,7 +51,7 @@ public class TaRoomController extends BaseController {
      * @return
      */
     @RequestMapping(value="/{plat}/taRoom",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = RoomListVO.class)
     public ResponseBean taRoomList(@ApiParam(value = "客户端", allowableValues = "wx,admin") @PathVariable String plat,
                                    @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                    @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
@@ -63,11 +62,28 @@ public class TaRoomController extends BaseController {
             return ResponseBean.error("未找到有效的民宿ID", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
-        IPage<TaRoom> pg = new Page<>(pageNum, pageSize);
+        IPage<RoomListVO> pg = new Page<>(pageNum, pageSize);
         IPage<RoomListVO> result = iTaRoomService.getPageListBy(pg, plat, hotelId, roomName);
         return ResponseBean.success(result);
     }
 
+
+
+    /**
+     * 导出房源列表
+     * @return
+     */
+    @RequestMapping(value="/admin/taRoom/export",method= RequestMethod.GET)
+    @ApiOperation(value="导出房源列表", notes = "导出房源列表", httpMethod = "GET", response = RoomListVO.class)
+    public void expRoomList(@ApiParam("民宿ID") @RequestParam(value ="hotelId", required = false) String hotelId,
+                            @ApiParam("民宿ID") @RequestParam(value ="roomName", required = false) String roomName,
+                            HttpServletResponse response) throws Exception{
+
+        IPage<RoomListVO> result = iTaRoomService.getPageListBy(null, "admin", hotelId, roomName);
+
+        ExcelUtils.flush(response, RoomListVO.class, result.getRecords(), "房源列表");
+    }
+
     /**
      * 保存对象
      * @param taRoom 实体对象

src/main/java/com/yunzhi/shigongli/controller/TaShopController.java

@@ -68,6 +68,9 @@ public class TaShopController extends BaseController {
     @Autowired
     public ITaMiniappQrcodeService iTaMiniappQrcodeService;
 
+    @Autowired
+    public ITaShopPackageService iTaShopPackageService;
+
     @Value("${sysBiz.miniapp.shopPage}")
     public String shopPage;
 
@@ -78,7 +81,7 @@ public class TaShopController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/taShop",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ShopListVO.class)
     public ResponseBean taShopList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                    @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                    @ApiParam("店铺名称") @RequestParam(value = "shopName", required = false) String shopName,
@@ -89,6 +92,20 @@ public class TaShopController extends BaseController {
             return ResponseBean.success(result);
     }
 
+    /**
+     * 导出商铺列表
+     * @return
+     */
+    @RequestMapping(value="/admin/taShop/export",method= RequestMethod.GET)
+    @ApiOperation(value="导出商铺列表", notes = "导出商铺列表", httpMethod = "GET", response = ShopListVO.class)
+    public void exportShopList(@ApiParam("店铺名称") @RequestParam(value = "shopName", required = false) String shopName,
+                                       @ApiParam("手机号") @RequestParam(value = "phone", required = false) String phone,
+                                       HttpServletResponse response) throws Exception{
+
+        IPage<ShopListVO> result = iTaShopService.getPageListBy(null, shopName, phone);
+        ExcelUtils.flush(response, ShopListVO.class, result.getRecords(), "商铺列表");
+    }
+
     /**
      * 保存对象
      * @param taShop 实体对象
@@ -98,6 +115,10 @@ public class TaShopController extends BaseController {
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taShopAdd(@ApiParam("保存内容") @RequestBody TaShop taShop) throws Exception {
 
+        if (null == taShop.getStatus()) {
+            taShop.setStatus(Constants.STATUS_READY);
+        }
+
         try {
             iTaShopService.createNew(taShop);
             shopImagesService.updateImages(Constants.TARGET_SHOP, taShop.getShopId(), taShop.getImageList());
@@ -118,6 +139,7 @@ public class TaShopController extends BaseController {
     public ResponseBean taShopDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         if(iTaShopService.removeLogicById(id)){
             taResourceService.removeBy(Constants.TARGET_SHOP, id);
+            iTaShopPackageService.removeByShop(id);
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -397,4 +419,37 @@ public class TaShopController extends BaseController {
 
         return ResponseBean.success(result);
     }
+
+
+
+    /**
+     * 商铺推广列表
+     * @param shopName
+     * @param description
+     * @param start
+     * @param end
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/admin/taShop/commission/export",method= RequestMethod.GET)
+    @ApiOperation(value="商铺推广列表", notes = "商铺推广列表", httpMethod = "GET", response = ResponseBean.class)
+    public void exportShopCommissionList(@ApiParam("店铺名称") @RequestParam(value = "shopName", required = false) String shopName,
+                                         @ApiParam("套餐名称") @RequestParam(value = "description", required = false) String description,
+                                         @ApiParam(value = "开始时间", example = "2021-09-01") @RequestParam(value = "start", required = false) String start,
+                                         @ApiParam(value = "结束时间", example = "2021-09-30") @RequestParam(value = "end", required = false) String end,
+                                         HttpServletResponse response) throws Exception {
+
+        LocalDateTime startDate = null;
+        LocalDateTime endDate = null;
+        if (!StringUtils.isEmpty(start)) {
+            startDate = DateUtils.from(start + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+        }
+        if (!StringUtils.isEmpty(end)) {
+            endDate = DateUtils.from(end + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
+        }
+
+        IPage<ShopCommissionVO> result = iTaShopService.getCommissionList(null, shopName, description, startDate, endDate);
+
+        ExcelUtils.flush(response, ShopCommissionVO.class, result.getRecords(), "商铺推广收入");
+    }
 }

src/main/java/com/yunzhi/shigongli/controller/TaShopPackageController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.shigongli.common.BaseController;
 import com.yunzhi.shigongli.common.Constants;
+import com.yunzhi.shigongli.common.ExcelUtils;
 import com.yunzhi.shigongli.common.ResponseBean;
 import com.yunzhi.shigongli.entity.TaExtendContent;
 import com.yunzhi.shigongli.entity.TaShopPackageSetting;
@@ -26,6 +27,7 @@ import com.yunzhi.shigongli.service.ITaShopPackageService;
 import com.yunzhi.shigongli.entity.TaShopPackage;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -55,7 +57,7 @@ public class TaShopPackageController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/taShopPackage",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ShopPackageVO.class)
     public ResponseBean taShopPackageList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                           @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                           @ApiParam("商铺") @RequestParam(value ="shopId", required = false) String shopId,
@@ -66,6 +68,21 @@ public class TaShopPackageController extends BaseController {
         return ResponseBean.success(result);
     }
 
+    /**
+     * 导出商铺套餐列表
+     * @return
+     */
+    @RequestMapping(value="/admin/taShopPackage/export",method= RequestMethod.GET)
+    @ApiOperation(value="导出商铺套餐列表", notes = "导出商铺套餐列表", httpMethod = "GET", response = ShopPackageVO.class)
+    public void exportShopPackageList(@ApiParam("商铺") @RequestParam(value ="shopId", required = false) String shopId,
+                                              @ApiParam("套餐名称") @RequestParam(value = "description", required = false) String description,
+                                              HttpServletResponse response) throws Exception{
+
+        IPage<ShopPackageVO> result = iTaShopPackageService.getProfilePage(null, shopId, description);
+
+        ExcelUtils.flush(response, ShopPackageVO.class, result.getRecords(), "商铺套餐列表");
+    }
+
     /**
      * 保存对象
      * @param shopPackageVO 实体对象

src/main/java/com/yunzhi/shigongli/controller/TaTouristController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.shigongli.common.BaseController;
 import com.yunzhi.shigongli.common.Constants;
+import com.yunzhi.shigongli.common.ExcelUtils;
 import com.yunzhi.shigongli.common.ResponseBean;
 import com.yunzhi.shigongli.entity.TaLike;
 import com.yunzhi.shigongli.entity.TaResource;
@@ -26,6 +27,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import com.yunzhi.shigongli.entity.TaTourist;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * <p>
     * 旅游景点 前端控制器
@@ -83,6 +86,24 @@ public class TaTouristController extends BaseController {
         return ResponseBean.success(result);
     }
 
+    /**
+     * 导出景点列表
+     * @return
+     */
+    @RequestMapping(value="/admin/taTourist/export",method= RequestMethod.GET)
+    @ApiOperation(value="导出景点列表", notes = "导出景点列表", httpMethod = "GET", response = ResponseBean.class)
+    public void exportTouristList(@ApiParam("景点名称") @RequestParam(value ="touristName", required = false) String touristName,
+                                          @ApiParam("区位") @RequestParam(value ="areaId", required = false) String areaId,
+                                          HttpServletResponse response) throws Exception{
+
+        QueryWrapper<TaTourist> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByDesc("weight");
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TaTourist> result = iTaTouristService.getPagedBy(null, touristName, areaId);
+        ExcelUtils.flush(response, TaTourist.class, result.getRecords(), "景点列表");
+    }
+
     /**
      * 保存对象
      * @param taTourist 实体对象

src/main/java/com/yunzhi/shigongli/entity/TaFeedback.java

@@ -1,10 +1,15 @@
 package com.yunzhi.shigongli.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.yunzhi.shigongli.common.excelConverter.LocalDateTimeConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -25,36 +30,49 @@ import lombok.experimental.Accessors;
 @ApiModel(value="TaFeedback对象", description="意见反馈")
 public class TaFeedback implements Serializable {
 
+    @ExcelIgnore
     private static final long serialVersionUID = 1L;
 
+    @ExcelProperty(value = "序号", index = 0)
     @ApiModelProperty(value = "反馈ID")
     @TableId(value = "feedback_id", type = IdType.AUTO)
     private Integer feedbackId;
 
+    @ExcelProperty(value = "反馈内容", index = 3)
+    @ColumnWidth(40)
     @ApiModelProperty(value = "反馈内容")
     private String content;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "反馈人")
     private String personId;
 
+    @ExcelProperty(value = "反馈人", index = 1)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "反馈人昵称")
     @TableField(exist = false)
     private String nickName;
 
+    @ExcelProperty(value = "反馈时间", converter = LocalDateTimeConverter.class, index = 4)
+    @ColumnWidth(30)
     @ApiModelProperty(value = "时间")
     private LocalDateTime createDate;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "是否已读")
     private Boolean isReaded;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "读取时间")
     private LocalDateTime readDate;
 
+    @ExcelProperty(value = "手机号", index = 2)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "手机号码")
     @TableField(exist = false)
     private String phone;
 
-
+    @ExcelIgnore
     @ApiModelProperty(value = "反馈人详情")
     @TableField(exist = false)
     private TaPerson taPerson;

src/main/java/com/yunzhi/shigongli/entity/TaHotWord.java

@@ -1,7 +1,11 @@
 package com.yunzhi.shigongli.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.yunzhi.shigongli.common.excelConverter.LocalDateTimeConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -25,24 +29,33 @@ import java.time.LocalDateTime;
 @ApiModel(value="TaHotWord对象", description="热词")
 public class TaHotWord implements Serializable {
 
+    @ExcelIgnore
     private static final long serialVersionUID = 1L;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "热词ID")
     @TableId(value = "word_id", type = IdType.UUID)
     private String wordId;
 
+    @ExcelProperty(value = "热词", index = 0)
     @ApiModelProperty(value = "热词")
     private String word;
 
+    @ExcelProperty(value = "搜索次数", index = 1)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "搜索次数")
     private Integer searchNum;
 
+    @ExcelProperty(value = "权重", index = 2)
     @ApiModelProperty(value = "权重")
     private Integer weight;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "状态")
     private Integer status;
 
+    @ExcelProperty(value = "操作时间", converter = LocalDateTimeConverter.class, index = 3)
+    @ColumnWidth(30)
     @ApiModelProperty(value = "访问时间")
     private LocalDateTime createDate;
 

src/main/java/com/yunzhi/shigongli/entity/TaNotification.java

@@ -1,8 +1,12 @@
 package com.yunzhi.shigongli.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.yunzhi.shigongli.common.excelConverter.LocalDateTimeConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -25,29 +29,38 @@ import java.time.LocalDateTime;
 @Accessors(chain = true)
 @ApiModel(value="TaNotification对象", description="通知公告")
 public class TaNotification implements Serializable {
-
+    @ExcelIgnore
     private static final long serialVersionUID = 1L;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "搜索ID")
     @TableId(value = "notice_id", type = IdType.UUID)
     private String noticeId;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "发布人")
     private String createPerson;
 
+    @ExcelProperty(value = "创建时间", converter = LocalDateTimeConverter.class, index = 1)
+    @ColumnWidth(30)
     @ApiModelProperty(value = "发布时间")
     private LocalDateTime createDate;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "通知类型")
     private String noticeType;
 
+    @ExcelProperty(value = "Tips", index = 0)
+    @ColumnWidth(100)
     @ApiModelProperty(value = "通知内容")
     private String content;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "状态")
     @TableField("`status`")
     private Integer status;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "权重")
     private Integer weight;
 }

src/main/java/com/yunzhi/shigongli/entity/TaPerson.java

@@ -1,9 +1,16 @@
 package com.yunzhi.shigongli.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.yunzhi.shigongli.common.excelConverter.LocalDateTimeConverter;
+import com.yunzhi.shigongli.common.excelConverter.PersonRoleConverter;
+import com.yunzhi.shigongli.common.excelConverter.RecommendTypeConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -24,42 +31,60 @@ import lombok.experimental.Accessors;
 @ApiModel(value="TaPerson对象", description="小程序人员表")
 public class TaPerson implements Serializable {
 
+    @ExcelIgnore
     private static final long serialVersionUID = 1L;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "人员ID")
     @TableId(value = "person_id", type = IdType.UUID)
     private String personId;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "openid")
     private String openid;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "unionid")
     private String unionid;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "性别")
     private Integer sex;
 
+    @ExcelProperty(value = "用户昵称", index = 0)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "昵称")
     private String nickName;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "头像")
     private String avatar;
 
+    @ExcelProperty(value = "手机号码", index = 1)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "手机")
     private String phone;
 
+    @ExcelProperty(value = "用户类型", converter = PersonRoleConverter.class, index = 2)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "当前角色")
     private String personRole;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "状态")
     private Integer status;
 
+    @ExcelProperty(value = "注册时间", converter = LocalDateTimeConverter.class, index = 4)
+    @ColumnWidth(30)
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
+    @ExcelProperty(value = "用户来源", converter = RecommendTypeConverter.class, index = 3)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "来源类型")
     private String fromType;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "推广ID")
     private String recommender;
 

src/main/java/com/yunzhi/shigongli/entity/TaTourist.java

@@ -1,5 +1,8 @@
 package com.yunzhi.shigongli.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
 
@@ -28,87 +31,119 @@ import lombok.experimental.Accessors;
 @ApiModel(value="TaTourist对象", description="旅游景点")
 public class TaTourist implements Serializable {
 
+    @ExcelIgnore
     private static final long serialVersionUID = 1L;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "景区ID")
     @TableId(value = "tourist_id", type = IdType.UUID)
     private String touristId;
 
+    @ExcelProperty(value = "景点名称", index = 0)
+    @ColumnWidth(30)
     @ApiModelProperty(value = "景区名称")
     private String touristName;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "宣传文案")
     private String title;
 
-    @ApiModelProperty(value = "简介")
+    @ExcelProperty(value = "景点简介", index = 1)
+    @ColumnWidth(30)
+    @ApiModelProperty(value = "景点简介")
     private String description;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "主图")
     private String poster;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "人均消费")
     private Integer averagePrice;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "logo")
     private String logo;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "所属区")
     private String cityId;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "定位")
     private String locaton;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "地址")
     private String address;
 
+    @ExcelProperty(value = "权重", index = 4)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "权重")
     private Integer weight;
 
+
+    @ExcelProperty(value = "推荐等级", index = 5)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "推荐等级")
     private String strategyLevel;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "状态")
     private Integer status;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "收藏数")
     @TableField(exist = false)
     private Integer saveNum;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "点赞数")
     @TableField(exist = false)
     private Integer likeNum;
 
+    @ExcelProperty(value = "浏览次数", index = 3)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "浏览量")
     @TableField(exist = false)
     private Integer pvNum;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "用户数")
     @TableField(exist = false)
     private Integer uvNum;
 
+    @ExcelProperty(value = "区位", index = 2)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "所属区位名称")
     @TableField(exist = false)
     private String areaName;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "图片列表")
     @TableField(exist = false)
     private List<TaImage> imageList;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "分类标签")
     @TableField(exist = false)
     private List<TaTargetType> typeList;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "是否收藏")
     @TableField(exist = false)
     private Integer isSaved;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "是否点赞")
     @TableField(exist = false)
     private Integer isLike;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "距离")
     @TableField(exist = false)
     private Integer distance;

src/main/java/com/yunzhi/shigongli/mapper/TaFeedbackMapper.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -22,4 +23,6 @@ public interface TaFeedbackMapper extends BaseMapper<TaFeedback> {
     TaFeedback getProfileById(Integer id);
 
     IPage<TaFeedback> getProfilePage(IPage<TaFeedback> pg, @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate);
+
+    List<TaFeedback> getProfileList(@Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate);
 }

src/main/java/com/yunzhi/shigongli/mapper/TaHotelMapper.java

@@ -22,7 +22,9 @@ import java.util.List;
 @Mapper
 public interface TaHotelMapper extends BaseMapper<TaHotel> {
 
-    IPage<HotelListVO> getVOListBy(IPage<TaHotel> pg, @Param("hotelName") String hotelName);
+    IPage<HotelListVO> getVOPageBy(IPage<HotelListVO> pg, @Param("hotelName") String hotelName);
+
+    List<HotelListVO> getVOListBy(@Param("hotelName") String hotelName);
 
     List<TaHotel> getListByPerson(@Param("personId") String personId);
 

src/main/java/com/yunzhi/shigongli/mapper/TaRoomMapper.java

@@ -22,7 +22,9 @@ import java.util.List;
 @Mapper
 public interface TaRoomMapper extends BaseMapper<TaRoom> {
 
-    IPage<RoomListVO> getPageListBy(IPage<TaRoom> pg, @Param("plat") String plat, @Param("hotelId") String hotelId, @Param("roomName") String roomName);
+    IPage<RoomListVO> getPageListBy(IPage<RoomListVO> pg, @Param("plat") String plat, @Param("hotelId") String hotelId, @Param("roomName") String roomName);
 
     List<TaHotelWorker> getRoomOwners(@Param("roomId") String roomId, @Param("personId") String personId);
+
+    List<RoomListVO> getPureListBy(@Param("plat") String plat, @Param("hotelId") String hotelId, @Param("roomName") String roomName);
 }

src/main/java/com/yunzhi/shigongli/mapper/TaShopAccountLogMapper.java

@@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -26,10 +27,16 @@ public interface TaShopAccountLogMapper extends BaseMapper<TaShopAccountLog> {
                             @Param("start") LocalDateTime start,
                             @Param("end") LocalDateTime end);
 
-    IPage<ShopCommissionVO> getShopAccountList(IPage<ShopCommissionVO> pg,
+    IPage<ShopCommissionVO> getShopAccountPage(IPage<ShopCommissionVO> pg,
                                           @Param("amountType") String amountType,
                                           @Param("shopName") String shopName,
                                           @Param("description") String description,
                                           @Param("startDate") LocalDateTime startDate,
                                           @Param("endDate") LocalDateTime endDate);
+
+    List<ShopCommissionVO> getShopAccountList(@Param("amountType") String amountType,
+                                              @Param("shopName") String shopName,
+                                              @Param("description") String description,
+                                              @Param("startDate") LocalDateTime startDate,
+                                              @Param("endDate") LocalDateTime endDate);
 }

src/main/java/com/yunzhi/shigongli/mapper/TaShopMapper.java

@@ -35,4 +35,6 @@ public interface TaShopMapper extends BaseMapper<TaShop> {
                         @Param("id") String id,
                         @Param("personId") String personId,
                         @Param("location") String location);
+
+    List<ShopListVO> getListBy(@Param("shopName") String shopName, @Param("phone") String phone);
 }

src/main/java/com/yunzhi/shigongli/mapper/TaShopPackageMapper.java

@@ -34,4 +34,9 @@ public interface TaShopPackageMapper extends BaseMapper<TaShopPackage> {
                                                   @Param("location") String location,
                                                   @Param("personId") String personId,
                                                   @Param("limit") Integer limit);
+
+    int removeByShop(@Param("shopId") String shopId);
+
+    List<ShopPackageVO> getProfileList(@Param("shopId") String shopId,
+                                       @Param("description") String description);
 }

src/main/java/com/yunzhi/shigongli/mapper/TaTouristMapper.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 旅游景点 Mapper 接口
@@ -20,4 +22,6 @@ public interface TaTouristMapper extends BaseMapper<TaTourist> {
     IPage<TaTourist> getPagedBy(IPage<TaTourist> pg, @Param("targetTourist") String targetTourist, @Param("touristName") String touristName, @Param("cityId") String cityId);
 
     TaTourist getProfileBy(@Param("targetTourist") String targetTourist, @Param("id") String id, @Param("personId") String personId, @Param("location") String location);
+
+    List<TaTourist> getListBy(@Param("targetTourist") String targetTourist, @Param("touristName") String touristName, @Param("cityId") String cityId);
 }

src/main/java/com/yunzhi/shigongli/service/ITaHotelService.java

@@ -23,7 +23,7 @@ public interface ITaHotelService extends IBaseService<TaHotel> {
 
     boolean createNew(TaHotel taHotel) throws Exception;
 
-    IPage<HotelListVO> getVOListBy(IPage<TaHotel> pg, String hotelName);
+    IPage<HotelListVO> getVOListBy(IPage<HotelListVO> pg, String hotelName);
 
     List<TaHotel> getListByPerson(TaPerson taPerson);
 

src/main/java/com/yunzhi/shigongli/service/ITaRoomService.java

@@ -15,7 +15,7 @@ import com.yunzhi.shigongli.vo.RoomListVO;
  */
 public interface ITaRoomService extends IBaseService<TaRoom> {
 
-    IPage<RoomListVO> getPageListBy(IPage<TaRoom> pg, String plat, String hotelId, String roomName);
+    IPage<RoomListVO> getPageListBy(IPage<RoomListVO> pg, String plat, String hotelId, String roomName);
 
     boolean getIsExistKeeper(String roomId, String personId);
 }

src/main/java/com/yunzhi/shigongli/service/ITaShopPackageService.java

@@ -30,4 +30,6 @@ public interface ITaShopPackageService extends IBaseService<TaShopPackage> {
     IPage<TaShopPackage> getWxPackageList(IPage<TaShopPackage> page, String shopId, TaPerson currentPerson);
 
     List<ShopPackageRecommend> getWxRecommendList(String location, TaPerson taPerson) throws Exception ;
+
+    boolean removeByShop(String id);
 }

src/main/java/com/yunzhi/shigongli/service/impl/TaFeedbackServiceImpl.java

@@ -1,6 +1,7 @@
 package com.yunzhi.shigongli.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.shigongli.entity.TaFeedback;
 import com.yunzhi.shigongli.mapper.TaFeedbackMapper;
 import com.yunzhi.shigongli.service.ITaFeedbackService;
@@ -8,6 +9,7 @@ import com.yunzhi.shigongli.service.ITaFeedbackService;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -27,6 +29,13 @@ public class TaFeedbackServiceImpl extends BaseServiceImpl<TaFeedbackMapper, TaF
 
     @Override
     public IPage<TaFeedback> getProfilePage(IPage<TaFeedback> pg, LocalDateTime startDate, LocalDateTime endDate) {
-        return baseMapper.getProfilePage(pg, startDate, endDate);
+        if (null != pg) {
+            return baseMapper.getProfilePage(pg, startDate, endDate);
+        } else {
+            IPage<TaFeedback> result = new Page<>();
+            List<TaFeedback> list = baseMapper.getProfileList(startDate, endDate);
+            result.setRecords(list);
+            return result;
+        }
     }
 }

src/main/java/com/yunzhi/shigongli/service/impl/TaHotelServiceImpl.java

@@ -59,8 +59,16 @@ public class TaHotelServiceImpl extends BaseServiceImpl<TaHotelMapper, TaHotel>
     }
 
     @Override
-    public IPage<HotelListVO> getVOListBy(IPage<TaHotel> pg, String hotelName) {
-        return hotelMapper.getVOListBy(pg, hotelName);
+    public IPage<HotelListVO> getVOListBy(IPage<HotelListVO> pg, String hotelName) {
+        if (null != pg) {
+            return hotelMapper.getVOPageBy(pg, hotelName);
+        } else {
+            List<HotelListVO> list = baseMapper.getVOListBy(hotelName);
+            IPage<HotelListVO> result = new Page<>();
+            result.setRecords(list);
+            return result;
+        }
+
     }
 
     @Override

src/main/java/com/yunzhi/shigongli/service/impl/TaRoomServiceImpl.java

@@ -1,6 +1,7 @@
 package com.yunzhi.shigongli.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.shigongli.entity.TaHotelWorker;
 import com.yunzhi.shigongli.entity.TaRoom;
 import com.yunzhi.shigongli.entity.TaShopWorker;
@@ -28,8 +29,15 @@ public class TaRoomServiceImpl extends BaseServiceImpl<TaRoomMapper, TaRoom> imp
     TaRoomMapper taRoomMapper;
 
     @Override
-    public IPage<RoomListVO> getPageListBy(IPage<TaRoom> pg, String plat, String hotelId, String roomName) {
-        return taRoomMapper.getPageListBy(pg, plat, hotelId, roomName);
+    public IPage<RoomListVO> getPageListBy(IPage<RoomListVO> pg, String plat, String hotelId, String roomName) {
+        if (null != pg) {
+            return taRoomMapper.getPageListBy(pg, plat, hotelId, roomName);
+        } else {
+            IPage<RoomListVO> result = new Page<>();
+            List<RoomListVO> list = baseMapper.getPureListBy(plat, hotelId, roomName);
+            result.setRecords(list);
+            return result;
+        }
     }
 
     @Override

src/main/java/com/yunzhi/shigongli/service/impl/TaShopPackageServiceImpl.java

@@ -2,6 +2,7 @@ package com.yunzhi.shigongli.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.entity.TaShopPackage;
@@ -143,7 +144,15 @@ public class TaShopPackageServiceImpl extends BaseServiceImpl<TaShopPackageMappe
 
     @Override
     public IPage<ShopPackageVO> getProfilePage(IPage<TaShopPackage> pg, String shopId, String description) {
-        return baseMapper.getProfilePage(pg, shopId, description);
+        if (null != pg) {
+            return baseMapper.getProfilePage(pg, shopId, description);
+        } else {
+            IPage<ShopPackageVO> result = new Page<>();
+            List <ShopPackageVO> list = baseMapper.getProfileList(shopId, description);
+            result.setRecords(list);
+            return result;
+        }
+
     }
 
     @Override
@@ -157,4 +166,10 @@ public class TaShopPackageServiceImpl extends BaseServiceImpl<TaShopPackageMappe
         Integer limit = 3;
         return baseMapper.getWxRecommendList(Constants.TARGET_SHOP_PACKAGE, location, taPerson.getPersonId(), limit);
     }
+
+    @Override
+    public boolean removeByShop(String id) {
+        baseMapper.removeByShop(id);
+        return true;
+    }
 }

src/main/java/com/yunzhi/shigongli/service/impl/TaShopServiceImpl.java

@@ -57,7 +57,14 @@ public class TaShopServiceImpl extends BaseServiceImpl<TaShopMapper, TaShop> imp
 
     @Override
     public IPage<ShopListVO> getPageListBy(IPage<ShopListVO> pg, String shopName, String phone) {
-        return taShopMapper.getPageListBy(pg, shopName, phone);
+        if (null != pg) {
+            return taShopMapper.getPageListBy(pg, shopName, phone);
+        } else {
+            IPage<ShopListVO> result = new Page<>();
+            List<ShopListVO> list = baseMapper.getListBy(shopName, phone);
+            result.setRecords(list);
+            return result;
+        }
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -142,7 +149,15 @@ public class TaShopServiceImpl extends BaseServiceImpl<TaShopMapper, TaShop> imp
 
     @Override
     public IPage<ShopCommissionVO> getCommissionList(IPage<ShopCommissionVO> pg, String shopName, String description, LocalDateTime startDate, LocalDateTime endDate) {
-        return shopAccountLogMapper.getShopAccountList(pg, Constants.ACCOUNT_COMMISSION, shopName, description, startDate, endDate);
+        if (null != pg) {
+            return shopAccountLogMapper.getShopAccountPage(pg, Constants.ACCOUNT_COMMISSION, shopName, description, startDate, endDate);
+        } else {
+            IPage<ShopCommissionVO> result = new Page<>();
+            List<ShopCommissionVO> list = shopAccountLogMapper.getShopAccountList(Constants.ACCOUNT_COMMISSION, shopName, description, startDate, endDate);
+            result.setRecords(list);
+            return result;
+        }
+
     }
 
     @Override

src/main/java/com/yunzhi/shigongli/service/impl/TaTouristServiceImpl.java

@@ -1,6 +1,7 @@
 package com.yunzhi.shigongli.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.StringUtils;
 import com.yunzhi.shigongli.entity.*;
@@ -16,6 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 /**
  * <p>
  * 旅游景点 服务实现类
@@ -38,7 +41,14 @@ public class TaTouristServiceImpl extends BaseServiceImpl<TaTouristMapper, TaTou
 
     @Override
     public IPage<TaTourist> getPagedBy(IPage<TaTourist> pg, String touristName, String cityId) {
-        return baseMapper.getPagedBy(pg, Constants.TARGET_TOURIST, touristName, cityId);
+        if (null != pg) {
+            return baseMapper.getPagedBy(pg, Constants.TARGET_TOURIST, touristName, cityId);
+        } else {
+            List<TaTourist> list = baseMapper.getListBy(Constants.TARGET_TOURIST, touristName, cityId);
+            IPage<TaTourist> result = new Page<>();
+            result.setRecords(list);
+            return result;
+        }
     }
 
     @Transactional(rollbackFor = Exception.class)

src/main/java/com/yunzhi/shigongli/vo/HotelListVO.java

@@ -1,6 +1,9 @@
 package com.yunzhi.shigongli.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.yunzhi.shigongli.common.excelConverter.MoneyConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,32 +12,40 @@ import lombok.Data;
 @Data
 public class HotelListVO {
 
+    @ExcelIgnore
     @ApiModelProperty(value = "民宿ID")
     private String hotelId;
 
     @ExcelProperty(value = "民宿名称", index = 0)
+    @ColumnWidth(30)
     @ApiModelProperty(value = "民宿名称")
     private String hotelName;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "logo")
     private String logo;
 
     @ExcelProperty(value = "员工数量", index = 1)
+    @ColumnWidth(20)
     @ApiModelProperty("员工数量")
     private Integer workerNum;
 
     @ExcelProperty(value = "房源数", index = 2)
+    @ColumnWidth(20)
     @ApiModelProperty("房源数")
     private Integer roomNum;
 
-    @ExcelProperty(value = "佣金金额/单价分", index = 3)
+    @ExcelProperty(value = "佣金金额", converter = MoneyConverter.class, index = 3)
+    @ColumnWidth(20)
     @ApiModelProperty("佣金金额")
     private Integer brokerageCharges;
 
-    @ExcelProperty(value = "已结算佣金/单价分", index = 4)
+    @ExcelProperty(value = "已结算佣金", converter = MoneyConverter.class, index = 4)
+    @ColumnWidth(20)
     @ApiModelProperty("已结算佣金")
     private Integer paidCharges;
 
+    @ExcelIgnore
     @ApiModelProperty("状态")
     private Integer status;
 }

src/main/java/com/yunzhi/shigongli/vo/OrderSubListVO.java

@@ -6,6 +6,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.yunzhi.shigongli.common.excelConverter.LocalDateTimeConverter;
 import com.yunzhi.shigongli.common.excelConverter.MoneyConverter;
 import com.yunzhi.shigongli.common.excelConverter.OrderStatusConverter;
 import com.yunzhi.shigongli.entity.TaOrderSub;
@@ -36,41 +37,48 @@ public class OrderSubListVO {
     @ApiModelProperty(value = "套餐ID")
     private String packageId;
 
-    @ExcelProperty(value = "标题", index = 3)
+    @ExcelProperty(value = "标题", index = 2)
     @ColumnWidth(30)
     @ApiModelProperty(value = "子订单描述")
     private String description;
 
-    @ExcelProperty(value = "订单金额", converter = MoneyConverter.class, index = 2)
+    @ExcelProperty(value = "订单金额", converter = MoneyConverter.class, index = 4)
     @ColumnWidth(20)
     @ApiModelProperty(value = "总金额;单位分")
     private Integer charges;
 
+    @ExcelProperty(value = "数量", converter = MoneyConverter.class, index = 3)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "数量")
     private Integer amount;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "单价;单位分")
     private Integer unitPrice;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "抽成;单位分")
     private Integer commissionCharge;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "返现金额;单位分")
     private Integer cashback;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "是否核销")
     private Boolean isVerified;
 
-    @ExcelProperty(value = "状态", converter = OrderStatusConverter.class, index = 7)
+    @ExcelProperty(value = "状态", converter = OrderStatusConverter.class, index = 8)
     @ColumnWidth(20)
     @ApiModelProperty(value = "状态")
     private Integer status;
 
-    @ExcelProperty(value = "下单时间", index = 6)
+    @ExcelProperty(value = "下单时间", converter = LocalDateTimeConverter.class, index = 7)
     @ColumnWidth(30)
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "核销时间")
     private LocalDateTime verifiedDate;
 
@@ -79,18 +87,20 @@ public class OrderSubListVO {
     @ApiModelProperty("所属商家")
     private String shopName;
 
+    @ExcelIgnore
     @ApiModelProperty("图片")
     private String poster;
 
+    @ExcelIgnore
     @ApiModelProperty("用户ID")
     private String personId;
 
-    @ExcelProperty(value = "标题", index = 4)
+    @ExcelProperty(value = "标题", index = 5)
     @ColumnWidth(30)
     @ApiModelProperty("用户昵称")
     private String nickName;
 
-    @ExcelProperty(value = "标题", index = 5)
+    @ExcelProperty(value = "用户手机", index = 6)
     @ColumnWidth(20)
     @ApiModelProperty("用户手机")
     private String phone;

src/main/java/com/yunzhi/shigongli/vo/RoomListVO.java

@@ -1,16 +1,79 @@
 package com.yunzhi.shigongli.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.yunzhi.shigongli.entity.TaRoom;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 
 @ApiModel(description = "修改密码参数")
 @Data
-public class RoomListVO extends TaRoom {
+public class RoomListVO {
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "房源ID")
+    @TableId(value = "room_id", type = IdType.UUID)
+    private String roomId;
+
+    @ExcelProperty(value = "房屋名称", index = 1)
+    @ColumnWidth(30)
+    @ApiModelProperty(value = "房源名称")
+    private String roomName;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "民宿ID")
+    private String hotelId;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "主图")
+    private String poster;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "定位")
+    private String location;
+
+    @ExcelProperty(value = "位置信息", index = 2)
+    @ColumnWidth(30)
+    @ApiModelProperty(value = "地址")
+    private String address;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "停车场定位")
+    private String parkingLocation;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "停车场位置")
+    private String parkingAddress;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "WIFI名称")
+    private String wifiName;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "WIFI密码")
+    private String wifiPassword;
+
+    @ExcelProperty(value = "权重", index = 3)
+    @ApiModelProperty(value = "权重")
+    private Integer weight;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "状态")
+    private Integer status;
 
+    @ExcelIgnore
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
 
+    @ExcelProperty(value = "民宿名称", index = 0)
+    @ColumnWidth(30)
     @ApiModelProperty("民宿名称")
     String hotelName;
 }

src/main/java/com/yunzhi/shigongli/vo/ShopCommissionVO.java

@@ -1,6 +1,11 @@
 package com.yunzhi.shigongli.vo;
 
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.yunzhi.shigongli.common.excelConverter.LocalDateTimeConverter;
+import com.yunzhi.shigongli.common.excelConverter.MoneyConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -11,42 +16,61 @@ import java.time.LocalDateTime;
 @Data
 public class ShopCommissionVO {
 
+    @ExcelIgnore
     @ApiModelProperty(value = "日志ID")
     private Integer logId;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "店铺ID")
     private String shopId;
 
+    @ExcelProperty(value = "推广店铺", index = 4)
+    @ColumnWidth(30)
     @ApiModelProperty(value = "店铺名称")
     private String shopName;
 
+    @ExcelProperty(value = "订单号", index = 1)
+    @ColumnWidth(30)
     @ApiModelProperty(value = "订单ID")
     private String orderId;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "子订单ID")
     private String subOrderId;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "套餐ID")
     private String packageId;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "套餐名称")
     private String description;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "人员ID")
     private String personId;
 
+    @ExcelProperty(value = "下单人", index = 3)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "人员昵称")
     private String nickName;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "人员手机号")
     private String phone;
 
+    @ExcelProperty(value = "订单金额", converter = MoneyConverter.class, index = 2)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "订单金额")
     private Integer charges;
 
+    @ExcelProperty(value = "推广收入", converter = MoneyConverter.class, index = 5)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "推广收入")
     private Integer commissionCharge;
 
+    @ExcelProperty(value = "日期", converter = LocalDateTimeConverter.class, index = 0)
+    @ColumnWidth(30)
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 }

src/main/java/com/yunzhi/shigongli/vo/ShopListVO.java

@@ -1,7 +1,11 @@
 package com.yunzhi.shigongli.vo;
 
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.yunzhi.shigongli.common.excelConverter.MoneyConverter;
+import com.yunzhi.shigongli.common.excelConverter.ShopStatusConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,54 +14,67 @@ import lombok.Data;
 @Data
 public class ShopListVO {
 
+    @ExcelIgnore
     @ApiModelProperty(value = "店铺ID")
     private String shopId;
 
     @ExcelProperty(value = "店铺名称", index = 0)
+    @ColumnWidth(30)
     @ApiModelProperty(value = "店铺名称")
     private String shopName;
 
     @ExcelProperty(value = "联系电话", index = 1)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "联系电话")
     private String phone;
 
     @ExcelProperty(value = "位置信息", index = 2)
+    @ColumnWidth(30)
     @ApiModelProperty(value = "位置信息")
     private String address;
 
     @ExcelProperty(value = "人员数量", index = 3)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "人员数量")
     private Integer workerNum;
 
-    @ExcelProperty(value = "营业额/单位分", index = 4)
+    @ExcelProperty(value = "营业额", converter = MoneyConverter.class, index = 4)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "营业额")
     private Integer salesCharges;
 
     @ExcelProperty(value = "浏览次数", index = 5)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "浏览次数")
     private Integer pvNum;
 
     @ExcelProperty(value = "订单数量", index = 6)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "订单数量")
     private Integer orderSubNum;
 
-    @ExcelProperty(value = "推广佣金/单位分", index = 7)
+    @ExcelProperty(value = "推广佣金", converter = MoneyConverter.class, index = 7)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "推广佣金")
     private Integer brokerageCharges;
 
-    @ExcelProperty(value = "已结算/单位分", index = 8)
+    @ExcelProperty(value = "已结算", converter = MoneyConverter.class, index = 8)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "已结算")
     private Integer paidCharges;
 
-    @ExcelProperty(value = "待结算/单位分", index = 9)
+    @ExcelProperty(value = "待结算", converter = MoneyConverter.class, index = 9)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "待结算")
     private Integer unpaidCharges;
 
     @ExcelProperty(value = "权重", index = 10)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "权重")
     private Integer weight;
 
-    @ExcelProperty(value = "状态(1营业0关闭)", index = 11)
+    @ExcelProperty(value = "状态", converter = ShopStatusConverter.class, index = 11)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "状态")
     private Integer status;
 }

src/main/java/com/yunzhi/shigongli/vo/ShopPackageVO.java

@@ -1,33 +1,118 @@
 package com.yunzhi.shigongli.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.yunzhi.shigongli.common.excelConverter.LocalDateTimeConverter;
+import com.yunzhi.shigongli.common.excelConverter.LocalDayConverter;
+import com.yunzhi.shigongli.common.excelConverter.MoneyConverter;
 import com.yunzhi.shigongli.entity.TaShopPackage;
 import com.yunzhi.shigongli.entity.TaTargetDietMark;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 
 @ApiModel(description = "商品套餐全字段")
 @Data
-public class ShopPackageVO extends TaShopPackage {
+public class ShopPackageVO {
 
+    @ExcelIgnore
+    @ApiModelProperty(value = "套餐ID")
+    @TableId(value = "package_id", type = IdType.UUID)
+    private String packageId;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "商铺ID")
+    private String shopId;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "类型")
+    private String packageCategory;
+
+    @ExcelProperty(value = "套餐描述", index = 1)
+    @ColumnWidth(30)
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+    @ExcelProperty(value = "适用人数", index = 2)
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "适用人数")
+    private Integer personNum;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "主图")
+    private String poster;
+
+    @ExcelProperty(value = "门市价格", converter = MoneyConverter.class, index = 3)
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "门市价格,单位分")
+    private Integer standardPrice;
+
+    @ExcelProperty(value = "实售价格", converter = MoneyConverter.class, index = 4)
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "实售价格,单位分")
+    private Integer actualPrice;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "返现,单位分")
+    private Integer cashback;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "有效期始")
+    private LocalDateTime startTime;
+
+    @ExcelProperty(value = "有效期止", converter = LocalDayConverter.class, index = 5)
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "有效期止")
+    private LocalDateTime endTime;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "权重")
+    private Integer weight;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "是否收藏")
+    @TableField(exist = false)
+    private Integer isSaved;
+
+    @ExcelProperty(value = "商铺名称", index = 0)
+    @ColumnWidth(30)
     @ApiModelProperty(value = "商铺名称")
     private String shopName;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "引流分成;单位千分之一")
     private Integer trafficRate;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "平台分成;单位千分之一")
     private Integer platformRate;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "参与攻略")
     private Boolean isStrategy;
 
+    @ExcelProperty(value = "推荐级别", index = 6)
+    @ColumnWidth(20)
     @ApiModelProperty(value = "推荐等级")
     private String strategyLevel;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "类别")
     private List<TaTargetDietMark> dietMarkList;
 

src/main/resources/mapper/TaFeedbackMapper.xml

@@ -12,21 +12,29 @@
         WHERE
             t.feedback_id = #{id}
     </select>
-    <select id="getProfilePage" resultType="com.yunzhi.shigongli.entity.TaFeedback">
+
+    <sql id="queryFeedBack">
         SELECT
             t.*,
             s.phone,
             s.nick_name
         FROM
             ta_feedback t
-                INNER JOIN ta_person s ON s.person_id = t.person_id
+            INNER JOIN ta_person s ON s.person_id = t.person_id
         WHERE 1 = 1
-          <if test="startDate != null">
-              AND t.create_date &gt;= #{startDate}
-          </if>
-          <if test="endDate != null">
-              AND t.create_date &lt;= #{endDate}
-          </if>
+            <if test="startDate != null">
+                AND t.create_date &gt;= #{startDate}
+            </if>
+            <if test="endDate != null">
+                AND t.create_date &lt;= #{endDate}
+            </if>
         ORDER BY t.create_date DESC
+    </sql>
+
+    <select id="getProfilePage" resultType="com.yunzhi.shigongli.entity.TaFeedback">
+        <include refid="queryFeedBack"></include>
+    </select>
+    <select id="getProfileList" resultType="com.yunzhi.shigongli.entity.TaFeedback">
+        <include refid="queryFeedBack"></include>
     </select>
 </mapper>

src/main/resources/mapper/TaHotelMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.shigongli.mapper.TaHotelMapper">
 
-    <select id="getVOListBy" resultType="com.yunzhi.shigongli.vo.HotelListVO">
+    <sql id="queryHotelList">
         SELECT
             t.*,
             s.brokerage_charges,
@@ -11,14 +11,22 @@
             ( SELECT count( * ) FROM ta_room b WHERE b.hotel_id = t.hotel_id AND b.`status` &gt; - 1 ) AS room_num
         FROM
             ta_hotel t
-                INNER JOIN ta_hotel_account s ON t.hotel_id = s.hotel_id
+            INNER JOIN ta_hotel_account s ON t.hotel_id = s.hotel_id
         WHERE 1 = 1
-          <if test="hotelName != null and hotelName != ''">
-              AND t.hotel_name LIKE CONCAT( '%', #{hotelName}, '%' )
-          </if>
+            <if test="hotelName != null and hotelName != ''">
+                AND t.hotel_name LIKE CONCAT( '%', #{hotelName}, '%' )
+            </if>
             AND t.`status` &gt; - 1
         ORDER BY
             t.create_date DESC
+    </sql>
+
+    <select id="getVOPageBy" resultType="com.yunzhi.shigongli.vo.HotelListVO">
+        <include refid="queryHotelList"></include>
+    </select>
+
+    <select id="getVOListBy" resultType="com.yunzhi.shigongli.vo.HotelListVO">
+        <include refid="queryHotelList"></include>
     </select>
     <select id="getListByPerson" resultType="com.yunzhi.shigongli.entity.TaHotel">
         SELECT

src/main/resources/mapper/TaRoomMapper.xml

@@ -2,29 +2,33 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.shigongli.mapper.TaRoomMapper">
 
-    <select id="getPageListBy" resultType="com.yunzhi.shigongli.vo.RoomListVO">
+    <sql id="queryRoom">
         SELECT
             t.*,
             s.hotel_name
         FROM
             ta_room t
-            INNER JOIN ta_hotel s ON t.hotel_id = s.hotel_id
+            INNER JOIN ta_hotel s ON t.hotel_id = s.hotel_id AND s.`status` &gt; -1
         WHERE 1=1
-        <if test="hotelId != null and hotelId != ''">
-            AND t.hotel_id = #{hotelId}
-        </if>
-        <if test="roomName != null and roomName != ''">
-          AND t.room_name LIKE CONCAT( '%', #{roomName}, '%' )
-        </if>
-        <if test="plat == 'admin'">
-          AND t.`status` &gt; -1
-        </if>
-        <if test="plat == 'wx'">
-          AND t.`status` = 1
-        </if>
+            <if test="hotelId != null and hotelId != ''">
+                AND t.hotel_id = #{hotelId}
+            </if>
+            <if test="roomName != null and roomName != ''">
+                AND t.room_name LIKE CONCAT( '%', #{roomName}, '%' )
+            </if>
+            <if test="plat == 'admin'">
+                AND t.`status` &gt; -1
+            </if>
+            <if test="plat == 'wx'">
+                AND t.`status` = 1
+            </if>
         ORDER BY
             t.weight DESC,
             t.create_date DESC
+    </sql>
+
+    <select id="getPageListBy" resultType="com.yunzhi.shigongli.vo.RoomListVO">
+        <include refid="queryRoom"></include>
     </select>
     <select id="getRoomOwners" resultType="com.yunzhi.shigongli.entity.TaHotelWorker">
         SELECT DISTINCT
@@ -38,4 +42,7 @@
           AND s.`status` &gt; - 1
           AND t.`status` &gt; -1
     </select>
+    <select id="getPureListBy" resultType="com.yunzhi.shigongli.vo.RoomListVO">
+        <include refid="queryRoom"></include>
+    </select>
 </mapper>

src/main/resources/mapper/TaShopAccountLogMapper.xml

@@ -12,7 +12,8 @@
           AND t.amount_type = #{amountType}
           AND t.create_date BETWEEN #{start} AND #{end}
     </select>
-    <select id="getShopAccountList" resultType="com.yunzhi.shigongli.vo.ShopCommissionVO">
+
+    <sql id="queryShopAccount">
         SELECT
             t.log_id,
             t.shop_id,
@@ -35,19 +36,26 @@
             INNER JOIN ta_person p ON p.person_id = n.person_id
         WHERE
             t.amount_type = #{amountType}
-          <if test="shopName != null and shopName != ''">
-              AND m.shop_name LIKE CONCAT( '%', #{shopName}, '%' )
-          </if>
-          <if test="description != null and description != ''">
-              AND s.description LIKE CONCAT( '%', #{description}, '%' )
-          </if>
-          <if test="startDate != null">
-              AND t.create_date &gt;= #{startDate}
-          </if>
-          <if test="endDate != null">
-              AND t.create_date &lt;= #{endDate}
-          </if>
+            <if test="shopName != null and shopName != ''">
+                AND m.shop_name LIKE CONCAT( '%', #{shopName}, '%' )
+            </if>
+            <if test="description != null and description != ''">
+                AND s.description LIKE CONCAT( '%', #{description}, '%' )
+            </if>
+            <if test="startDate != null">
+                AND t.create_date &gt;= #{startDate}
+            </if>
+            <if test="endDate != null">
+                AND t.create_date &lt;= #{endDate}
+            </if>
         ORDER BY
             t.create_date DESC
+    </sql>
+
+    <select id="getShopAccountPage" resultType="com.yunzhi.shigongli.vo.ShopCommissionVO">
+        <include refid="queryShopAccount"></include>
+    </select>
+    <select id="getShopAccountList" resultType="com.yunzhi.shigongli.vo.ShopCommissionVO">
+        <include refid="queryShopAccount"></include>
     </select>
 </mapper>

src/main/resources/mapper/TaShopMapper.xml

@@ -29,7 +29,7 @@
             SET t.${field} = score
     </update>
 
-    <select id="getPageListBy" resultType="com.yunzhi.shigongli.vo.ShopListVO">
+    <sql id="queryShop">
         SELECT
             t.*,
             ( SELECT COUNT(1) FROM ta_shop_worker a WHERE a.shop_id = t.shop_id AND a.`status` &gt; -1 ) as worker_num,
@@ -41,20 +41,24 @@
             ( SELECT count( 1 ) FROM ta_order_sub c WHERE c.shop_id = t.shop_id AND c.`status` &gt; -1 ) AS order_sub_num
         FROM
             ta_shop t
-                INNER JOIN ta_shop_account s ON t.shop_id = s.shop_id
+            INNER JOIN ta_shop_account s ON t.shop_id = s.shop_id
+            --                 LEFT JOIN ta_shop_worker m ON t.shop_id = m.shop_id
+            --                 AND m.is_manager = 1
         WHERE
             t.`status` &gt; - 1
-          <if test="shopName != null and shopName != ''">
-              AND t.shop_name LIKE CONCAT( '%', #{shopName}, '%' )
-          </if>
-          <if test="phone != null and phone != ''">
-              AND t.phone LIKE CONCAT( '%', #{phone}, '%' )
-          </if>
+            <if test="shopName != null and shopName != ''">
+                AND t.shop_name LIKE CONCAT( '%', #{shopName}, '%' )
+            </if>
+            <if test="phone != null and phone != ''">
+                AND t.phone LIKE CONCAT( '%', #{phone}, '%' )
+            </if>
         ORDER BY
             t.weight DESC,
             t.create_date DESC
+    </sql>
+
+    <select id="getPageListBy" resultType="com.yunzhi.shigongli.vo.ShopListVO">
+        <include refid="queryShop"></include>
     </select>
     <select id="getListByPerson" resultType="com.yunzhi.shigongli.entity.TaShop">
         SELECT
@@ -106,4 +110,7 @@
         WHERE
             t.shop_id = #{id}
     </select>
+    <select id="getListBy" resultType="com.yunzhi.shigongli.vo.ShopListVO">
+        <include refid="queryShop"></include>
+    </select>
 </mapper>

src/main/resources/mapper/TaShopPackageMapper.xml

@@ -1,8 +1,13 @@
 <?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.yunzhi.shigongli.mapper.TaShopPackageMapper">
+    <update id="removeByShop">
+        update ta_shop_package t
+        set t.`status` = -1
+        where t.shop_id = #{shopId}
+    </update>
 
-    <select id="getProfilePage" resultType="com.yunzhi.shigongli.vo.ShopPackageVO">
+    <sql id="queryShopPackage">
         SELECT
             t.*,
             m.shop_name,
@@ -12,19 +17,23 @@
             s.strategy_level
         FROM
             ta_shop_package t
-                INNER JOIN ta_shop_package_setting s ON t.package_id = s.package_id
-                INNER JOIN ta_shop m on m.shop_id = t.shop_id
+            INNER JOIN ta_shop_package_setting s ON t.package_id = s.package_id
+            INNER JOIN ta_shop m on m.shop_id = t.shop_id
         WHERE
             t.`status` &gt; - 1
-          <if test="shopId != null and shopId != ''">
-              AND t.shop_id = #{shopId}
-          </if>
-          <if test="description != null and description != ''">
-              AND t.description like CONCAT('%', #{description}, '%')
-          </if>
+            <if test="shopId != null and shopId != ''">
+                AND t.shop_id = #{shopId}
+            </if>
+            <if test="description != null and description != ''">
+                AND t.description like CONCAT('%', #{description}, '%')
+            </if>
         ORDER BY
             t.weight DESC,
             t.create_date DESC
+    </sql>
+
+    <select id="getProfilePage" resultType="com.yunzhi.shigongli.vo.ShopPackageVO">
+        <include refid="queryShopPackage"></include>
     </select>
     <select id="getWxPackageList" resultType="com.yunzhi.shigongli.entity.TaShopPackage">
         SELECT
@@ -72,4 +81,7 @@
             a.weight DESC
         LIMIT #{limit}
     </select>
+    <select id="getProfileList" resultType="com.yunzhi.shigongli.vo.ShopPackageVO">
+        <include refid="queryShopPackage"></include>
+    </select>
 </mapper>

src/main/resources/mapper/TaTouristMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.shigongli.mapper.TaTouristMapper">
 
-    <select id="getPagedBy" resultType="com.yunzhi.shigongli.entity.TaTourist">
+    <sql id="queryTourist">
         SELECT
             t.*,
             s.like_num,
@@ -13,19 +13,23 @@
         FROM
             ta_tourist t
             LEFT JOIN ta_resource s ON s.target_type = #{targetTourist}
-                AND s.target_id = t.tourist_id
+            AND s.target_id = t.tourist_id
             LEFT JOIN td_city m on m.area_id = t.city_id
         WHERE
             t.`status` &gt; - 1
-          <if test="touristName != null and touristName != ''">
-              AND t.tourist_name LIKE CONCAT( '%', #{touristName}, '%' )
-          </if>
-          <if test="cityId != null and cityId != ''">
-              AND t.city_id = #{cityId}
-          </if>
+            <if test="touristName != null and touristName != ''">
+                AND t.tourist_name LIKE CONCAT( '%', #{touristName}, '%' )
+            </if>
+            <if test="cityId != null and cityId != ''">
+                AND t.city_id = #{cityId}
+            </if>
         ORDER BY
             t.weight DESC,
             t.create_date DESC
+    </sql>
+
+    <select id="getPagedBy" resultType="com.yunzhi.shigongli.entity.TaTourist">
+        <include refid="queryTourist"></include>
     </select>
     <select id="getProfileBy" resultType="com.yunzhi.shigongli.entity.TaTourist">
         SELECT
@@ -64,4 +68,7 @@
         WHERE
             t.tourist_id = #{id}
     </select>
+    <select id="getListBy" resultType="com.yunzhi.shigongli.entity.TaTourist">
+        <include refid="queryTourist"></include>
+    </select>
 </mapper>