[fix]

增加门户的拼团banner列表

application-webadmin/src/main/java/com/tourism/webadmin/app/website/controller/WebsiteProjectGroupPurchaseBannerController.java

@@ -1,5 +1,7 @@
 package com.tourism.webadmin.app.website.controller;
 
+import com.tourism.common.additional.config.ApplicationConfig;
+import com.tourism.common.additional.utils.UrlConvertUtils;
 import com.tourism.common.core.constant.ErrorCodeEnum;
 import com.tourism.common.core.object.CallResult;
 import com.tourism.common.core.object.MyOrderParam;
@@ -41,6 +43,8 @@ public class WebsiteProjectGroupPurchaseBannerController {
 
     @Autowired
     private TourProjectGroupPurchaseBannerService tourProjectGroupPurchaseBannerService;
+    @Autowired
+    private ApplicationConfig applicationConfig;
 
     /**
      * 获取拼团Banner列表数据。
@@ -58,7 +62,11 @@ public class WebsiteProjectGroupPurchaseBannerController {
         String orderBy = MyOrderParam.buildOrderBy(myOrderParam, TourProjectGroupPurchaseBanner.class);
         List<TourProjectGroupPurchaseBanner> tourProjectGroupPurchaseBannerList =
                 tourProjectGroupPurchaseBannerService.getTourProjectGroupPurchaseBannerList(tourProjectGroupPurchaseBanner, orderBy);
-
-        return ResponseResult.success(MyModelUtil.copyCollectionTo(tourProjectGroupPurchaseBannerList,TourProjectGroupPurchaseBannerVo.class));
+        List<TourProjectGroupPurchaseBannerVo> tourProjectGroupPurchaseBannerVos =
+                MyModelUtil.copyCollectionTo(tourProjectGroupPurchaseBannerList, TourProjectGroupPurchaseBannerVo.class);
+        for(TourProjectGroupPurchaseBannerVo i: tourProjectGroupPurchaseBannerVos){
+            i.setImgUrlAfterConvert(UrlConvertUtils.urlConvertSingle(applicationConfig.getHostIpPort(), i.getImgUrl()));
+        }
+        return ResponseResult.success(tourProjectGroupPurchaseBannerVos);
     }
 }

application-webadmin/src/main/java/com/tourism/webadmin/back/dao/mapper/TourProjectGroupPurchaseBannerMapper.xml

@@ -6,7 +6,7 @@
         <result column="banner_name" jdbcType="VARCHAR" property="bannerName"/>
         <result column="enable" jdbcType="TINYINT" property="enable"/>
         <result column="img_url" jdbcType="VARCHAR" property="imgUrl"/>
-        <result column="banner_url" jdbcType="VARCHAR" property="bannerUrl"/>
+        <result column="project_id" jdbcType="BIGINT" property="projectId"/>
         <result column="show_order" jdbcType="TINYINT" property="showOrder"/>
         <result column="type" jdbcType="TINYINT" property="type"/>
         <result column="data_state" jdbcType="TINYINT" property="dataState"/>
@@ -22,7 +22,7 @@
             banner_name,
             enable,
             img_url,
-            banner_url,
+            project_id,
             show_order,
             type,
             data_state,
@@ -36,7 +36,7 @@
             #{item.bannerName},
             #{item.enable},
             #{item.imgUrl},
-            #{item.bannerUrl},
+            #{item.projectId},
             #{item.showOrder},
             #{item.type},
             #{item.dataState},
@@ -64,6 +64,9 @@
             <if test="tourProjectGroupPurchaseBannerFilter.enable != null">
                 AND tour_project_group_purchase_banner.enable = #{tourProjectGroupPurchaseBannerFilter.enable}
             </if>
+            <if test="tourProjectGroupPurchaseBannerFilter.projectId != null">
+                AND tour_project_group_purchase_banner.project_id = #{tourProjectGroupPurchaseBannerFilter.projectId}
+            </if>
             <if test="tourProjectGroupPurchaseBannerFilter.type != null">
                 AND tour_project_group_purchase_banner.type = #{tourProjectGroupPurchaseBannerFilter.type}
             </if>

application-webadmin/src/main/java/com/tourism/webadmin/back/dto/TourProjectGroupPurchaseBannerDto.java

@@ -49,10 +49,11 @@ public class TourProjectGroupPurchaseBannerDto {
     private String imgUrl;
 
     /**
-     * 跳转链接。
+     * 旅游项目id。
+     * NOTE: 可支持等于操作符的列表数据过滤。
      */
-    @Schema(description = "跳转链接。")
-    private String bannerUrl;
+    @Schema(description = "旅游项目id。可支持等于操作符的列表数据过滤。")
+    private Long projectId;
 
     /**
      * banner排序。

application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourProjectGroupPurchaseBanner.java

@@ -48,10 +48,10 @@ public class TourProjectGroupPurchaseBanner extends BaseModel {
     private String imgUrl;
 
     /**
-     * 跳转链接。
+     * 旅游项目id。
      */
-    @TableField(value = "banner_url")
-    private String bannerUrl;
+    @TableField(value = "project_id")
+    private Long projectId;
 
     /**
      * banner排序。
@@ -72,6 +72,13 @@ public class TourProjectGroupPurchaseBanner extends BaseModel {
     @TableField(value = "data_state")
     private Integer dataState;
 
+    @RelationOneToOne(
+            masterIdField = "projectId",
+            slaveModelClass = TourismProject.class,
+            slaveIdField = "id")
+    @TableField(exist = false)
+    private TourismProject tourismProject;
+
     @RelationConstDict(
             masterIdField = "enable",
             constantDictClass = Enable.class)

application-webadmin/src/main/java/com/tourism/webadmin/back/vo/TourProjectGroupPurchaseBannerVo.java

@@ -4,6 +4,8 @@ import com.tourism.common.core.base.vo.BaseVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -42,10 +44,10 @@ public class TourProjectGroupPurchaseBannerVo extends BaseVo {
     private String imgUrl;
 
     /**
-     * 跳转链接。
+     * 旅游项目id。
      */
-    @Schema(description = "跳转链接")
-    private String bannerUrl;
+    @Schema(description = "旅游项目id")
+    private Long projectId;
 
     /**
      * banner排序。
@@ -70,4 +72,10 @@ public class TourProjectGroupPurchaseBannerVo extends BaseVo {
      */
     @Schema(description = "type 常量字典关联数据")
     private Map<String, Object> typeDictMap;
+
+    /**
+     * imgUrlAfterConvert 转换后的图片URL。
+     */
+    @Schema(description = "imgUrlsAfterConvert 转换后的图片URL")
+    private String imgUrlAfterConvert;
 }