feats

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

@@ -8,6 +8,7 @@ import com.yunzhi.shigongli.common.Constants;
 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;
 import io.swagger.annotations.ApiOperation;
@@ -143,5 +144,17 @@ public class TaShopPackageController extends BaseController {
     }
 
 
+    /**
+     * 商铺套餐列表
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/wx/package/recommend",method= RequestMethod.GET)
+    @ApiOperation(value="推荐套餐列表", notes = "推荐套餐列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getWxRecommendList(@ApiParam("当前定位") @RequestParam(value ="location") String location) throws Exception{
+        List<ShopPackageRecommend> packageList = iTaShopPackageService.getWxRecommendList(location, getCurrentPerson());
+
+        return ResponseBean.success(packageList);
+    }
+
 
 }

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

@@ -7,9 +7,8 @@ import com.yunzhi.shigongli.common.BaseController;
 import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.ResponseBean;
 import com.yunzhi.shigongli.entity.TaResource;
-import com.yunzhi.shigongli.service.ITaImageService;
-import com.yunzhi.shigongli.service.ITaResourceService;
-import com.yunzhi.shigongli.service.ITaTargetTypeService;
+import com.yunzhi.shigongli.entity.TaSave;
+import com.yunzhi.shigongli.service.*;
 import com.yunzhi.shigongli.vo.ResourceFieldVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -23,7 +22,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import com.yunzhi.shigongli.service.ITaTouristService;
 import com.yunzhi.shigongli.entity.TaTourist;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -55,6 +53,9 @@ public class TaTouristController extends BaseController {
     @Autowired
     public ITaTargetTypeService taTargetTypeService;
 
+    @Autowired
+    public ITaSaveService iTaSaveService;
+
 
     /**
      * 分页查询列表
@@ -139,10 +140,38 @@ public class TaTouristController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/{plat}/taTourist/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taTourist/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taTouristGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        TaTourist taTourist = iTaTouristService.getById(id);
+        if (Constants.STATUS_DELETED.equals(taTourist.getStatus())) {
+            return ResponseBean.error("景点不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaResource taResource = taResourceService.getByTarget(Constants.TARGET_TOURIST, id);
+        taTourist.setPvNum(taResource.getPvNum());
+        taTourist.setUvNum(taResource.getUvNum());
+        taTourist.setLikeNum(taResource.getLikeNum());
+        taTourist.setImageList(iTaImageService.getListBy(Constants.TARGET_TOURIST, id));
+        taTourist.setTypeList(taTargetTypeService.getListBy(Constants.TARGET_TOURIST, id));
+
+        try {
+            taResourceService.recordPerson(Constants.TARGET_TOURIST, id, getCurrentPerson());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return ResponseBean.success(taTourist);
+    }
+
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/tourist/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taTouristGet(@ApiParam(value = "客户端", allowableValues = "wx,admin") @PathVariable String plat,
-                                     @ApiParam("对象ID") @PathVariable String id) throws Exception{
+    public ResponseBean getWxDetail(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         TaTourist taTourist = iTaTouristService.getById(id);
         if (Constants.STATUS_DELETED.equals(taTourist.getStatus())) {
             return ResponseBean.error("景点不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -155,12 +184,14 @@ public class TaTouristController extends BaseController {
         taTourist.setImageList(iTaImageService.getListBy(Constants.TARGET_TOURIST, id));
         taTourist.setTypeList(taTargetTypeService.getListBy(Constants.TARGET_TOURIST, id));
 
-        if ("wx".equals(plat)) {
-            try {
-                taResourceService.recordPerson(Constants.TARGET_TOURIST, id, getCurrentPerson());
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+        // 是否收藏
+        TaSave taSave = iTaSaveService.getByTarget(Constants.TARGET_TOURIST, id, getCurrentPerson().getPersonId());
+        taTourist.setIsSaved(null == taSave ? 0 : 1);
+
+        try {
+            taResourceService.recordPerson(Constants.TARGET_TOURIST, id, getCurrentPerson());
+        } catch (Exception e) {
+            e.printStackTrace();
         }
 
         return ResponseBean.success(taTourist);

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

@@ -112,13 +112,23 @@ public class TdCityController extends BaseController {
 //        }
 //    }
 //
-//    /**
-//     * 根据id查询对象
-//     * @param id  实体ID
-//     */
-//    @RequestMapping(value="/tdCity/{id}",method= RequestMethod.GET)
-//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-//    public ResponseBean tdCityGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-//        return ResponseBean.success(iTdCityService.getById(id));
-//    }
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/wx/city/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="获取地域信息", notes = "获取地域信息", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean tdCityGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        TdCity tdCity = iTdCityService.getById(id);
+        if (null == tdCity) {
+            return ResponseBean.error("未找到指定地区", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TdCity parent = iTdCityService.getById(tdCity.getAreaPId());
+        if (null != parent) {
+            tdCity.setAreaPName(parent.getAreaPName());
+        }
+
+        return ResponseBean.success(tdCity);
+    }
 }

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

@@ -64,4 +64,7 @@ public class TaResource implements Serializable {
 
     @ApiModelProperty(value = "权重")
     private Integer weight;
+
+    @ApiModelProperty(value = "所属区")
+    private String cityId;
 }

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

@@ -3,6 +3,8 @@ package com.yunzhi.shigongli.entity;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
@@ -70,5 +72,7 @@ public class TaShopPackage implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
-
+    @ApiModelProperty(value = "是否收藏")
+    @TableField(exist = false)
+    private Integer isSaved;
 }

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

@@ -96,4 +96,8 @@ public class TaTourist implements Serializable {
     @ApiModelProperty(value = "分类标签")
     @TableField(exist = false)
     private List<TaTargetType> typeList;
+
+    @ApiModelProperty(value = "是否收藏")
+    @TableField(exist = false)
+    private Integer isSaved;
 }

src/main/java/com/yunzhi/shigongli/entity/TdCity.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.io.Serializable;
 import io.swagger.annotations.ApiModel;
@@ -35,6 +36,10 @@ public class TdCity implements Serializable {
     @ApiModelProperty(value = "父级ID")
     private String areaPId;
 
+    @ApiModelProperty(value = "父级ID")
+    @TableField(exist = false)
+    private String areaPName;
+
     @ApiModelProperty(value = "等级")
     private String areaLevel;
 

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

@@ -3,10 +3,13 @@ package com.yunzhi.shigongli.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaShopPackage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.shigongli.vo.ShopPackageRecommend;
 import com.yunzhi.shigongli.vo.ShopPackageVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 商铺套餐 Mapper 接口
@@ -19,4 +22,14 @@ import org.apache.ibatis.annotations.Param;
 public interface TaShopPackageMapper extends BaseMapper<TaShopPackage> {
 
     IPage<ShopPackageVO> getProfilePage(IPage<TaShopPackage> pg, @Param("shopId") String shopId);
+
+    IPage<TaShopPackage> getWxPackageList(IPage<TaShopPackage> pg,
+                                          @Param("targetType") String targetType,
+                                          @Param("shopId") String shopId,
+                                          @Param("personId") String personId);
+
+    List<ShopPackageRecommend> getWxRecommendList(@Param("targetType") String targetType,
+                                                  @Param("location") String location,
+                                                  @Param("personId") String personId,
+                                                  @Param("limit") Integer limit);
 }

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

@@ -3,6 +3,7 @@ package com.yunzhi.shigongli.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.entity.TaShopPackage;
+import com.yunzhi.shigongli.vo.ShopPackageRecommend;
 import com.yunzhi.shigongli.vo.ShopPackageVO;
 
 import java.util.List;
@@ -27,4 +28,6 @@ public interface ITaShopPackageService extends IBaseService<TaShopPackage> {
     IPage<ShopPackageVO> getProfilePage(IPage<TaShopPackage> pg, String shopId);
 
     IPage<TaShopPackage> getWxPackageList(IPage<TaShopPackage> page, String shopId, TaPerson currentPerson);
+
+    List<ShopPackageRecommend> getWxRecommendList(String location, TaPerson taPerson) throws Exception ;
 }

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

@@ -12,6 +12,7 @@ import com.yunzhi.shigongli.mapper.TaShopPackageMapper;
 import com.yunzhi.shigongli.mapper.TaShopPackageSettingMapper;
 import com.yunzhi.shigongli.service.ITaShopPackageService;
 
+import com.yunzhi.shigongli.vo.ShopPackageRecommend;
 import com.yunzhi.shigongli.vo.ShopPackageVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -146,12 +147,13 @@ public class TaShopPackageServiceImpl extends BaseServiceImpl<TaShopPackageMappe
 
     @Override
     public IPage<TaShopPackage> getWxPackageList(IPage<TaShopPackage> pg, String shopId, TaPerson currentPerson) {
-        LambdaQueryWrapper<TaShopPackage> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(TaShopPackage::getShopId, shopId);
-        queryWrapper.eq(TaShopPackage::getStatus, Constants.STATUS_NORMAL);
-        queryWrapper.orderByDesc(TaShopPackage::getWeight);
-        queryWrapper.orderByDesc(TaShopPackage::getCreateDate);
+        return baseMapper.getWxPackageList(pg, Constants.TARGET_SHOP_PACKAGE, shopId, currentPerson.getPersonId());
+    }
 
-        return page(pg, queryWrapper);
+    @Override
+    public List<ShopPackageRecommend> getWxRecommendList(String location, TaPerson taPerson) {
+        // 默认获取 3 个
+        Integer limit = 3;
+        return baseMapper.getWxRecommendList(Constants.TARGET_SHOP_PACKAGE, location, taPerson.getPersonId(), limit);
     }
 }

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

@@ -37,4 +37,7 @@ public class ResourceFieldVO {
 
     @ApiModelProperty(value = "权重")
     private Integer weight;
+
+    @ApiModelProperty(value = "所属区")
+    private String cityId;
 }

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

@@ -0,0 +1,24 @@
+package com.yunzhi.shigongli.vo;
+
+
+import com.yunzhi.shigongli.entity.TaShopPackage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "商铺列表")
+@Data
+public class ShopPackageRecommend extends TaShopPackage {
+
+    @ApiModelProperty(value = "区位ID")
+    private String areaId;
+
+    @ApiModelProperty(value = "区位名称")
+    private String areaName;
+
+    @ApiModelProperty(value = "区位父级名称")
+    private String areaPName;
+
+    @ApiModelProperty(value = "评分")
+    private Float score;
+}

src/main/resources/mapper/TaShopPackageMapper.xml

@@ -21,4 +21,46 @@
             t.weight DESC,
             t.create_date DESC
     </select>
+    <select id="getWxPackageList" resultType="com.yunzhi.shigongli.entity.TaShopPackage">
+        SELECT
+            t.*,
+            IF
+                ( s.save_id IS NOT NULL, 1, 0 ) is_saved
+        FROM
+            ta_shop_package t
+                LEFT JOIN ta_save s ON s.target_type = #{targetType}
+                AND s.target_id = t.package_id
+                AND s.person_id = #{personId}
+        WHERE
+            t.`status` = 1
+          AND t.shop_id = #{shopId}
+        ORDER BY
+            t.weight DESC,
+            t.create_date DESC
+    </select>
+    <select id="getWxRecommendList" resultType="com.yunzhi.shigongli.vo.ShopPackageRecommend">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    t.*,
+                    fn_distance ( #{location}, s.locaton ) AS distance,
+                    ( s.sweet_score + s.environment_score + s.service_score ) / 3 AS score,
+                    IF ( m.save_id IS NULL, 0, 1 ) AS is_saved
+                FROM
+                    ta_shop_package t
+                        INNER JOIN ta_shop s ON s.shop_id = t.shop_id
+                        LEFT JOIN ta_save m ON m.target_type = #{targetType}
+                        AND m.target_id = t.package_id
+                        AND m.person_id = #{personId}
+                WHERE
+                    t.`status` = 1
+                  AND s.`status` = 1
+            ) a
+        ORDER BY
+            a.distance DESC,
+            a.weight DESC
+        LIMIT #{limit}
+    </select>
 </mapper>