From 772a2589061f58549c8bbf1490fdc153bedb584a Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 06 十二月 2022 15:04:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
index 817149c..999487c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -9,6 +9,7 @@
import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import com.panzhihua.common.model.vos.sanshuo.ComSanshuoExpertVO;
+import com.panzhihua.common.model.vos.shop.ComShopUserAddressVO;
import com.panzhihua.common.model.vos.user.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -89,7 +90,7 @@
DataKanbanDTO selectCommunityAddUserOrder(@Param("areaCode") String areaCode, @Param("date1") Date date1);
- List<UsersStatisticsDTO> selectDailyAdd(@Param("createAt") String createAt, @Param("appId") String appId);
+ List<UsersStatisticsDTO> selectDailyAdd(@Param("createAt") String createAt, @Param("appId") String appId);
List<UsersStatisticsDTO> selectActive(@Param("lastLoginTime") String lastLoginTime, @Param("appId") String appId);
@@ -382,6 +383,8 @@
List<StreetVOS> selectStreetByAreaCode(Integer code);
+ List<StreetVOStr> selectStreetByAreaCodeStr(Integer code);
+
List<StreetVO> selectStreetsByAreaCode(Integer code);
ComActAcidCheckRecordVO selectComActAcidCheckRecordById(Long id);
@@ -426,6 +429,7 @@
/**
* 查询两个appid的用户做更新
+ *
* @param userId
* @return
*/
@@ -433,14 +437,26 @@
/**
* 是否为党员
- * */
- int isDpcMember(@Param("phone") String phone,@Param("name")String name);
+ */
+ int isDpcMember(@Param("phone") String phone, @Param("name") String name);
/**
* 是否为物业公司后台账号
- * */
+ */
Long isPropertyAccount(String phone);
String getCommunityAppId(Long communityId);
+
+ /**
+ * 判读是否为自提点账号
+ *
+ * @param phone
+ * @return
+ */
+ int checkPoint(String phone);
+
+ ComShopUserAddressVO selectDefaultAddressVO(@Param("userId") String userId);
+
+ Long selectStoreIdIdByUserId(@Param("userId") Long userId);
}
--
Gitblit v1.7.1