新增：返回网点资质及星级

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/dto/WebsiteRangeDTO.java

@@ -22,4 +22,6 @@ public class WebsiteRangeDTO implements Serializable {
     private Double lon;
     private Double lat;
     private Double distance;
+    private String content;
+    private Integer score;
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/CooperationController.java

@@ -3,6 +3,7 @@ package com.mmc.iuav.user.controller;
 import com.mmc.iuav.group.Insert;
 import com.mmc.iuav.group.Update;
 import com.mmc.iuav.response.ResultBody;
+import com.mmc.iuav.user.model.dto.WebsiteRangeDTO;
 import com.mmc.iuav.user.model.qo.ApplyQO;
 import com.mmc.iuav.user.model.vo.*;
 import com.mmc.iuav.user.service.CooperationService;
@@ -71,13 +72,13 @@ public class CooperationController extends BaseController {
     }
 
     @ApiOperation(value = "服务商网点数据")
-    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = WebsiteRangeDTO.class)})
     @GetMapping("service/bitmap")
-    public ResultBody listServiceBitmapData(@ApiParam(value = "类型  注：按照渠道标签的id传入即可") @RequestParam Integer type,
-                                            @RequestParam Integer pageNo,
-                                            @RequestParam Integer pageSize,
-                                            @RequestParam Double lon,
-                                            @RequestParam Double lat) {
+    public ResultBody<WebsiteRangeDTO> listServiceBitmapData(@ApiParam(value = "类型  注：按照渠道标签的id传入即可") @RequestParam Integer type,
+                                                             @RequestParam Integer pageNo,
+                                                             @RequestParam Integer pageSize,
+                                                             @RequestParam Double lon,
+                                                             @RequestParam Double lat) {
         return ResultBody.success(cooperationService.listServiceBitmapData(type, pageNo, pageSize, lon, lat));
     }
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/WebsiteInfoDO.java

@@ -25,6 +25,9 @@ public class WebsiteInfoDO implements Serializable {
     private Integer type;
     private Integer userApplyTag;
 
+    private String content;
+    private Integer score;
+
 
     public WebsiteRangeDTO buildWebsiteRangeDTO() {
         this.distance = this.distance == null ? 0 : (BigDecimal.valueOf(this.distance).setScale(2, BigDecimal.ROUND_HALF_DOWN)).doubleValue();
@@ -33,6 +36,8 @@ public class WebsiteInfoDO implements Serializable {
                 .address(address)
                 .lon(this.lon)
                 .lat(this.lat)
+                .content(content)
+                .score(score)
                 .distance(this.distance / 1000)
                 .build();
     }

csm-service/cms-service-user/src/main/resources/mapper/CooperationDao.xml

@@ -247,16 +247,21 @@
         where type = #{type}
     </select>
     <select id="listServiceBitmapData" resultType="com.mmc.iuav.user.entity.WebsiteInfoDO">
-        SELECT id,
-               `name`,
-               address,
-               lat,
-               lon,
-               `type`,
-               user_apply_tag,
-               st_distance_sphere(point(lon, lat), point(${lon}, ${lat})) as distance
-        FROM website_info
-        where type = #{type}
+        SELECT wi.id,
+               wi.`name`,
+               wi.address,
+               wi.lat,
+               wi.lon,
+               wi.type,
+               wi.user_apply_tag,
+               st_distance_sphere(
+                       point(wi.lon, wi.lat),
+                       point(${lon}, ${lat})) AS distance,
+               ua.content,
+               ua.score
+        FROM website_info wi
+                 INNER JOIN user_apply_tag ua ON wi.user_apply_tag = ua.id
+        WHERE wi.type = #{type}
         ORDER BY distance ASC
             LIMIT #{pageNo}, #{pageSize}
     </select>