From b30e1a48f2bc5f65a0efd2e69e090fed2d7a627c Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 15:56:43 +0800
Subject: [PATCH] #feat 订单退款和查询
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
index a74491c..0aa9a32 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
@@ -3,6 +3,7 @@
import java.util.List;
import com.panzhihua.common.model.vos.community.ComActPasswordVo;
+import com.panzhihua.common.model.vos.community.DataCount;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -41,7 +42,8 @@
@Select("<script> " + "SELECT\n" + "c.community_id,\n" + "c.`name`,\n"
+ "ST_Distance_Sphere ( Point ( #{lng}, #{lat} ), Point ( c.lng, c.lat ) ) AS distance \n" + "FROM\n"
- + "com_act c \n" + "ORDER BY\n" + "distance ASC"
+ + "com_act c \n" + " <where>" + "<if test='areaCode != null and areaCode.trim() != ""'>"
+ + "c.area_code = #{areaCode} \n" + " </if> " + " </where>" + "ORDER BY\n" + "distance ASC"
+ "<if test='lng != null and lng.trim() != ""'>" + " limit 100 " + " </if> " + "</script>")
List<ComActVO> listCommunity(ComActVO comActVO);
@@ -51,6 +53,8 @@
@Select("<script> " + "SELECT\n" + "a.* \n" + "FROM\n" + "com_act a \n" + " <where>"
+ "<if test='pageComActDTO.name != null and pageComActDTO.name.trim() != ""'>"
+ "and a.name LIKE concat( #{pageComActDTO.name}, '%' ) \n" + " </if> "
+ + "<if test='pageComActDTO.areaCode != null and pageComActDTO.areaCode.trim() != ""'>"
+ + "AND a.area_code = #{pageComActDTO.areaCode} \n" + " </if> "
+ "<if test='pageComActDTO.createAtBegin != null '>" + "AND a.create_at BETWEEN "
+ "#{pageComActDTO.createAtBegin} \n" + "AND #{pageComActDTO.createAtEnd}" + " </if> " + " </where>"
+ " order by a.create_at desc" + "</script>")
@@ -60,8 +64,8 @@
void updateAccountPassword(@Param("password") String password, @Param("account") String account,
@Param("communityId") Long communityId);
- @Select("select community_id,`name`,lng,lat from com_act where state = 0")
- List<EventGridCommunityAdminVO> getCommunityLists();
+ @Select("select community_id,`name`,lng,lat from com_act where state = 0 and app_id =#{appId}")
+ List<EventGridCommunityAdminVO> getCommunityLists(@Param("appId") String appId);
@Select("select ca.`name`,cmsap.province_name,cmsac.city_name,cmsad.district_name,ca.street_id,ca.community_id,cs.`name` as streetName from com_act as ca \n"
+ "left join com_mng_struct_area_province as cmsap on cmsap.province_adcode = ca.province_code\n"
@@ -70,8 +74,8 @@
+ "left join com_street as cs on cs.street_id = ca.street_id\n" + "where ca.community_id = ${communityId}")
ComPopulationActVO getPopulationActById(@Param("communityId") Long communityId);
- @Select("select `name`,street_id from com_street order by area_code asc")
- List<StreetAllAppletsVO> getStreetList(String areaCode);
+ @Select("select `name`,street_id from com_street where app_id = #{appId}")
+ List<StreetAllAppletsVO> getStreetList(String appId);
@Select("select ca.`name`,ca.street_id,ca.community_id,cs.`name` as streetName from com_act as ca left join com_street as cs on cs.street_id = ca.street_id where ca.state = 0 and ca.street_id = #{streetId}")
List<CommunitySwitchAllAppletsVO> getCommunityListByStreetId(@Param("streetId") Long streetId);
@@ -79,16 +83,17 @@
@Select("<script> select ca.`name`,ca.street_id,ca.community_id,cs.`name` as streetName " +
"from com_act as ca " +
"left join com_street as cs on cs.street_id = ca.street_id " +
- "where ca.state = 0 and ca.name like concat('%',#{name},'%') </script> ")
- List<CommunitySwitchAllAppletsVO> getCommunityListByName(@Param("name") String name,@Param("areaCode") String areaCode);
+ "where ca.state = 0 and ca.name like concat('%',#{name},'%') <if test='appId !=null and appId !=""'> and cs.app_id = #{appId} </if> </script> ")
+ List<CommunitySwitchAllAppletsVO> getCommunityListByName(@Param("name") String name,@Param("appId") String appId);
@Select("SELECT c.community_id, c.`name`, c.street_id, cs.`name` as streetName," +
"round( ST_Distance_Sphere ( Point ( #{communityDTO.longitude}, #{communityDTO.latitude} ), Point ( c.lng, c.lat ) )/ 1000, 2 ) AS distance " +
"FROM com_act c left join com_street as cs on cs.street_id = c.street_id " +
+ "where cs.area_code = #{communityDTO.areaCode} " +
"HAVING distance >= 0 and distance <= #{communityDTO.distance} ORDER BY distance ASC")
List<CommunitySwitchAllAppletsVO> getCommunityListByNearby(@Param("communityDTO") SearchCommunityDTO communityDTO);
- @Select("<script> select community_id,name,lng,lat from com_act where state = 0 </script>")
+ @Select("<script> select community_id,name,lng,lat from com_act where state = 0 <if test='areaCode !=null and areaCode !=""'> and area_code = #{areaCode} </if> </script>")
List<EventGridCommunityAdminVO> getWestCommunityLists(@Param("areaCode") String areCode);
@Select("select account,plaintext_password as password from com_act where community_id = ${communityId}")
@@ -109,4 +114,9 @@
@Select("select name from com_pb_check_unit where id=#{id}")
String selectUnitName(@Param("id") Long id);
+ @Select("select community_id from com_act where street_id=#{id}")
+ List<Long> selectCommunityByStreetId(Long id);
+ @Select("SELECT caa.community_id FROM com_act caa WHERE caa.`name` = ( select ca.`name` FROM com_act ca WHERE ca.community_id =#{id})")
+ List<Long> selectIds(@Param("id") Long id);
+
}
--
Gitblit v1.7.1