feats

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

@@ -17,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.*;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -42,6 +43,31 @@ public class OSSUtils {
         return path + getMonth() + "/";
     }
 
+    /**
+     * 上传 base64
+     * @param base64Str
+     * @param toDirs
+     * @return
+     * @throws IOException
+     */
+    public String putObject(String base64Str, String ...toDirs) throws IOException {
+        int index = base64Str.indexOf("base64,");
+
+        if (index > -1) {
+            index += 7;
+        } else {
+            index = 0;
+        }
+
+        String dataStr = base64Str.substring(index);
+        byte[] data = Base64.getDecoder().decode(dataStr);
+        ByteArrayInputStream inputStream = new ByteArrayInputStream(data);
+        String toDir = getUploadPath(toDirs);
+        String nwFName = toDir + System.currentTimeMillis() + ".png";
+        nwFName = StringUtils.trim(nwFName,"/");
+        return putFile(nwFName, inputStream);
+    }
+
     /**
      * 上传文件
      * @param mf 上传的文件

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

@@ -48,6 +48,23 @@ public class CommController extends BaseController {
         }
     }
 
+    /**
+     * base64 图片上传
+     * @param data
+     * @return
+     */
+    @ApiOperation(value = "base64 图片上传", notes = "base64 图片上传")
+    @PostMapping("/{plat}/image/base64")
+    public ResponseBean uploadBase64Image(@RequestBody Map<String, String> data) {
+        try {
+            String base64Str = data.get("base64");
+            String img = ossUtils.putObject(base64Str);
+            return ResponseBean.success(img);
+        } catch (IOException e) {
+            return ResponseBean.error("上传图片失败: " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
     /**
      * 获取文件上传凭证
      * @return

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

@@ -59,11 +59,12 @@ public class TaNoteController extends BaseController {
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = TaNote.class)
     public ResponseBean getWxList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                   @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                  @ApiParam("定位地点") @RequestParam(value ="location", required = false) String location) throws Exception{
+                                  @ApiParam("定位地点") @RequestParam(value ="location", required = false) String location,
+                                  @ApiParam("查询内容") @RequestParam(value ="q", required = false) String q) throws Exception{
 
         IPage<TaNote> pg = new Page<>(pageNum, pageSize);
 
-        IPage<TaNote> result = iTaNoteService.getWxPageBy(pg, getCurrentPerson(), location);
+        IPage<TaNote> result = iTaNoteService.getWxPageBy(pg, getCurrentPerson(), location, q);
         return ResponseBean.success(result);
     }
 
@@ -75,7 +76,7 @@ public class TaNoteController extends BaseController {
      */
     @RequestMapping(value="/admin/note",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = TaNote.class)
-    public ResponseBean taPvList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean noteList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                  @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                  @ApiParam("笔记类型") @RequestParam(value ="noteType", required = false) String noteType,
                                  @ApiParam("简介") @RequestParam(value ="summary", required = false) String summary) throws Exception{
@@ -93,7 +94,7 @@ public class TaNoteController extends BaseController {
      */
     @RequestMapping(value="/admin/note",method= RequestMethod.POST)
     @ApiOperation(value="保存笔记", notes = "保存笔记", httpMethod = "POST", response = TaNote.class)
-    public ResponseBean taPvAdd(@ApiParam("保存内容") @RequestBody NoteVO noteVO) throws Exception{
+    public ResponseBean saveNote(@ApiParam("保存内容") @RequestBody NoteVO noteVO) throws Exception{
         if (null == noteVO) {
             return ResponseBean.error("没有找到保存内容", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
@@ -152,7 +153,7 @@ public class TaNoteController extends BaseController {
      */
     @RequestMapping(value="/admin/note/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除笔记", notes = "删除笔记", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taPvDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+    public ResponseBean deleteNote(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         if(iTaNoteService.removeLogicById(id)){
             return ResponseBean.success("success");
         }else {
@@ -166,9 +167,9 @@ public class TaNoteController extends BaseController {
      * @param noteVO 实体对象
      * @return
      */
-    @RequestMapping(value="/taPv/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/note/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新笔记", notes = "更新笔记", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taPvUpdate(@ApiParam("对象ID") @PathVariable String id,
+    public ResponseBean updateNote(@ApiParam("对象ID") @PathVariable String id,
                                    @ApiParam("更新内容") @RequestBody NoteVO noteVO) throws Exception {
 
         TaNote taNote = iTaNoteService.getById(id);
@@ -225,7 +226,7 @@ public class TaNoteController extends BaseController {
      */
     @RequestMapping(value="/admin/note/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taPvGet(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+    public ResponseBean getAdminDetail(@ApiParam("对象ID") @PathVariable String id) throws Exception {
         TaNote taNote = iTaNoteService.getById(id);
         if (null == taNote || Constants.STATUS_DELETED == taNote.getStatus()) {
             return ResponseBean.error("没有找到更新内容", ResponseBean.ERROR_UNAVAILABLE);
@@ -242,6 +243,28 @@ public class TaNoteController extends BaseController {
     }
 
 
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/wx/note/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getWxDetail(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        TaNote taNote = iTaNoteService.getById(id);
+        if (null == taNote || Constants.STATUS_DELETED == taNote.getStatus()) {
+            return ResponseBean.error("没有找到更新内容", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        NoteVO noteVO = new NoteVO();
+        BeanUtils.copyProperties(taNote, noteVO);
+
+
+        noteVO.setImageList(iTaImageService.getListBy(Constants.TARGET_NOTE, id));
+        noteVO.setWxResourceList(iTaNoteResourceService.getResourceListBy(id, getCurrentPerson().getPersonId()));
+
+        return ResponseBean.success(noteVO);
+    }
+
     /**
      * 根据id查询对象
      * @param id  实体ID

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

@@ -98,4 +98,25 @@ public class TaResourceController extends BaseController {
 
         return ResponseBean.success(iTaResourceService.page(pg, queryWrapper));
     }
+
+
+    /**
+     * 资源推荐
+     * @param pageNum
+     * @param pageSize
+     * @param location
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/wx/resource/recommend")
+    @ApiOperation(value="资源推荐", notes = "资源推荐", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getRecommend(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                     @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @ApiParam("定位") @RequestParam(value = "location") String location) throws Exception {
+        IPage<ResourceListVO> pg = new Page<>(pageNum, pageSize);
+
+        IPage<ResourceListVO> result = iTaResourceService.getWxRecommend(pg, getCurrentPerson().getPersonId(), location);
+
+        return ResponseBean.success(result);
+    }
 }

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

@@ -1,14 +1,10 @@
 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.ExcelUtils;
 import com.yunzhi.shigongli.common.ResponseBean;
-import com.yunzhi.shigongli.entity.TaExtendContent;
-import com.yunzhi.shigongli.entity.TaShopPackageSetting;
 import com.yunzhi.shigongli.vo.ShopPackageRecommend;
 import com.yunzhi.shigongli.vo.ShopPackageVO;
 import io.swagger.annotations.Api;
@@ -16,7 +12,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -61,10 +56,11 @@ public class TaShopPackageController extends BaseController {
     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,
+                                          @ApiParam("套餐类型") @RequestParam(value ="packageCategory", required = false) String packageCategory,
                                           @ApiParam("套餐名称") @RequestParam(value = "description", required = false) String description) throws Exception{
 
         IPage<TaShopPackage> pg = new Page<>(pageNum, pageSize);
-        IPage<ShopPackageVO> result = iTaShopPackageService.getProfilePage(pg, shopId, description);
+        IPage<ShopPackageVO> result = iTaShopPackageService.getProfilePage(pg, shopId, packageCategory, description);
         return ResponseBean.success(result);
     }
 
@@ -78,7 +74,7 @@ public class TaShopPackageController extends BaseController {
                                               @ApiParam("套餐名称") @RequestParam(value = "description", required = false) String description,
                                               HttpServletResponse response) throws Exception{
 
-        IPage<ShopPackageVO> result = iTaShopPackageService.getProfilePage(null, shopId, description);
+        IPage<ShopPackageVO> result = iTaShopPackageService.getProfilePage(null, shopId, shopId, description);
 
         ExcelUtils.flush(response, ShopPackageVO.class, result.getRecords(), "商铺套餐列表");
     }

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

@@ -1,19 +1,32 @@
 package com.yunzhi.shigongli.controller;
 
-import com.yunzhi.shigongli.common.BaseController;
-import com.yunzhi.shigongli.common.ResponseBean;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.shigongli.common.*;
 import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.entity.TaTravel;
+import com.yunzhi.shigongli.entity.TaTravelItem;
+import com.yunzhi.shigongli.entity.TaTravelPerson;
 import com.yunzhi.shigongli.service.ITaPvService;
 import com.yunzhi.shigongli.service.ITaTravelItemService;
 import com.yunzhi.shigongli.service.ITaTravelPersonService;
 import com.yunzhi.shigongli.service.ITaTravelService;
+import com.yunzhi.shigongli.vo.TravelDataVO;
+import com.yunzhi.shigongli.vo.TravelItemDataVO;
+import com.yunzhi.shigongli.vo.TravelListVO;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.ibatis.annotations.Delete;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -40,91 +53,356 @@ public class TaTravelController extends BaseController {
     @Autowired
     public ITaTravelPersonService iTaTravelPersonService;
 
+
+    /**
+     * 获取行程列表
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/admin/travel")
+    @ApiOperation(value="获取行程列表", notes = "获取行程列表", httpMethod = "GET", response = TravelDataVO.class)
+    public ResponseBean getAdminTravel(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone,
+                                       @ApiParam(value = "起始时间", example = "2021-10-01") @RequestParam(value ="start", required = false) String start,
+                                       @ApiParam(value = "结束时间", example = "2021-10-31") @RequestParam(value ="end", required = false) String end) 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<TravelListVO> pg = new Page<>(pageNum, pageSize);
+
+        IPage<TravelListVO> result = iTaTravelService.getAdminList(pg, phone, startDate, endDate);
+
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 命定行程列表
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/admin/travel/destiny")
+    @ApiOperation(value="ADMIN命定行程列表", notes = "ADMIN命定行程列表", httpMethod = "GET", response = TravelDataVO.class)
+    public ResponseBean getAdminDestinyTravel(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                              @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                              @ApiParam("行程描述") @RequestParam(value ="title", required = false) String title,
+                                              @ApiParam("状态") @RequestParam(value ="status", required = false) Integer status) throws Exception {
+        IPage<TaTravel> pg = new Page<>(pageNum, pageSize);
+
+        IPage<TaTravel> travelList = iTaTravelService.getAdminDestinyList(pg, title, status);
+
+        return ResponseBean.success(travelList);
+    }
+
+
+    /**
+     * 行程详情
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/admin/travel/{id}")
+    @ApiOperation(value="行程详情", notes = "行程详情", httpMethod = "GET", response = TravelDataVO.class)
+    public ResponseBean getTravelDetail(@ApiParam("行程ID") @PathVariable String id) throws Exception {
+        TaTravel taTravel = iTaTravelService.getById(id);
+        if (null == taTravel || taTravel.getStatus() == Constants.STATUS_DELETED) {
+            return ResponseBean.error("没有找到行程信息", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TravelDataVO travelDataVO = new TravelDataVO();
+        BeanUtils.copyProperties(taTravel, travelDataVO);
+
+        List<TravelItemDataVO> travelItemDetails = iTaTravelItemService.getTravelItemDetails(id);
+        travelDataVO.setTravelItemList(travelItemDetails);
+
+        return ResponseBean.success(travelDataVO);
+    }
+
+    /**
+     * 获取命定行程
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/wx/travel/destiny")
+    @ApiOperation(value="获取命定行程", notes = "获取命定行程", httpMethod = "GET", response = TravelDataVO.class)
     public ResponseBean getDestinyTravel() throws Exception {
         TaPerson taPerson = getCurrentPerson();
 
-        TaTravel andCopyDestinyTravel = iTaTravelPersonService.getAndCopyDestinyTravel(taPerson.getPersonId());
+        TravelDataVO travelData = iTaTravelPersonService.getDestinyTravel(taPerson.getPersonId());
+        if (null == travelData) {
+            return ResponseBean.success(null);
+        }
+
+        List<TravelItemDataVO> itemDataVOList = iTaTravelItemService.getTravelItemDetails(travelData.getTravelId());
+
+        travelData.setTravelItemList(itemDataVOList);
+
+        return ResponseBean.success(travelData);
+    }
+
+    /**
+     * 保存命定行程
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/wx/travel/destiny")
+    @ApiOperation(value="保存命定行程", notes = "保存命定行程", httpMethod = "POST", response = TravelDataVO.class)
+    public ResponseBean saveDestinyTravel() throws Exception {
+        TaPerson taPerson = getCurrentPerson();
+
+        TaTravel travel = iTaTravelPersonService.getAndCopyDestinyTravel(taPerson.getPersonId());
+        TravelDataVO travelDataVO = new TravelDataVO();
+        BeanUtils.copyProperties(travel, travelDataVO);
+
+        List<TravelItemDataVO> itemDataVOList = iTaTravelItemService.getTravelItemDetails(travel.getTravelId());
+
+        travelDataVO.setTravelItemList(itemDataVOList);
+
+        return ResponseBean.success(travel);
+    }
+
+
+    /**
+     * 保存命定行程
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/admin/travel/destiny")
+    @ApiOperation(value="保存命定行程", notes = "保存命定行程", httpMethod = "POST", response = TravelDataVO.class)
+    public ResponseBean saveDestinyTravel(@ApiParam("保存内容") @RequestBody TravelDataVO travelDataVO) throws Exception {
+        if (null == travelDataVO) {
+            return ResponseBean.error("没有找到保存内容", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (StringUtils.isEmpty(travelDataVO.getTitle())) {
+            return ResponseBean.error("请填写命定行程描述", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        List<TravelItemDataVO> travelItemList = travelDataVO.getTravelItemList();
+        if (null == travelItemList || travelItemList.size() < 1) {
+            return ResponseBean.error("请维护相关地点", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaTravel taTravel = new TaTravel();
+        BeanUtils.copyProperties(travelDataVO, taTravel);
+        taTravel.setDayNum(1);
+        taTravel.setIsDestiny(true);
+        taTravel.setIsSystem(true);
+
+        if (taTravel.getStatus() == null) {
+            taTravel.setStatus(Constants.STATUS_READY);
+        }
+        if (taTravel.getWeight() == null) {
+            taTravel.setWeight(0);
+        }
+
+        // 保存行程主记录
+        if (iTaTravelService.save(taTravel)) {
+            // 获取最新的记录
+            travelDataVO.setTravelItemList(iTaTravelItemService.updateTravelItems(taTravel.getTravelId(), travelItemList));
+            travelDataVO.setTravelId(taTravel.getTravelId());
+
+            return ResponseBean.success(travelDataVO);
+        } else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 更新行程
+     * @return
+     * @throws Exception
+     */
+    @PutMapping("/admin/travel/{id}")
+    @ApiOperation(value="更新行程", notes = "更新行程", httpMethod = "PUT", response = TravelDataVO.class)
+    public ResponseBean updateDestinyTravel(@ApiParam("行程ID") @PathVariable String id,
+                                            @ApiParam("更新内容") @RequestBody TravelDataVO travelDataVO) throws Exception {
+        if (null == travelDataVO) {
+            return ResponseBean.error("没有找到更新内容", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaTravel origin = iTaTravelService.getById(id);
+        if (null == origin || origin.getStatus() == Constants.STATUS_DELETED) {
+            return ResponseBean.error("没有找到行程信息", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        travelDataVO.setTravelId(id);
+
+        if (StringUtils.isEmpty(travelDataVO.getTitle())) {
+            return ResponseBean.error("请填写行程描述", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        List<TravelItemDataVO> travelItemList = travelDataVO.getTravelItemList();
+        if (null == travelItemList || travelItemList.size() < 1) {
+            return ResponseBean.error("请维护相关地点", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaTravel taTravel = new TaTravel();
+        BeanUtils.copyProperties(travelDataVO, taTravel);
+//        taTravel.setDayNum(1);
+//        taTravel.setIsDestiny(true);
+//        taTravel.setIsSystem(true);
+
+        if (taTravel.getStatus() == null) {
+            taTravel.setStatus(Constants.STATUS_READY);
+        }
+        if (taTravel.getWeight() == null) {
+            taTravel.setWeight(0);
+        }
+
+        // 保存行程主记录
+        if (iTaTravelService.updateById(taTravel)) {
+            // 获取最新的记录
+            travelDataVO.setTravelItemList(iTaTravelItemService.updateTravelItems(taTravel.getTravelId(), travelItemList));
+            travelDataVO.setTravelId(taTravel.getTravelId());
+
+            return ResponseBean.success(travelDataVO);
+        } else {
+            return ResponseBean.error("更新失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+
+    /**
+     * 获取我的行程
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/wx/travel/mine")
+    @ApiOperation(value="获取我的行程", notes = "获取我的行程", httpMethod = "GET", response = TravelDataVO.class)
+    public ResponseBean getMineTravel(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                      @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                      @ApiParam("简易列表") @RequestParam(value ="simple",defaultValue = "false") Boolean simple) throws Exception {
+        TaPerson taPerson = getCurrentPerson();
+
+        IPage<TravelDataVO> pg = new Page<>(pageNum, pageSize);
+
+        IPage<TravelDataVO> result = iTaTravelService.getPersonAllList(pg, taPerson.getPersonId(), simple);
+
+        return ResponseBean.success(result);
+    }
+
+
+    /**
+     * 保存我的行程
+     * @param taTravel
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/wx/travel")
+    @ApiOperation(value="保存我的行程", notes = "保存我的行程", httpMethod = "POST", response = TaTravel.class)
+    public ResponseBean saveTravel(@ApiParam("保存内容") @RequestBody TaTravel taTravel) throws Exception {
+        taTravel.setCreateDate(LocalDateTime.now());
+        taTravel.setStatus(Constants.STATUS_NORMAL);
+        taTravel.setIsSystem(false);
+        taTravel.setIsDestiny(false);
+        if (null == taTravel.getDayNum() || taTravel.getDayNum() < 1) {
+            taTravel.setDayNum(1);
+        }
+
+        if (iTaTravelService.save(taTravel)) {
+            TaTravelPerson taTravelPerson = new TaTravelPerson();
+            taTravelPerson.setTravelId(taTravel.getTravelId());
+            taTravelPerson.setPersonId(getCurrentPerson().getPersonId());
+            taTravelPerson.setIsHidden(false);
+
+            if (iTaTravelPersonService.save(taTravelPerson)) {
+                return ResponseBean.success(taTravel);
+            } else {
+                return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+            }
+
+        } else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 更新我的行程
+     * @param id
+     * @return
+     * @throws Exception
+     */
+    @PutMapping("/wx/travel/{id}")
+    @ApiOperation(value="更新我的行程", notes = "更新我的行程", httpMethod = "PUT", response = TaTravel.class)
+    public ResponseBean updateTravel(@ApiParam("行程ID") @PathVariable String id,
+                                     @ApiParam("保存内容") @RequestBody TaTravel taTravel) throws Exception {
+        TaTravelPerson taTravelPerson = iTaTravelPersonService.getByPerson(getCurrentPerson().getPersonId(), id);
+        if (null == taTravelPerson) {
+            return ResponseBean.error("未找到更新内容", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        TaTravel origin = iTaTravelService.getById(id);
+
+        // 只允许修改名称 - 天数
+        origin.setTitle(taTravel.getTitle());
+        origin.setDayNum(taTravel.getDayNum());
+
+        if (iTaTravelService.updateById(origin)) {
+            return ResponseBean.success(origin);
+        } else {
+            return ResponseBean.error("更新失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 删除我的行程
+     * @param id
+     * @return
+     * @throws Exception
+     */
+    @DeleteMapping("/wx/travel/{id}")
+    @ApiOperation(value="删除我的行程", notes = "删除我的行程", httpMethod = "DELETE", response = TaTravel.class)
+    public ResponseBean deleteTravel(@ApiParam("行程ID") @PathVariable String id) throws Exception {
+        TaTravelPerson taTravelPerson = iTaTravelPersonService.getByPerson(getCurrentPerson().getPersonId(), id);
+        if (null == taTravelPerson) {
+            return ResponseBean.error("未找到删除内容", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        if (iTaTravelPersonService.removeById(taTravelPerson.getSerialNo())) {
+            TaTravel taTravel = iTaTravelService.getById(id);
+            if (null != taTravel) {
+                iTaTravelService.removeLogicById(taTravel);
+            }
+
+            return ResponseBean.success(null);
+        } else {
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 查看我的行程
+     * @param id
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/wx/travel/{id}")
+    @ApiOperation(value="我的行程详情", notes = "我的行程详情", httpMethod = "GET", response = TaTravel.class)
+    public ResponseBean getMineTravel(@ApiParam("行程ID") @PathVariable String id) throws Exception {
+        TaTravelPerson taTravelPerson = iTaTravelPersonService.getByPerson(getCurrentPerson().getPersonId(), id);
+        if (null == taTravelPerson) {
+            return ResponseBean.error("未找到行程内容", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        TaTravel origin = iTaTravelService.getById(id);
+        if (null == origin || origin.getStatus() == Constants.STATUS_DELETED) {
+            return ResponseBean.error("没有找到行程信息", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TravelDataVO travelDataVO = new TravelDataVO();
+        BeanUtils.copyProperties(origin, travelDataVO);
 
-        // 返回所有数据
+        List<TravelItemDataVO> travelItemDetails = iTaTravelItemService.getTravelItemDetails(id);
+        travelDataVO.setTravelItemList(travelItemDetails);
 
-        return ResponseBean.success(null);
+        return ResponseBean.success(travelDataVO);
     }
 
-//
-//    /**
-//     * 分页查询列表
-//     * @param pageNum
-//     * @param pageSize
-//     * @return
-//     */
-//    @RequestMapping(value="/taPv",method= RequestMethod.GET)
-//    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-//    public ResponseBean taPvList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-//									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-//
-//		    IPage<TaPv> pg = new Page<>(pageNum, pageSize);
-//            QueryWrapper<TaPv> queryWrapper = new QueryWrapper<>();
-//            queryWrapper.orderByDesc("create_date");
-//
-//            IPage<TaPv> result = iTaPvService.page(pg, queryWrapper);
-//            return ResponseBean.success(result);
-//    }
-//
-//    /**
-//     * 保存对象
-//     * @param taPv 实体对象
-//     * @return
-//     */
-//    @RequestMapping(value="/taPv",method= RequestMethod.POST)
-//    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-//    public ResponseBean taPvAdd(@ApiParam("保存内容") @RequestBody TaPv taPv) throws Exception{
-//
-//        if (iTaPvService.save(taPv)){
-//            return ResponseBean.success(taPv);
-//        }else {
-//            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//    }
-//
-//    /**
-//     * 根据id删除对象
-//     * @param id  实体ID
-//     */
-//    @RequestMapping(value="/taPv/{id}", method= RequestMethod.DELETE)
-//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-//    public ResponseBean taPvDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-//        if(iTaPvService.removeLogicById(id)){
-//            return ResponseBean.success("success");
-//        }else {
-//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//    }
-//
-//    /**
-//     * 修改对象
-//     * @param id  实体ID
-//     * @param taPv 实体对象
-//     * @return
-//     */
-//    @RequestMapping(value="/taPv/{id}",method= RequestMethod.PUT)
-//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-//    public ResponseBean taPvUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-//                                        @ApiParam("更新内容") @RequestBody TaPv taPv) throws Exception{
-//
-//        if (iTaPvService.updateById(taPv)){
-//            return ResponseBean.success(iTaPvService.getById(id));
-//        }else {
-//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//    }
-//
-//    /**
-//     * 根据id查询对象
-//     * @param id  实体ID
-//     */
-//    @RequestMapping(value="/taPv/{id}",method= RequestMethod.GET)
-//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-//    public ResponseBean taPvGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-//        return ResponseBean.success(iTaPvService.getById(id));
-//    }
 }

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

@@ -0,0 +1,114 @@
+package com.yunzhi.shigongli.controller;
+
+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.entity.TaTravel;
+import com.yunzhi.shigongli.entity.TaTravelItem;
+import com.yunzhi.shigongli.entity.TaTravelPerson;
+import com.yunzhi.shigongli.entity.TaUv;
+import com.yunzhi.shigongli.service.ITaTravelItemService;
+import com.yunzhi.shigongli.service.ITaTravelPersonService;
+import com.yunzhi.shigongli.service.ITaTravelService;
+import com.yunzhi.shigongli.service.ITaUvService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.models.auth.In;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+    * 行程地点 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+
+@Api(tags = "行程地点")
+@RestController
+@RequestMapping("/")
+public class TaTravelItemController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaTravelItemController.class);
+
+    @Autowired
+    public ITaTravelService iTaTravelService;
+
+    @Autowired
+    public ITaTravelItemService iTaTravelItemService;
+
+    @Autowired
+    public ITaTravelPersonService iTaTravelPersonService;
+
+
+    /**
+     * 保存我的行程地点
+     * @param id
+     * @param taTravelItem
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/wx/travel/{id}/travel-item")
+    @ApiOperation(value="保存我的行程地点", notes = "保存我的行程地点", httpMethod = "GET", response = TaTravel.class)
+    public ResponseBean saveTravelItem(@ApiParam("行程ID") @PathVariable String id,
+                                       @ApiParam("保存内容") @RequestBody TaTravelItem taTravelItem) throws Exception {
+        TaTravelPerson taTravelPerson = iTaTravelPersonService.getByPerson(getCurrentPerson().getPersonId(), id);
+        if (null == taTravelPerson) {
+            return ResponseBean.error("未找到更新内容", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        if (StringUtils.isEmpty(taTravelItem.getTargetType()) || StringUtils.isEmpty(taTravelItem.getTargetId())) {
+            return ResponseBean.error("没有正确设置关联地点", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        if (null == taTravelItem.getDayOrder() || taTravelItem.getDayOrder() < 1) {
+            taTravelItem.setDayOrder(1);
+        }
+
+        // 获取最大序号
+        Integer maxNo = iTaTravelItemService.getMaxNoOf(id, taTravelItem.getDayOrder());
+        if (maxNo == null) {
+            maxNo = 0;
+        }
+
+        taTravelItem.setTravelId(id);
+        taTravelItem.setSortNo(maxNo + 1);
+
+        if (iTaTravelItemService.save(taTravelItem)) {
+            return ResponseBean.success(taTravelItem);
+        } else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 删除我的行程地点
+     * @param id
+     * @param no
+     * @return
+     * @throws Exception
+     */
+    @DeleteMapping("/wx/travel/{id}/travel-item/{no}")
+    @ApiOperation(value="删除我的行程地点", notes = "删除我的行程地点", httpMethod = "DELETE", response = TaTravel.class)
+    public ResponseBean saveTravelItem(@ApiParam("行程ID") @PathVariable String id,
+                                       @ApiParam("行程地点ID") @PathVariable String no) throws Exception {
+        TaTravelPerson taTravelPerson = iTaTravelPersonService.getByPerson(getCurrentPerson().getPersonId(), id);
+        if (null == taTravelPerson) {
+            return ResponseBean.error("未找到更新内容", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        if (iTaTravelItemService.removeById(no)) {
+            return ResponseBean.success(null);
+        } else {
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+}

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

@@ -0,0 +1,29 @@
+package com.yunzhi.shigongli.controller;
+
+import com.yunzhi.shigongli.event.SendMessageTask;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/task")
+public class TaskController {
+
+    @Autowired
+    SendMessageTask sendMessageTask;
+
+    @GetMapping("/hello")
+    public String hello() {
+        return "Hello !";
+    }
+
+    @GetMapping("/hotel/check-out")
+    public void hotelCheckOut() {
+        try {
+            sendMessageTask.hotelCheckOut();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

src/main/java/com/yunzhi/shigongli/event/SendMessageTask.java

@@ -37,7 +37,7 @@ public class SendMessageTask {
     /**
      * 离店消息
      */
-    @Scheduled(cron = "0 0 11 * * ?")
+//    @Scheduled(cron = "0 0 11 * * ?")
     public void hotelCheckOut() {
         String today = DateUtils.toString(LocalDateTime.now(), "yyyy-MM-dd");
 

src/main/java/com/yunzhi/shigongli/event/listener/OpenShareEventListener.java

@@ -2,10 +2,14 @@ package com.yunzhi.shigongli.event.listener;
 
 import com.yunzhi.shigongli.event.OpenShareEvent;
 import com.yunzhi.shigongli.service.ITaShareOpenService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
 
+@Component
 public class OpenShareEventListener implements ApplicationListener<OpenShareEvent> {
 
+    @Autowired
     ITaShareOpenService iTaShareOpenService;
 
     @Override

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

@@ -19,5 +19,5 @@ public interface TaNoteMapper extends BaseMapper<TaNote> {
 
     IPage<TaNote> getPageBy(IPage<TaNote> pg, @Param("noteType") String noteType, @Param("summary") String summary);
 
-    IPage<TaNote> getWxPageBy(IPage<TaNote> pg, @Param("personId") String personId, @Param("location") String location);
+    IPage<TaNote> getWxPageBy(IPage<TaNote> pg, @Param("personId") String personId, @Param("location") String location, @Param("summary") String summary);
 }

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

@@ -2,7 +2,12 @@ package com.yunzhi.shigongli.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yunzhi.shigongli.entity.TaNoteResource;
+import com.yunzhi.shigongli.entity.TaResource;
+import com.yunzhi.shigongli.vo.ResourceListVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +20,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaNoteResourceMapper extends BaseMapper<TaNoteResource> {
 
+    List<ResourceListVO> getResourceListBy(@Param("noteId") String noteId, @Param("personId") String personId);
 }

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

@@ -34,4 +34,6 @@ public interface TaResourceMapper extends BaseMapper<TaResource> {
                                         @Param("targetType") String targetType);
 
     ResourceListVO getDetailByTarget(@Param("targetType") String targetType, @Param("targetId")  String targetId, @Param("location") String location);
+
+    IPage<ResourceListVO> getWxRecommend(IPage<ResourceListVO> pg, @Param("personId")  String personId, @Param("location") String location);
 }

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

@@ -23,6 +23,7 @@ public interface TaShopPackageMapper extends BaseMapper<TaShopPackage> {
 
     IPage<ShopPackageVO> getProfilePage(IPage<TaShopPackage> pg,
                                         @Param("shopId") String shopId,
+                                        @Param("packageCategory") String packageCategory,
                                         @Param("description") String description);
 
     IPage<TaShopPackage> getWxPackageList(IPage<TaShopPackage> pg,
@@ -38,5 +39,6 @@ public interface TaShopPackageMapper extends BaseMapper<TaShopPackage> {
     int removeByShop(@Param("shopId") String shopId);
 
     List<ShopPackageVO> getProfileList(@Param("shopId") String shopId,
+                                       @Param("packageCategory") String packageCategory,
                                        @Param("description") String description);
 }

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

@@ -2,9 +2,12 @@ package com.yunzhi.shigongli.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yunzhi.shigongli.entity.TaTravelItem;
+import com.yunzhi.shigongli.vo.TravelItemDataVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 行程地点表 Mapper 接口
@@ -17,4 +20,8 @@ import org.apache.ibatis.annotations.Param;
 public interface TaTravelItemMapper extends BaseMapper<TaTravelItem> {
 
     int copyTravelItems(@Param("srcId") String srcId, @Param("targId") String targId);
+
+    List<TravelItemDataVO> getTravelItemDetails(@Param("travelId") String travelId);
+
+    Integer getMaxNoOf(@Param("travelId") String travelId, @Param("dayOrder") Integer dayOrder);
 }

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

@@ -1,9 +1,14 @@
 package com.yunzhi.shigongli.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaTravel;
+import com.yunzhi.shigongli.vo.TravelDataVO;
+import com.yunzhi.shigongli.vo.TravelListVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -18,4 +23,12 @@ import java.util.List;
 public interface TaTravelMapper extends BaseMapper<TaTravel> {
 
     List<TaTravel> getAllDestinyTemplate();
+
+    List<TravelDataVO> getPersonTravel(@Param("personId") String personId, @Param("travelId") String travelId);
+
+    IPage<TravelDataVO> getPersonTravelPaged(IPage<TravelDataVO> pg, @Param("personId") String personId, @Param("travelId") String travelId);
+
+    IPage<TravelListVO> getAdminListPaged(IPage<TravelListVO> pg, @Param("phone") String phone, @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate);
+
+    IPage<TaTravel> getAdminDestinyList(IPage<TaTravel> pg, @Param("title") String title, @Param("status") Integer status);
 }

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

@@ -3,7 +3,9 @@ package com.yunzhi.shigongli.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yunzhi.shigongli.entity.TaTravel;
 import com.yunzhi.shigongli.entity.TaTravelPerson;
+import com.yunzhi.shigongli.vo.TravelDataVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -16,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaTravelPersonMapper extends BaseMapper<TaTravelPerson> {
 
+    TravelDataVO getDestinyTravel(@Param("personId") String personId);
 }

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

@@ -1,6 +1,8 @@
 package com.yunzhi.shigongli.service;
 
 import com.yunzhi.shigongli.entity.TaNoteResource;
+import com.yunzhi.shigongli.entity.TaResource;
+import com.yunzhi.shigongli.vo.ResourceListVO;
 
 import java.util.List;
 
@@ -17,4 +19,6 @@ public interface ITaNoteResourceService extends IBaseService<TaNoteResource> {
     boolean updateResource(String noteId, List<TaNoteResource> resourceList) throws Exception;
 
     List<TaNoteResource> getListBy(String noteId);
+
+    List<ResourceListVO> getResourceListBy(String noteId, String personId);
 }

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

@@ -16,5 +16,5 @@ import com.yunzhi.shigongli.entity.TaPerson;
 public interface ITaNoteService extends IBaseService<TaNote> {
     IPage<TaNote> getPageBy(IPage<TaNote> pg, String noteType, String summary);
 
-    IPage<TaNote> getWxPageBy(IPage<TaNote> pg, TaPerson taPerson, String location);
+    IPage<TaNote> getWxPageBy(IPage<TaNote> pg, TaPerson taPerson, String location, String summary);
 }

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

@@ -33,4 +33,6 @@ public interface ITaResourceService extends IBaseService<TaResource> {
     IPage<ResourceListVO> searchList(IPage<ResourceListVO> pg, TaPerson currentPerson, String location, String q, String targetType);
 
     ResourceListVO getDetailByTarget(String targetType, String targetId, String location);
+
+    IPage<ResourceListVO> getWxRecommend(IPage<ResourceListVO> pg, String personId, String location);
 }

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

@@ -25,7 +25,7 @@ public interface ITaShopPackageService extends IBaseService<TaShopPackage> {
 
     ShopPackageVO getProfileById(String id);
 
-    IPage<ShopPackageVO> getProfilePage(IPage<TaShopPackage> pg, String shopId, String description);
+    IPage<ShopPackageVO> getProfilePage(IPage<TaShopPackage> pg, String shopId, String packageCategory, String description);
 
     IPage<TaShopPackage> getWxPackageList(IPage<TaShopPackage> page, String shopId, TaPerson currentPerson);
 

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

@@ -1,6 +1,9 @@
 package com.yunzhi.shigongli.service;
 
 import com.yunzhi.shigongli.entity.TaTravelItem;
+import com.yunzhi.shigongli.vo.TravelItemDataVO;
+
+import java.util.List;
 
 
 /**
@@ -13,4 +16,9 @@ import com.yunzhi.shigongli.entity.TaTravelItem;
  */
 public interface ITaTravelItemService extends IBaseService<TaTravelItem> {
 
+    Integer getMaxNoOf(String travelId, Integer dayOrder);
+
+    List<TravelItemDataVO> getTravelItemDetails(String travelId);
+
+    List<TravelItemDataVO> updateTravelItems(String travelId, List<TravelItemDataVO> travelItemList) throws Exception;
 }

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

@@ -2,6 +2,7 @@ package com.yunzhi.shigongli.service;
 
 import com.yunzhi.shigongli.entity.TaTravel;
 import com.yunzhi.shigongli.entity.TaTravelPerson;
+import com.yunzhi.shigongli.vo.TravelDataVO;
 
 
 /**
@@ -15,4 +16,8 @@ import com.yunzhi.shigongli.entity.TaTravelPerson;
 public interface ITaTravelPersonService extends IBaseService<TaTravelPerson> {
 
     TaTravel getAndCopyDestinyTravel(String personId) throws Exception;
+
+    TaTravelPerson getByPerson(String personId, String travelId);
+
+    TravelDataVO getDestinyTravel(String personId);
 }

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

@@ -1,6 +1,12 @@
 package com.yunzhi.shigongli.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaTravel;
+import com.yunzhi.shigongli.vo.TravelDataVO;
+import com.yunzhi.shigongli.vo.TravelListVO;
+
+import java.time.LocalDateTime;
+import java.util.List;
 
 
 /**
@@ -13,4 +19,11 @@ import com.yunzhi.shigongli.entity.TaTravel;
  */
 public interface ITaTravelService extends IBaseService<TaTravel> {
 
+    TravelDataVO getPersonSingleTravel(String personId, String travelId);
+
+    IPage<TravelDataVO> getPersonAllList(IPage<TravelDataVO> pg, String personId, Boolean simple);
+
+    IPage<TravelListVO> getAdminList(IPage<TravelListVO> pg, String phone, LocalDateTime startDate, LocalDateTime endDate);
+
+    IPage<TaTravel> getAdminDestinyList(IPage<TaTravel> pg, String title, Integer status);
 }

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

@@ -1,10 +1,11 @@
 package com.yunzhi.shigongli.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.yunzhi.shigongli.entity.TaNote;
 import com.yunzhi.shigongli.entity.TaNoteResource;
+import com.yunzhi.shigongli.entity.TaResource;
 import com.yunzhi.shigongli.mapper.TaNoteResourceMapper;
 import com.yunzhi.shigongli.service.ITaNoteResourceService;
+import com.yunzhi.shigongli.vo.ResourceListVO;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -43,4 +44,9 @@ public class TaNoteResourceServiceImpl extends BaseServiceImpl<TaNoteResourceMap
 
         return list(queryWrapper);
     }
+
+    @Override
+    public List<ResourceListVO> getResourceListBy(String noteId, String personId) {
+        return baseMapper.getResourceListBy(noteId, personId);
+    }
 }

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

@@ -24,7 +24,7 @@ public class TaNoteServiceImpl extends BaseServiceImpl<TaNoteMapper, TaNote> imp
     }
 
     @Override
-    public IPage<TaNote> getWxPageBy(IPage<TaNote> pg, TaPerson taPerson, String location) {
-        return baseMapper.getWxPageBy(pg, taPerson.getPersonId(), location);
+    public IPage<TaNote> getWxPageBy(IPage<TaNote> pg, TaPerson taPerson, String location, String summary) {
+        return baseMapper.getWxPageBy(pg, taPerson.getPersonId(), location, summary);
     }
 }

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

@@ -142,6 +142,19 @@ public class TaResourceServiceImpl extends BaseServiceImpl<TaResourceMapper, TaR
         return baseMapper.getDetailByTarget(targetType, targetId, location);
     }
 
+    /**
+     * 微信推荐
+     * 推荐位展示逻辑：1.种草的优先展示，2.种草的地点相关的标签的次之，3.距离远近最后；
+     * @param pg
+     * @param personId
+     * @param location
+     * @return
+     */
+    @Override
+    public IPage<ResourceListVO> getWxRecommend(IPage<ResourceListVO> pg, String personId, String location) {
+        return baseMapper.getWxRecommend(pg, personId, location);
+    }
+
     private TaSearch createSearchLog(String word, String personId) {
         TaSearch taSearch = new TaSearch();
         taSearch.setPersonId(personId);

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

@@ -143,12 +143,12 @@ public class TaShopPackageServiceImpl extends BaseServiceImpl<TaShopPackageMappe
     }
 
     @Override
-    public IPage<ShopPackageVO> getProfilePage(IPage<TaShopPackage> pg, String shopId, String description) {
+    public IPage<ShopPackageVO> getProfilePage(IPage<TaShopPackage> pg, String shopId, String packageCategory, String description) {
         if (null != pg) {
-            return baseMapper.getProfilePage(pg, shopId, description);
+            return baseMapper.getProfilePage(pg, shopId, packageCategory, description);
         } else {
             IPage<ShopPackageVO> result = new Page<>();
-            List <ShopPackageVO> list = baseMapper.getProfileList(shopId, description);
+            List <ShopPackageVO> list = baseMapper.getProfileList(shopId, packageCategory, description);
             result.setRecords(list);
             return result;
         }

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

@@ -1,10 +1,18 @@
 package com.yunzhi.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yunzhi.shigongli.entity.TaTravel;
 import com.yunzhi.shigongli.entity.TaTravelItem;
 import com.yunzhi.shigongli.mapper.TaTravelItemMapper;
+import com.yunzhi.shigongli.mapper.TaTravelMapper;
 import com.yunzhi.shigongli.service.ITaTravelItemService;
+import com.yunzhi.shigongli.vo.TravelItemDataVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 行程地点 服务实现类
@@ -16,4 +24,51 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaTravelItemServiceImpl extends BaseServiceImpl<TaTravelItemMapper, TaTravelItem> implements ITaTravelItemService {
 
+    @Autowired
+    TaTravelMapper taTravelMapper;
+
+    @Override
+    public Integer getMaxNoOf(String travelId, Integer dayOrder) {
+        return baseMapper.getMaxNoOf(travelId, dayOrder);
+    }
+
+    @Override
+    public List<TravelItemDataVO> getTravelItemDetails(String travelId) {
+        return baseMapper.getTravelItemDetails(travelId);
+    }
+
+    /**
+     * 保存 行程明细
+     * @param travelId
+     * @param travelItemList
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public List<TravelItemDataVO> updateTravelItems(String travelId, List<TravelItemDataVO> travelItemList) throws Exception {
+
+        // 先删除所有
+        QueryWrapper<TaTravelItem> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("travel_id", travelId);
+        remove(queryWrapper);
+
+        // 再插入所有
+
+        List<TaTravelItem> travelItems = new ArrayList<>();
+        int cursor = 0;
+        for (TravelItemDataVO item : travelItemList) {
+            TaTravelItem travelItem = new TaTravelItem();
+            travelItem.setTravelId(travelId);
+            travelItem.setTargetType(item.getTargetType());
+            travelItem.setTargetId(item.getTargetId());
+            travelItem.setDayOrder(1);
+            travelItem.setSortNo(cursor++);
+            travelItems.add(travelItem);
+        }
+
+        // 保存明细
+        saveBatch(travelItems);
+
+        return getTravelItemDetails(travelId);
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.yunzhi.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.shigongli.common.MathUtils;
 import com.yunzhi.shigongli.entity.TaTravel;
 import com.yunzhi.shigongli.entity.TaTravelPerson;
@@ -7,6 +8,7 @@ import com.yunzhi.shigongli.mapper.TaTravelItemMapper;
 import com.yunzhi.shigongli.mapper.TaTravelMapper;
 import com.yunzhi.shigongli.mapper.TaTravelPersonMapper;
 import com.yunzhi.shigongli.service.ITaTravelPersonService;
+import com.yunzhi.shigongli.vo.TravelDataVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -65,4 +67,18 @@ public class TaTravelPersonServiceImpl extends BaseServiceImpl<TaTravelPersonMap
 
         return copyTravel;
     }
+
+    @Override
+    public TaTravelPerson getByPerson(String personId, String travelId) {
+        QueryWrapper<TaTravelPerson> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("person_id", personId);
+        queryWrapper.eq("travel_id", travelId);
+
+        return getOne(queryWrapper);
+    }
+
+    @Override
+    public TravelDataVO getDestinyTravel(String personId) {
+        return baseMapper.getDestinyTravel(personId);
+    }
 }

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

@@ -1,10 +1,19 @@
 package com.yunzhi.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaTravel;
+import com.yunzhi.shigongli.mapper.TaTravelItemMapper;
 import com.yunzhi.shigongli.mapper.TaTravelMapper;
 import com.yunzhi.shigongli.service.ITaTravelService;
+import com.yunzhi.shigongli.vo.TravelDataVO;
+import com.yunzhi.shigongli.vo.TravelItemDataVO;
+import com.yunzhi.shigongli.vo.TravelListVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  * 分享表 服务实现类
@@ -16,4 +25,44 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaTravelServiceImpl extends BaseServiceImpl<TaTravelMapper, TaTravel> implements ITaTravelService {
 
+    @Autowired
+    TaTravelItemMapper taTravelItemMapper;
+
+    @Override
+    public TravelDataVO getPersonSingleTravel(String personId, String travelId) {
+        List<TravelDataVO> travelDataVOList = baseMapper.getPersonTravel(personId, travelId);
+
+        if (null == travelDataVOList || travelDataVOList.size() < 1) {
+            return null;
+        }
+
+        TravelDataVO travelDataVO = travelDataVOList.get(0);
+        List<TravelItemDataVO> itemDataVOList = taTravelItemMapper.getTravelItemDetails(travelId);
+        travelDataVO.setTravelItemList(itemDataVOList);
+
+        return travelDataVO;
+    }
+
+    @Override
+    public IPage<TravelDataVO> getPersonAllList(IPage<TravelDataVO> pg, String personId, Boolean simple) {
+        IPage<TravelDataVO> travelDataVOPage = baseMapper.getPersonTravelPaged(pg, personId, null);
+        if (simple || null == travelDataVOPage || null == travelDataVOPage.getRecords()) return travelDataVOPage;
+
+        for (TravelDataVO travelDataVO : travelDataVOPage.getRecords()) {
+            List<TravelItemDataVO> itemDataVOList = taTravelItemMapper.getTravelItemDetails(travelDataVO.getTravelId());
+            travelDataVO.setTravelItemList(itemDataVOList);
+        }
+
+        return travelDataVOPage;
+    }
+
+    @Override
+    public IPage<TravelListVO> getAdminList(IPage<TravelListVO> pg, String phone, LocalDateTime startDate, LocalDateTime endDate) {
+        return baseMapper.getAdminListPaged(pg, phone, startDate, endDate);
+    }
+
+    @Override
+    public IPage<TaTravel> getAdminDestinyList(IPage<TaTravel> pg, String title, Integer status) {
+        return baseMapper.getAdminDestinyList(pg, title, status);
+    }
 }

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

@@ -2,6 +2,7 @@ package com.yunzhi.shigongli.vo;
 
 import com.yunzhi.shigongli.entity.TaImage;
 import com.yunzhi.shigongli.entity.TaNoteResource;
+import com.yunzhi.shigongli.entity.TaResource;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -51,4 +52,7 @@ public class NoteVO {
 
     @ApiModelProperty(value = "笔记资源")
     private List<TaNoteResource> resourceList;
+
+    @ApiModelProperty(value = "笔记资源-微信端")
+    private List<ResourceListVO> wxResourceList;
 }

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

@@ -15,4 +15,16 @@ public class ResourceListVO extends TaResource {
 
     @ApiModelProperty(value = "距离")
     Float distance;
+
+    @ApiModelProperty(value = "是否种草")
+    Integer isVisited;
+
+    @ApiModelProperty(value = "区位ID")
+    private String areaId;
+
+    @ApiModelProperty(value = "区位名称")
+    private String areaName;
+
+    @ApiModelProperty(value = "区位父级名称")
+    private String areaPName;
 }

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

@@ -0,0 +1,48 @@
+package com.yunzhi.shigongli.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@ApiModel(value="TravelDataVO", description="行程数据")
+@Data
+public class TravelDataVO {
+    @ApiModelProperty(value = "行程ID")
+    private String travelId;
+
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "天数")
+    private Integer dayNum;
+
+    @ApiModelProperty(value = "是否命定行程")
+    private Boolean isDestiny;
+
+    @ApiModelProperty(value = "是否系统内定")
+    private Boolean isSystem;
+
+    @ApiModelProperty(value = "权重")
+    private Integer weight;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "序号")
+    private String serialNo;
+
+    @ApiModelProperty(value = "人员ID")
+    private String personId;
+
+    @ApiModelProperty(value = "是否隐藏")
+    private Boolean isHidden;
+
+    @ApiModelProperty(value = "行程地点")
+    List<TravelItemDataVO> travelItemList;
+}

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

@@ -0,0 +1,69 @@
+package com.yunzhi.shigongli.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value="TravelItemDataVO", description="行程地点")
+@Data
+public class TravelItemDataVO {
+    @ApiModelProperty(value = "项目地点ID")
+    private String itemId;
+
+    @ApiModelProperty(value = "第几天")
+    private Integer dayOrder;
+
+    @ApiModelProperty(value = "对象类型")
+    private String targetType;
+
+    @ApiModelProperty(value = "对象ID")
+    private String targetId;
+
+    @ApiModelProperty(value = "权重")
+    private Integer sortNo;
+
+    @ApiModelProperty(value = "resourceNo")
+    private Integer resourceNo;
+
+    @ApiModelProperty(value = "访问对象ID")
+    private String targetName;
+
+    @ApiModelProperty(value = "点赞数")
+    private Integer likeNum;
+
+    @ApiModelProperty(value = "浏览量")
+    private Integer pvNum;
+
+    @ApiModelProperty(value = "用户数")
+    private Integer uvNum;
+
+    @ApiModelProperty(value = "主图")
+    private String poster;
+
+    @ApiModelProperty(value = "文案")
+    private String title;
+
+    @ApiModelProperty(value = "经度")
+    private String lng;
+
+    @ApiModelProperty(value = "纬度")
+    private String lat;
+
+    @ApiModelProperty(value = "均价")
+    private Integer averagePrice;
+
+    @ApiModelProperty(value = "权重")
+    private Integer weight;
+
+    @ApiModelProperty(value = "所属区")
+    private String cityId;
+
+    @ApiModelProperty(value = "区位ID")
+    private String areaId;
+
+    @ApiModelProperty(value = "区位名称")
+    private String areaName;
+
+    @ApiModelProperty(value = "区位父级名称")
+    private String areaPName;
+}

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

@@ -0,0 +1,26 @@
+package com.yunzhi.shigongli.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@ApiModel(description = "行程列表")
+@Data
+public class TravelListVO {
+    @ApiModelProperty("行程ID")
+    String travelId;
+
+    @ApiModelProperty("创建人昵称")
+    String nickName;
+
+    @ApiModelProperty("创建人手机")
+    String phone;
+
+    @ApiModelProperty("创建时间")
+    LocalDateTime createDate;
+
+    @ApiModelProperty("行程内容")
+    String travelContent;
+}

src/main/resources/application.yml

@@ -16,6 +16,7 @@ interceptor:
       - /wx/login
       - /wxpay/notify/order
       - /mp/portal/**
+      - /task/**
       - /swagger-ui/**
       - /swagger-resources/**
       - /v2/**

src/main/resources/mapper/TaNoteMapper.xml

@@ -44,6 +44,11 @@
                     d.distance DESC
                     LIMIT 1
             ) s ON s.note_id = t.note_id
+        WHERE
+            t.`status` > - 1
+        <if test="summary != null and summary != ''">
+            AND t.summary LIKE CONCAT( '%', #{summary}, '%' )
+        </if>
         ORDER BY
             IF
                 ( s.note_id IS NULL, 0, 1 ) DESC,

src/main/resources/mapper/TaNoteResourceMapper.xml

@@ -2,4 +2,44 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.shigongli.mapper.TaNoteResourceMapper">
 
+    <select id="getResourceListBy" resultType="com.yunzhi.shigongli.vo.ResourceListVO">
+        SELECT
+            s.*,
+            <if test="personId != null and personId != ''">
+                IFNULL(m.visited_num, 0) as is_visited,
+            </if>
+            <if test="personId == null or personId == ''">
+                0 as is_visited,
+            </if>
+            c.area_name,
+            d.area_id,
+            d.area_name AS area_p_name
+        FROM
+            ta_note_resource t
+                INNER JOIN ta_resource s ON s.resource_no = t.resource_no
+                <if test="personId != null and personId != ''">
+                LEFT JOIN (
+                    SELECT
+                        b.target_type,
+                        b.target_id,
+                        count( 1 ) AS visited_num
+                    FROM
+                        ta_travel_person a
+                            INNER JOIN ta_travel_item b ON a.travel_id = b.travel_id
+                    WHERE
+                        a.person_id = #{personId}
+                    GROUP BY
+                        b.target_type,
+                        b.target_id
+                ) m ON m.target_type = s.target_type
+                    AND m.target_id = s.target_id
+                </if>
+                LEFT JOIN td_city c ON c.area_id = s.city_id
+                LEFT JOIN td_city d ON d.area_id = c.area_p_id
+        WHERE
+            t.note_id = #{noteId}
+          AND s.`status` > - 1
+        ORDER BY
+            t.serial_no ASC
+    </select>
 </mapper>

src/main/resources/mapper/TaTargetQuotaMapper.xml → src/main/resources/mapper/TaResourceMapper.xml

@@ -92,4 +92,49 @@
             AND t.target_id = #{targetId}
             AND t.`status` > -1
     </select>
+    <select id="getWxRecommend" resultType="com.yunzhi.shigongli.vo.ResourceListVO">
+        SELECT
+            t.*,
+            fn_distance ( #{location}, CONCAT( t.lng, ',', t.lat ) ) AS distance,
+            IF(s.cnt is null, 0, s.cnt) as is_visited,
+            c.area_name,
+            d.area_id,
+            d.area_name AS area_p_name
+        FROM
+            ta_resource t
+                LEFT JOIN (
+                SELECT
+                    b.target_type,
+                    b.target_id,
+                    count( * ) AS cnt
+                FROM
+                    ta_travel_person a
+                        INNER JOIN ta_travel_item b ON b.travel_id = a.travel_id
+                WHERE
+                    a.person_id = #{personId}
+                GROUP BY
+                    b.target_type,
+                    b.target_id
+            ) s ON s.target_type = t.target_type
+                AND s.target_id = t.target_id
+                LEFT JOIN (
+                SELECT
+                    b.target_type,
+                    b.target_id,
+                    count( * ) AS cnt
+                FROM
+                    ta_target_type b
+                GROUP BY
+                    b.target_type,
+                    b.target_id
+            ) m ON m.target_type = s.target_type
+                AND m.target_id = s.target_id
+                LEFT JOIN td_city c ON c.area_id = t.city_id
+                LEFT JOIN td_city d ON d.area_id = c.area_p_id
+        ORDER BY
+            IF( s.cnt IS NULL, 0, 1000000 + s.cnt ) DESC,
+            IF( m.cnt IS NULL, 0, 10000 + m.cnt ) DESC,
+            fn_distance ( #{location}, CONCAT( t.lng, ',', t.lat ) ) DESC,
+            t.weight DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaShopPackageMapper.xml

@@ -18,10 +18,13 @@
             s.strategy_level
         FROM
             ta_shop_package t
-            INNER JOIN ta_shop_package_setting s ON t.package_id = s.package_id
+            LEFT 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` > - 1
+            <if test="packageCategory != null and packageCategory != ''">
+                AND t.package_category = #{packageCategory}
+            </if>
             <if test="shopId != null and shopId != ''">
                 AND t.shop_id = #{shopId}
             </if>

src/main/resources/mapper/TaTravelItemMapper.xml

@@ -5,7 +5,7 @@
     <insert id="copyTravelItems">
         INSERT INTO ta_travel_item ( item_id, travel_id, day_order, target_type, target_id, sort_no )
         SELECT
-            REPLACE(UUID(), '-', ''),
+            UUID_SHORT(),
             #{targId},
             day_order,
             target_type,
@@ -16,4 +16,45 @@
         WHERE
             t.travel_id = #{srcId}
     </insert>
+    <select id="getTravelItemDetails" resultType="com.yunzhi.shigongli.vo.TravelItemDataVO">
+        SELECT
+            t.*,
+            s.resource_no,
+            s.like_num,
+            s.pv_num,
+            s.uv_num,
+            s.poster,
+            s.title,
+            s.lng,
+            s.lat,
+            s.average_price,
+            s.weight,
+            s.city_id,
+            s.save_num,
+            s.target_name,
+            c.area_name,
+            d.area_id,
+            d.area_name AS area_p_name
+        FROM
+            ta_travel_item t
+                INNER JOIN ta_resource s ON s.target_type = t.target_type
+                    AND s.target_id = t.target_id
+                LEFT JOIN td_city c ON c.area_id = s.city_id
+                LEFT JOIN td_city d ON d.area_id = c.area_p_id
+        WHERE
+            t.travel_id = #{travelId}
+          AND s.`status` &gt; -1
+        ORDER BY
+            t.day_order ASC,
+            t.sort_no ASC
+    </select>
+    <select id="getMaxNoOf" resultType="java.lang.Integer">
+        SELECT
+            max( t.sort_no )
+        FROM
+            ta_travel_item t
+        WHERE
+            t.travel_id = #{travelId}
+          AND t.day_order = #{dayOrder}
+    </select>
 </mapper>

src/main/resources/mapper/TaTravelMapper.xml

@@ -12,4 +12,99 @@
           AND t.is_destiny = 1
           AND t.`status` = 1
     </select>
+
+    <sql id="queryPersonTravel">
+        SELECT
+            t.*,
+            s.serial_no,
+            s.person_id,
+            s.is_hidden
+        FROM
+            ta_travel t
+            INNER JOIN ta_travel_person s ON s.travel_id = t.travel_id
+        WHERE
+            s.person_id = #{personId}
+            AND t.`status` > - 1
+            <if test="travelId != null and travelId != ''">
+                AND t.travel_id = #{travelId}
+            </if>
+        ORDER BY
+            t.weight DESC,
+            t.create_date DESC
+    </sql>
+
+    <select id="getPersonTravel" resultType="com.yunzhi.shigongli.vo.TravelDataVO">
+        <include refid="queryPersonTravel"></include>
+    </select>
+    <select id="getPersonTravelPaged" resultType="com.yunzhi.shigongli.vo.TravelDataVO">
+        <include refid="queryPersonTravel"></include>
+    </select>
+
+    <sql id="queryTravelList">
+        SELECT
+            p.nick_name,
+            p.phone,
+            m.travel_content,
+            t.create_date
+        FROM
+            ta_travel t
+            INNER JOIN ta_travel_person s ON s.travel_id = t.travel_id
+            INNER JOIN ta_person p ON p.person_id = s.person_id
+            INNER JOIN (
+                SELECT
+                    a.travel_id,
+                    a.target_type,
+                    a.target_id,
+                    GROUP_CONCAT( b.target_name ) AS travel_content
+                FROM
+                    ta_travel_item a
+                    INNER JOIN ta_resource b ON b.target_type = a.target_type
+                        AND b.target_id = a.target_id
+                GROUP BY
+                    a.travel_id,
+                    a.target_type,
+                    a.target_id
+            ) m ON m.travel_id = t.travel_id
+        WHERE
+            t.`status` &gt; - 1
+          <if test="phone != null and phone != ''">
+              AND p.phone LIKE CONCAT( '%', #{phone}, '%' )
+          </if>
+          <if test="startDate != null">
+            AND t.create_date &gt;= #{startDate}
+          </if>
+          <if test="endDate != null">
+            AND t.create_date &lt;= #{endDate}
+          </if>
+        GROUP BY
+            t.create_date DESC
+    </sql>
+
+    <select id="getAdminListPaged" resultType="com.yunzhi.shigongli.vo.TravelListVO">
+        <include refid="queryTravelList"></include>
+    </select>
+
+    <sql id="queryDestinyList">
+        SELECT
+            *
+        FROM
+            ta_travel t
+        WHERE
+            t.is_destiny = 1
+          AND t.is_system = 1
+          <if test="title != null and title != ''">
+              AND t.title LIKE CONCAT( '%', #{title}, '%' )
+          </if>
+          AND t.`status` &gt; - 1
+        <if test="status != null">
+            AND t.`status` = #{status}
+        </if>
+        ORDER BY
+            t.weight DESC,
+            t.create_date DESC
+    </sql>
+
+    <select id="getAdminDestinyList" resultType="com.yunzhi.shigongli.entity.TaTravel">
+        <include refid="queryDestinyList"></include>
+    </select>
 </mapper>

src/main/resources/mapper/TaTravelPersonMapper.xml

@@ -2,4 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.shigongli.mapper.TaTravelPersonMapper">
 
+    <select id="getDestinyTravel" resultType="com.yunzhi.shigongli.vo.TravelDataVO">
+        SELECT
+            t.*,
+            s.serial_no,
+            s.is_hidden,
+            s.person_id
+        FROM
+            ta_travel t
+                INNER JOIN ta_travel_person s ON s.travel_id = t.travel_id
+        WHERE
+            s.person_id = #{personId}
+          AND t.is_destiny = 1
+    </select>
 </mapper>