From 82735e4d46ac7b9969facef2acc8f8e793b68f71 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 15 九月 2025 16:11:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/MemberMapper.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/MemberMapper.java b/server/services/src/main/java/com/doumee/dao/business/MemberMapper.java
index 9438b6c..afb2f5b 100644
--- a/server/services/src/main/java/com/doumee/dao/business/MemberMapper.java
+++ b/server/services/src/main/java/com/doumee/dao/business/MemberMapper.java
@@ -2,11 +2,28 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.Member;
+import com.github.yulichang.base.MPJBaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.List;
/**
* @author 姹熻箘韫�
* @date 2025/07/09 12:00
*/
-public interface MemberMapper extends BaseMapper<Member> {
+public interface MemberMapper extends MPJBaseMapper<Member> {
+
+ @Select(" select * , " +
+ " ifnull((select r.level from receive_weight r where r.RECEIVE_MAX > RECEIVE_NUM and RECEIVE_NUM > r.RECEIVE_MIN limit 1 ),0) as level ," +
+ " ifnull( (select CONVERT( ST_Distance_Sphere ( POINT ( ii.lgt, ii.lat ), POINT ( #{lgt}, #{lat} )) /1000,DECIMAL(15,2)) from identity_info ii where ii.AUDIT_STATUS = 2 and type = 0 and ii.member_id = ID limit 1 ),0) as distance " +
+ " from member " +
+ " where id in ( " +
+ " select ii.member_id from identity_info ii where ii.AUDIT_STATUS = 2 and type = #{orderType} " +
+ " and ( CONVERT( ST_Distance_Sphere ( POINT ( ii.lgt, ii.lat ), POINT ( #{lgt}, #{lat} )) /1000,DECIMAL(15,2))) < 100 " +
+ " ) and RELEASE_MEMBER_ID != #{releaseMemberId} " +
+ " order by level , score desc , distance asc ")
+ List<Member> getList(@Param("lgt") BigDecimal lgt, @Param("lat") BigDecimal lat, @Param("orderType") Integer orderType, @Param("releaseMemberId") Integer releaseMemberId);
}
--
Gitblit v1.9.3