feats

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

@@ -9,6 +9,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
+import java.util.Arrays;
+
 @Slf4j
 @Component
 public class Weather {
@@ -16,6 +18,43 @@ public class Weather {
     @Value("${amap.weather.api}")
     String api;
 
+    @Value("${amap.weather.backImage}")
+    private String backImage;
+
+    // 默认支持的背景图片
+    private String[] imageList = new String[] {
+            "中雨",
+            "中雪",
+            "冰雹",
+            "冻雨",
+            "多云",
+            "夜晚多云",
+            "夜晚扬沙",
+            "夜晚晴",
+            "夜晚沙尘暴",
+            "夜晚阵雨",
+            "夜晚降雪",
+            "夜晚雾",
+            "大雨",
+            "大雪",
+            "大雾",
+            "大风",
+            "小雨",
+            "小雪",
+            "无数据",
+            "晴",
+            "暴雨",
+            "暴雪",
+            "沙尘暴",
+            "阴",
+            "阵雨",
+            "阵雪",
+            "雨夹雪",
+            "雷阵雨",
+            "雷阵雨伴有冰雹",
+            "雾"
+    };
+
     public AMapWeather getWeather(String areaId) throws Exception {
         RestTemplate restTemplate = new RestTemplate();
 
@@ -46,4 +85,10 @@ public class Weather {
 
         return result;
     }
+
+    public String getBackgroundImage(String weatherName) {
+        boolean isExist = Arrays.stream(imageList).anyMatch(x -> x.equals(weatherName));
+        String imageName = isExist ? weatherName : "无数据";
+        return  String.format(backImage, imageName);
+    }
 }

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

@@ -4,7 +4,9 @@ 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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -52,20 +54,25 @@ public class TaFeedbackController extends BaseController {
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taFeedbackList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                        @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                       @ApiParam("是否管理首页") @RequestParam(value = "isIndex", required = false) Boolean isIndex ) throws Exception{
+                                       @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) throws Exception{
 
         IPage<TaFeedback> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaFeedback> queryWrapper = new QueryWrapper<>();
         queryWrapper.orderByDesc("create_date");
 
-        if (null != isIndex && isIndex) {
-            // 只查询近3天的, 且未读的数据
-            LocalDateTime dt = LocalDateTime.now().minusDays(3);
-            queryWrapper.ge("create_date", dt);
-            queryWrapper.eq("is_readed", 0);
+        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.page(pg, queryWrapper);
+        IPage<TaFeedback> result = iTaFeedbackService.getProfilePage(pg, startDate, endDate);
         return ResponseBean.success(result);
     }
 
@@ -124,7 +131,7 @@ public class TaFeedbackController extends BaseController {
     @RequestMapping(value="/admin/taFeedback/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taFeedbackGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        TaFeedback feedback = iTaFeedbackService.getById(id);
+        TaFeedback feedback = iTaFeedbackService.getProfileById(id);
 
         // 更新为已读
         if (null == feedback.getIsReaded() || !feedback.getIsReaded()) {

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

@@ -67,7 +67,8 @@ public class TaLikeController extends BaseController {
 
     /**
      * 保存对象
-     * @param taLike 实体对象
+     * @param targetType 实体对象
+     * @param targetId 实体对象
      * @return
      */
     @RequestMapping(value="/wx/{targetType}/like/{targetId}",method= RequestMethod.POST)
@@ -75,10 +76,16 @@ public class TaLikeController extends BaseController {
     public ResponseBean taLikeAdd(@ApiParam("对象类型") @PathVariable String targetType,
                                   @ApiParam("对象ID") @PathVariable String targetId) throws Exception{
 
+        String personId = getCurrentPerson().getPersonId();
+        TaLike origin = iTaLikeService.getByTarget(targetType, targetId, personId);
+        if (null != origin) {
+            return ResponseBean.success(origin);
+        }
+
         TaLike taLike = new TaLike();
         taLike.setTargetType(targetType);
         taLike.setTargetId(targetId);
-        taLike.setPersonId(getCurrentPerson().getPersonId());
+        taLike.setPersonId(personId);
         taLike.setCreateDate(LocalDateTime.now());
         if (iTaLikeService.save(taLike)){
             iTaResourceService.updateLike(taLike, 1);

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

@@ -4,9 +4,7 @@ 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.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
-import com.yunzhi.shigongli.common.BaseController;
-import com.yunzhi.shigongli.common.Constants;
-import com.yunzhi.shigongli.common.ResponseBean;
+import com.yunzhi.shigongli.common.*;
 import com.yunzhi.shigongli.entity.TaOrder;
 import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.service.ITaOrderPayService;
@@ -14,6 +12,7 @@ import com.yunzhi.shigongli.service.ITaOrderService;
 import com.yunzhi.shigongli.service.ITaVerifyTargetService;
 import com.yunzhi.shigongli.vo.MineOrder;
 import com.yunzhi.shigongli.vo.MineOrderSummary;
+import com.yunzhi.shigongli.vo.OrderSubListVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -25,6 +24,7 @@ import com.yunzhi.shigongli.service.ITaOrderSubService;
 import com.yunzhi.shigongli.entity.TaOrderSub;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -63,14 +63,20 @@ public class TaOrderSubController extends BaseController {
     @RequestMapping(value="/admin/taOrderSub",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taOrderSubList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @ApiParam("商家名称") @RequestParam(value = "shopName", required = false) String shopName,
+                                       @ApiParam("标题") @RequestParam(value = "description", required = false) String description,
+                                       @ApiParam(value = "下单时间", example = "2021-09-01") @RequestParam(value = "createDate", required = false) String createDate) throws Exception{
 
-		    IPage<TaOrderSub> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaOrderSub> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<OrderSubListVO> pg = new Page<>(pageNum, pageSize);
 
-            IPage<TaOrderSub> result = iTaOrderSubService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        LocalDateTime date = null;
+        if (!StringUtils.isEmpty(createDate)) {
+            date = DateUtils.from(createDate + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+        }
+
+        IPage<OrderSubListVO> result = iTaOrderSubService.getAdminPagedBy(pg, shopName, description, date);
+        return ResponseBean.success(result);
     }
 
     /**

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

@@ -59,9 +59,6 @@ public class TaRoomOrderController extends BaseController {
     @Autowired
     public ImageUtils imageUtils;
 
-    @Value("${amap.weather.backImage}")
-    private String backImage;
-
     /**
      * 分页查询列表
      * @param pageNum
@@ -116,10 +113,11 @@ public class TaRoomOrderController extends BaseController {
 //            return ResponseBean.error("民宿不存在或者状态异常", ResponseBean.ERROR_ILLEGAL_PARAMS);
 //        }
 
-        // 地区暂时是南京市秦淮区
-        AMapWeather weather = weatherUtil.getWeather("320104");
-        AMapWeather.Live live = weather.getLives().get(0);
-        String image = imageUtils.renderWeatherPic(live, String.format(backImage, "晴"));
+        // 地区暂时是南京市
+        AMapWeather weather = weatherUtil.getWeather("320100");
+        AMapWeather.Live liveWeather = weather.getLives().get(0);
+        String backgroundUrl = weatherUtil.getBackgroundImage(liveWeather.getWeather());
+        String image = imageUtils.renderWeatherPic(liveWeather, backgroundUrl);
 
         taRoomOrder.setHotelId(taRoom.getHotelId());
         taRoomOrder.setSharePerson(getCurrentPerson().getPersonId());
@@ -179,8 +177,9 @@ public class TaRoomOrderController extends BaseController {
     @GetMapping("/test-weather")
     public ResponseBean testWeather() throws Exception {
         AMapWeather weather = weatherUtil.getWeather("320105");
-
-        String image = imageUtils.renderWeatherPic(weather.getLives().get(0), "https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/weather/background_%E6%99%B4.png");
+        AMapWeather.Live liveWeather = weather.getLives().get(0);
+        String backgroundUrl = weatherUtil.getBackgroundImage(liveWeather.getWeather());
+        String image = imageUtils.renderWeatherPic(liveWeather, backgroundUrl);
 
         return ResponseBean.success(image);
     }

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

@@ -10,6 +10,7 @@ import com.yunzhi.shigongli.entity.TaLike;
 import com.yunzhi.shigongli.entity.TaSave;
 import com.yunzhi.shigongli.service.ITaResourceService;
 import com.yunzhi.shigongli.service.ITaSaveService;
+import com.yunzhi.shigongli.vo.SavedVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -42,25 +43,23 @@ public class TaSaveController extends BaseController {
     @Autowired
     public ITaResourceService iTaResourceService;
 
-//
-//    /**
-//     * 分页查询列表
-//     * @param pageNum
-//     * @param pageSize
-//     * @return
-//     */
-//    @RequestMapping(value="/admin/save",method= RequestMethod.GET)
-//    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-//    public ResponseBean taLikeList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-//									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-//
-//		    IPage<TaSave> pg = new Page<>(pageNum, pageSize);
-//            QueryWrapper<TaSave> queryWrapper = new QueryWrapper<>();
-//            queryWrapper.orderByDesc("create_date");
-//
-//            IPage<TaSave> result = iTaSaveService.page(pg, queryWrapper);
-//            return ResponseBean.success(result);
-//    }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/save",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taLikeList(@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<SavedVO> pg = new Page<>(pageNum, pageSize);
+        IPage<SavedVO> result = iTaSaveService.getPageBy(pg, getCurrentPerson().getPersonId(), location);
+        return ResponseBean.success(result);
+    }
 
     /**
      * 保存对象
@@ -70,10 +69,17 @@ public class TaSaveController extends BaseController {
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taLikeAdd(@ApiParam("对象类型") @PathVariable String targetType,
                                   @ApiParam("对象ID") @PathVariable String targetId) throws Exception{
+
+        String personId = getCurrentPerson().getPersonId();
+        TaSave origin = iTaSaveService.getByTarget(targetType, targetId, personId);
+        if (null != origin) {
+            return ResponseBean.success(origin);
+        }
+
         TaSave taSave = new TaSave();
         taSave.setTargetType(targetType);
         taSave.setTargetId(targetId);
-        taSave.setPersonId(getCurrentPerson().getPersonId());
+        taSave.setPersonId(personId);
         taSave.setCreateDate(LocalDateTime.now());
 
         if (iTaSaveService.save(taSave)){

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

@@ -1,6 +1,7 @@
 package com.yunzhi.shigongli.entity;
 
 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;
@@ -45,4 +46,8 @@ public class TaFeedback implements Serializable {
     @ApiModelProperty(value = "读取时间")
     private LocalDateTime readDate;
 
+    @ApiModelProperty(value = "手机号码")
+    @TableField(exist = false)
+    private String phone;
+
 }

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

@@ -67,6 +67,9 @@ public class TaVerifyTarget implements Serializable {
     @ApiModelProperty(value = "子单号")
     private String subOrderId;
 
+    @ApiModelProperty(value = "所属商户")
+    private String shopId;
+
     @ApiModelProperty(value = "所属客户")
     private String personId;
 

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

@@ -1,8 +1,12 @@
 package com.yunzhi.shigongli.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaFeedback;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -15,4 +19,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaFeedbackMapper extends BaseMapper<TaFeedback> {
 
+    TaFeedback getProfileById(Integer id);
+
+    IPage<TaFeedback> getProfilePage(IPage<TaFeedback> pg, @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaOrderSub;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yunzhi.shigongli.vo.MineOrder;
+import com.yunzhi.shigongli.vo.OrderSubListVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -46,4 +47,9 @@ public interface TaOrderSubMapper extends BaseMapper<TaOrderSub> {
 
 
     MineOrder getSingleOrderSubOf(@Param("personId") String personId, @Param("targetType") String targetType, @Param("subOrderId") Integer subOrderId);
+
+    IPage<OrderSubListVO> getAdminPagedBy(IPage<OrderSubListVO> pg,
+                                          @Param("shopName") String shopName,
+                                          @Param("description") String description,
+                                          @Param("createDate") LocalDateTime createDate);
 }

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

@@ -1,8 +1,11 @@
 package com.yunzhi.shigongli.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaSave;
+import com.yunzhi.shigongli.vo.SavedVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +18,8 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaSaveMapper extends BaseMapper<TaSave> {
 
+    IPage<SavedVO> getPageBy(IPage<SavedVO> pg,
+                             @Param("personId") String personId,
+                             @Param("location") String location,
+                             @Param("targetShopPackage") String targetShopPackage);
 }

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

@@ -1,7 +1,10 @@
 package com.yunzhi.shigongli.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaFeedback;
 
+import java.time.LocalDateTime;
+
 
 /**
  * <p>
@@ -13,4 +16,7 @@ import com.yunzhi.shigongli.entity.TaFeedback;
  */
 public interface ITaFeedbackService extends IBaseService<TaFeedback> {
 
+    TaFeedback getProfileById(Integer id);
+
+    IPage<TaFeedback> getProfilePage(IPage<TaFeedback> pg, LocalDateTime startDate, LocalDateTime endDate);
 }

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

@@ -7,6 +7,7 @@ import com.yunzhi.shigongli.entity.TaOrderSub;
 import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.vo.MineOrder;
 import com.yunzhi.shigongli.vo.MineOrderSummary;
+import com.yunzhi.shigongli.vo.OrderSubListVO;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -34,4 +35,6 @@ public interface ITaOrderSubService extends IBaseService<TaOrderSub> {
     Integer getTotalCharges(String targetType, String targetId, LocalDateTime start, LocalDateTime end);
 
     MineOrder getSingleOrderSubOf(TaPerson taPerson, Integer subOrderId);
+
+    IPage<OrderSubListVO> getAdminPagedBy(IPage<OrderSubListVO> pg, String shopName, String description, LocalDateTime createDate);
 }

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

@@ -1,6 +1,8 @@
 package com.yunzhi.shigongli.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaSave;
+import com.yunzhi.shigongli.vo.SavedVO;
 
 
 /**
@@ -16,4 +18,7 @@ public interface ITaSaveService extends IBaseService<TaSave> {
     boolean removeBy(String targetType, String targetId, String personId);
 
     TaSave getByTarget(String targetType, String targetId, String personId);
+
+    IPage<SavedVO> getPageBy(IPage<SavedVO> pg, String personId, String location);
+
 }

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

@@ -1,11 +1,14 @@
 package com.yunzhi.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaFeedback;
 import com.yunzhi.shigongli.mapper.TaFeedbackMapper;
 import com.yunzhi.shigongli.service.ITaFeedbackService;
 
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 意见反馈 服务实现类
@@ -17,4 +20,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaFeedbackServiceImpl extends BaseServiceImpl<TaFeedbackMapper, TaFeedback> implements ITaFeedbackService {
 
+    @Override
+    public TaFeedback getProfileById(Integer id) {
+        return baseMapper.getProfileById(id);
+    }
+
+    @Override
+    public IPage<TaFeedback> getProfilePage(IPage<TaFeedback> pg, LocalDateTime startDate, LocalDateTime endDate) {
+        return baseMapper.getProfilePage(pg, startDate, endDate);
+    }
 }

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

@@ -147,6 +147,7 @@ public class TaOrderPayServiceImpl extends BaseServiceImpl<TaOrderPayMapper, TaO
                 taVerifyTarget.setOrderDate(item.getCreateDate());
                 taVerifyTarget.setOrderId(item.getOrderId());
                 taVerifyTarget.setSubOrderId(item.getSubOrderId());
+                taVerifyTarget.setShopId(item.getShopId());
                 taVerifyTarget.setPersonId(taPerson.getPersonId());
                 taVerifyTarget.setIsVerified(false);
                 taVerifyTarget.setIsConfirmVerified(false);

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

@@ -9,6 +9,7 @@ import com.yunzhi.shigongli.service.ITaOrderSubService;
 
 import com.yunzhi.shigongli.vo.MineOrder;
 import com.yunzhi.shigongli.vo.MineOrderSummary;
+import com.yunzhi.shigongli.vo.OrderSubListVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -105,12 +106,6 @@ public class TaOrderSubServiceImpl extends BaseServiceImpl<TaOrderSubMapper, TaO
 
     @Override
     public IPage<MineOrder> getOrderSubListOf(IPage<MineOrder> pg, TaPerson taPerson, Integer status, String orderId, Integer isVerified) {
-        if (null != isVerified && isVerified > 0) {
-            isVerified = 1;
-        } else {
-            isVerified = null;
-        }
-
         return baseMapper.getOrderSubListOf(pg, taPerson.getPersonId(), Constants.TARGET_SHOP, status, orderId, isVerified);
     }
 
@@ -145,6 +140,11 @@ public class TaOrderSubServiceImpl extends BaseServiceImpl<TaOrderSubMapper, TaO
         return baseMapper.getSingleOrderSubOf(taPerson.getPersonId(), Constants.TARGET_SHOP, subOrderId);
     }
 
+    @Override
+    public IPage<OrderSubListVO> getAdminPagedBy(IPage<OrderSubListVO> pg, String shopName, String description, LocalDateTime createDate) {
+        return baseMapper.getAdminPagedBy(pg, shopName, description, createDate);
+    }
+
     /**
      * 商铺抽成入账户
      * @param shopId

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

@@ -1,9 +1,12 @@
 package com.yunzhi.shigongli.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.entity.TaSave;
 import com.yunzhi.shigongli.mapper.TaSaveMapper;
 import com.yunzhi.shigongli.service.ITaSaveService;
+import com.yunzhi.shigongli.vo.SavedVO;
 import org.springframework.stereotype.Service;
 
 /**
@@ -34,4 +37,10 @@ public class TaSaveServiceImpl extends BaseServiceImpl<TaSaveMapper, TaSave> imp
         queryWrapper.eq(TaSave::getPersonId, personId);
         return getOne(queryWrapper);
     }
+
+    @Override
+    public IPage<SavedVO> getPageBy(IPage<SavedVO> pg, String personId, String location) {
+        return baseMapper.getPageBy(pg, personId, location, Constants.TARGET_SHOP_PACKAGE);
+    }
+
 }

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

@@ -0,0 +1,27 @@
+package com.yunzhi.shigongli.vo;
+
+
+import com.yunzhi.shigongli.entity.TaOrderSub;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "订单内容")
+@Data
+public class OrderSubListVO extends TaOrderSub {
+
+    @ApiModelProperty("所属商家")
+    private String shopName;
+
+    @ApiModelProperty("图片")
+    private String poster;
+
+    @ApiModelProperty("用户ID")
+    private String personId;
+
+    @ApiModelProperty("用户昵称")
+    private String nickName;
+
+    @ApiModelProperty("用户手机")
+    private String phone;
+}

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

@@ -0,0 +1,50 @@
+package com.yunzhi.shigongli.vo;
+
+import com.yunzhi.shigongli.entity.TaResource;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+
+@ApiModel(description = "收藏内容")
+@Data
+public class SavedVO extends TaResource {
+
+    @ApiModelProperty(value = "收藏ID")
+    private Integer saveId;
+
+    @ApiModelProperty(value = "收藏时间")
+    private LocalDateTime saveDate;
+
+    @ApiModelProperty(value = "口味评分")
+    private Float sweetScore;
+
+    @ApiModelProperty(value = "环境评分")
+    private Float environmentScore;
+
+    @ApiModelProperty(value = "服务评分")
+    private Float serviceScore;
+
+    @ApiModelProperty(value = "门市价格")
+    private Integer standardPrice;
+
+    @ApiModelProperty(value = "实际价格")
+    private Integer actualPrice;
+
+    @ApiModelProperty(value = "返现金额")
+    private Integer cashback;
+
+    @ApiModelProperty(value = "距离/米")
+    private Integer distance;
+
+    @ApiModelProperty(value = "商铺ID")
+    private String shopId;
+
+    @ApiModelProperty(value = "区域名称")
+    private String areaName;
+
+    @ApiModelProperty(value = "父级区域名称")
+    private String areaPName;
+}

src/main/resources/application.yml

@@ -67,7 +67,7 @@ weixin:
 amap:
   weather:
     api: https://restapi.amap.com/v3/weather/weatherInfo?key=3be0a9567a794d2690d378476f057a6f&city=%s&extensions=base&output=JSON
-    backImage: https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/weather/background_%s.png
+    backImage: https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/weather/%s.png
 
 sysBiz:
   miniapp:

src/main/resources/mapper/TaFeedbackMapper.xml

@@ -2,4 +2,30 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.shigongli.mapper.TaFeedbackMapper">
 
+    <select id="getProfileById" resultType="com.yunzhi.shigongli.entity.TaFeedback">
+        SELECT
+            t.*,
+            s.phone
+        FROM
+            ta_feedback t
+                INNER JOIN ta_person s ON s.person_id = t.person_id
+        WHERE
+            t.feedback_id = #{id}
+    </select>
+    <select id="getProfilePage" resultType="com.yunzhi.shigongli.entity.TaFeedback">
+        SELECT
+            t.*,
+            s.phone
+        FROM
+            ta_feedback t
+                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>
+        ORDER BY t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaOrderSubMapper.xml

@@ -60,9 +60,6 @@
           <if test="isVerified != null">
               AND t.is_verified = #{isVerified}
           </if>
-          <if test="isVerified == null">
-              AND (t.is_verified = 0 OR t.is_verified IS NULL)
-          </if>
           <if test="status == null">
               AND t.`status` &gt; - 1
           </if>
@@ -122,4 +119,32 @@
             AND s.person_id = #{personId}
             AND s.`status` &gt; - 1
     </select>
+    <select id="getAdminPagedBy" resultType="com.yunzhi.shigongli.vo.OrderSubListVO">
+        SELECT
+            t.*,
+            n.shop_name,
+            m.poster,
+            s.order_id,
+            p.nick_name,
+            p.phone
+        FROM
+            ta_order_sub t
+                INNER JOIN ta_order s ON s.order_id = t.order_id
+                INNER JOIN ta_shop_package m ON m.package_id = t.package_id
+                INNER JOIN ta_shop n ON n.shop_id = m.shop_id
+                INNER JOIN ta_person p ON p.person_id = s.person_id
+        WHERE
+            s.`status` &gt; - 1
+          <if test="shopName != null and shopName != ''">
+              AND n.shop_name LIKE CONCAT( '%', #{shopName}, '%' )
+          </if>
+          <if test="description != null and description != ''">
+              AND t.description LIKE CONCAT( '%', #{description}, '%' )
+          </if>
+          <if test="createDate != null">
+              AND t.create_date &gt;= #{createDate}
+          </if>
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaSaveMapper.xml

@@ -2,4 +2,65 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.shigongli.mapper.TaSaveMapper">
 
+    <select id="getPageBy" resultType="com.yunzhi.shigongli.vo.SavedVO">
+        SELECT *
+        FROM (
+                 SELECT t.save_id,
+                        t.create_date                                       AS save_date,
+                        t.person_id,
+                        s.*,
+                        0                                                   AS sweet_score,
+                        0                                                   AS environment_score,
+                        0                                                   AS service_score,
+                        0                                                   AS standard_price,
+                        0                                                   AS actual_price,
+                        0                                                   AS cashback,
+                        fn_distance(CONCAT(s.lng, ',', s.lat), #{location}) AS distance,
+                        NULL                                                AS shop_id,
+                        m.area_name,
+                        n.area_name                                         AS area_p_name
+                 FROM ta_save t
+                          INNER JOIN ta_resource s ON s.target_type = t.target_type
+                     AND s.target_id = t.target_id
+                          LEFT JOIN td_city m ON m.area_id = s.city_id
+                          LEFT JOIN td_city n ON n.area_id = m.area_p_id
+                 WHERE t.person_id = #{personId}
+                 UNION
+                 SELECT a.save_id,
+                        a.create_date                            AS save_date,
+                        a.person_id,
+                        NULL                                     AS resource_no,
+                        a.target_type,
+                        a.target_id,
+                        0                                        AS like_num,
+                        0                                        AS pv_num,
+                        0                                        AS uv_num,
+                        b.poster,
+                        b.description                            AS title,
+                        SUBSTRING_INDEX(c.locaton, ',', 1) - 0   AS lng,
+                        SUBSTRING_INDEX(c.locaton, ',', - 1) - 0 AS lat,
+                        c.average_price,
+                        c.weight,
+                        0                                        AS save_num,
+                        c.city_id,
+                        b.`status`,
+                        c.sweet_score,
+                        c.environment_score,
+                        c.service_score,
+                        b.standard_price,
+                        b.actual_price,
+                        b.cashback,
+                        fn_distance(c.locaton, #{location})      AS distance,
+                        c.shop_id,
+                        d.area_name,
+                        e.area_name                              AS area_p_name
+                 FROM ta_save a
+                          INNER JOIN ta_shop_package b ON b.package_id = a.target_id
+                          INNER JOIN ta_shop c ON c.shop_id = b.shop_id
+                          LEFT JOIN td_city d ON d.area_id = c.city_id
+                          LEFT JOIN td_city e ON e.area_id = d.area_p_id
+                 WHERE a.person_id = #{personId}
+                   AND a.target_type = #{targetShopPackage}
+             ) tab ORDER BY tab.weight DESC, tab.save_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaVerifyTargetMapper.xml

@@ -8,15 +8,14 @@
             s.phone
         FROM
             ta_verify_target t
-                INNER JOIN ta_person s ON s.person_id = t.person_id
-                INNER JOIN ta_order_sub m ON m.package_id = t.target_id
+            INNER JOIN ta_person s ON s.person_id = t.person_id
         WHERE
             t.`status` > - 1
           <if test="personId != null and personId != ''">
               AND s.person_id = #{personId}
           </if>
           <if test="shopId != null and shopId != ''">
-              AND m.shop_id = #{shopId}
+              AND t.shop_id = #{shopId}
           </if>
           <if test="phone != null and phone != ''">
             AND s.phone = #{phone}