diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java index faa952e..782dbe8 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java @@ -69,6 +69,8 @@ public class AppScenicController { resp.setImageSourceStoreDay(scenicConfig.getImageSourceStoreDay()); resp.setUserSourceExpireDay(scenicConfig.getUserSourceExpireDay()); resp.setBrokerDirectRate(scenicConfig.getBrokerDirectRate()); + resp.setVideoSourcePackHint(scenicConfig.getVideoSourcePackHint()); + resp.setImageSourcePackHint(scenicConfig.getImageSourcePackHint()); return ApiResponse.success(resp); } diff --git a/src/main/java/com/ycwl/basic/model/pc/scenic/entity/ScenicConfigEntity.java b/src/main/java/com/ycwl/basic/model/pc/scenic/entity/ScenicConfigEntity.java index 98189ab..74783f5 100644 --- a/src/main/java/com/ycwl/basic/model/pc/scenic/entity/ScenicConfigEntity.java +++ b/src/main/java/com/ycwl/basic/model/pc/scenic/entity/ScenicConfigEntity.java @@ -88,4 +88,7 @@ public class ScenicConfigEntity { private PayAdapterType payType; private String payConfigJson; + + private String imageSourcePackHint; + private String videoSourcePackHint; } diff --git a/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicConfigResp.java b/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicConfigResp.java index 92da7eb..bd37c70 100644 --- a/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicConfigResp.java +++ b/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicConfigResp.java @@ -42,4 +42,7 @@ public class ScenicConfigResp { private Integer imageSourceStoreDay; private Integer userSourceExpireDay; private BigDecimal brokerDirectRate; + + private String imageSourcePackHint; + private String videoSourcePackHint; } diff --git a/src/main/resources/mapper/ScenicMapper.xml b/src/main/resources/mapper/ScenicMapper.xml index 5c7f8d9..4accb24 100644 --- a/src/main/resources/mapper/ScenicMapper.xml +++ b/src/main/resources/mapper/ScenicMapper.xml @@ -34,6 +34,9 @@ <if test="radius!=null"> radius=#{radius}, </if> + <if test="status!=null"> + status=#{status}, + </if> <if test="province!=null and province!=''"> province=#{province}, </if> @@ -120,7 +123,9 @@ face_type=#{faceType}, face_config_json=#{faceConfigJson}, pay_type=#{payType}, - pay_config_json=#{payConfigJson} + pay_config_json=#{payConfigJson}, + image_source_pack_hint=#{imageSourcePackHint}, + video_source_pack_hint=#{videoSourcePackHint} </set> where id = #{id} </update> @@ -191,9 +196,9 @@ </if> </select> <select id="getAppById" resultType="com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO"> - select s.id, `name`, `phone`, introduction, logo_url,cover_url, longitude, latitude, radius, province, city, area, address, kf_code_url, kf_phone + select s.id, `name`, `phone`, introduction, logo_url,cover_url, longitude, latitude, radius, province, city, area, address, kf_code_url, kf_phone, status from scenic s - where `status` = 1 and s.id = #{id} + where s.id = #{id} </select> <select id="scenicListByLnLa" resultType="com.ycwl.basic.model.mobile.scenic.ScenicAppVO"> select s.id,