用户端热门推荐代码提交

nightFragrance-massage/src/main/java/com/ylx/home/hot/domain/vo/HotRecommendVO.java

@@ -16,7 +16,7 @@ import java.util.List;
 public class HotRecommendVO {
 
     // ===================== 通用字段（两种卡片都有） =====================
-    @ApiModelProperty(value = "卡片类型：1=技师商户，2=服务项目")
+    @ApiModelProperty(value = "卡片类型：1=商户，2=服务项目")
     private Integer cardType;
 
     @ApiModelProperty(value = "封面图", notes = "商户=技师头像/形象照，项目=服务封面")
@@ -29,11 +29,11 @@ public class HotRecommendVO {
     @ApiModelProperty(value = "商户名称/昵称")
     private String teNickName;
 
-    @ApiModelProperty(value = "技师评分")
+    @ApiModelProperty(value = "商户评分")
     private Integer nStar;
 
     @ApiModelProperty(value = "已服务订单总数")
-    private Integer serviceTotal;
+    private Integer serviceCount;
 
     @ApiModelProperty(value = "距离用户距离")
     private String distance;
@@ -59,4 +59,7 @@ public class HotRecommendVO {
 
     @ApiModelProperty(value = "总已售下单量")
     private Long salesCount;
+
+    @ApiModelProperty(value = "服务标签: 1=按摩 2=同城陪玩")
+    private Integer type;
 }

nightFragrance-massage/src/main/java/com/ylx/home/hot/service/impl/HomeHotRecommendServiceImpl.java

@@ -176,7 +176,7 @@ public class HomeHotRecommendServiceImpl implements HomeHotRecommendService {
         vo.setCoverImg(tech.getAvatar() != null ? tech.getAvatar() : tech.getTeAvatar());
         vo.setTeNickName(tech.getTeNickName());
         vo.setNStar(tech.getNStar());
-        vo.setServiceTotal(tech.getNNum());
+        vo.setServiceCount(tech.getNNum());
         // 距离兜底
         String distance = DistanceUtil.formatDisplay(userLat, userLng, tech.getLatitude(), tech.getLongitude());
         vo.setDistance(ObjectUtil.isNotEmpty(distance) ? distance : "距离未知");
@@ -204,6 +204,7 @@ public class HomeHotRecommendServiceImpl implements HomeHotRecommendService {
         vo.setHighlight(project.getHighlight());
         vo.setPriceMin(project.getPriceMin());
         vo.setSalesCount(project.getSalesCompleted());
+        vo.setType(project.getType());
 
         Integer unitType = project.getUnitType();
         String unitKey = ObjectUtil.isNotNull(unitType) ? unitType.toString() : "";

nightFragrance-massage/src/main/resources/mapper/project/ProjectMapper.xml

@@ -178,7 +178,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             standard_duration,
             unit_type,
             highlight,
-            sales_completed
+            sales_completed,
+            type
         FROM
             project
         WHERE