From e75b0d79535a6bcd147cca4a54632b70b42afdb9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 29 五月 2021 18:10:18 +0800
Subject: [PATCH] 特价完善

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java |   83 +++++++++++++++++++++++++++++++++--------
 1 files changed, 67 insertions(+), 16 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
index 452a038..da535e0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
@@ -104,11 +104,16 @@
 
     public UserInfo getUserByLoginTypeAndOpenId(int loginType, String openid, SystemEnum sysetm) {
         List<UserInfo> list = null;
+        UserInfoMapper.DaoQuery daoQuery = new UserInfoMapper.DaoQuery();
+        daoQuery.system = sysetm;
+        daoQuery.count = 1000;
         if (loginType == 1) {
-            list = userInfoMapper.listBySystemAndTaoBaoOpenId(sysetm, openid);
+            daoQuery.openId = openid;
         } else {
-            list = userInfoMapper.listBySystemAndWXUnionId(sysetm, openid);
+            daoQuery.wxUnionId = openid;
         }
+        list = userInfoMapper.list(daoQuery);
+
 
         if (list != null)
             for (int i = 0; i < list.size(); i++) {
@@ -265,16 +270,16 @@
 
     @Override
     public long countInfo(Integer userState, String key, Integer keyType, String userRank, Integer days,
-                          String startTime, String endTime, Integer userType, String level, Integer activeCode,SystemEnum system) {
-        return userInfoMapper.countInfo(userState, key, keyType, userRank, days, startTime, endTime, userType, level, activeCode,system);
+                          String startTime, String endTime, Integer userType, String level, Integer activeCode, SystemEnum system) {
+        return userInfoMapper.countInfo(userState, key, keyType, userRank, days, startTime, endTime, userType, level, activeCode, system);
     }
 
     @Override
     public List<UserInfoVO> queryInfo(long start, int count, Integer userState, String key, Integer keyType,
-                                      String userRank, Integer days, String startTime, String endTime, Integer userType, String level, Integer activeCode,SystemEnum system) {
+                                      String userRank, Integer days, String startTime, String endTime, Integer userType, String level, Integer activeCode, SystemEnum system) {
 
         List<UserInfoVO> userList = userInfoMapper.queryInfo(start, count, userState, key, keyType, userRank, days,
-                startTime, endTime, userType, level, activeCode,system);
+                startTime, endTime, userType, level, activeCode, system);
 
         if (userList == null || userList.size() == 0) {
             return null;
@@ -323,17 +328,30 @@
 
     @Override
     public List<UserInfo> listBySystemAndWXUnionId(SystemEnum system, String unionId) {
-        return userInfoMapper.listBySystemAndWXUnionId(system, unionId);
+        UserInfoMapper.DaoQuery daoQuery = new UserInfoMapper.DaoQuery();
+        daoQuery.system = system;
+        daoQuery.count = 1000;
+        daoQuery.wxUnionId = unionId;
+
+        return userInfoMapper.list(daoQuery);
     }
 
     @Override
     public List<UserInfo> listBySystemAndTaoBaoOpenId(SystemEnum system, String openId) {
-        return userInfoMapper.listBySystemAndTaoBaoOpenId(system, openId);
+        UserInfoMapper.DaoQuery daoQuery = new UserInfoMapper.DaoQuery();
+        daoQuery.system = system;
+        daoQuery.count = 1000;
+        daoQuery.openId = openId;
+        return userInfoMapper.list(daoQuery);
     }
 
     @Override
     public List<UserInfo> listBySystemAndPhone(SystemEnum system, String phone) {
-        return userInfoMapper.listBySystemAndPhone(system, phone);
+        UserInfoMapper.DaoQuery daoQuery = new UserInfoMapper.DaoQuery();
+        daoQuery.system = system;
+        daoQuery.count = 1000;
+        daoQuery.phone = phone;
+        return userInfoMapper.list(daoQuery);
     }
 
     @Override
@@ -354,17 +372,17 @@
 
     @Override
     public long queryCount(Integer userState, String key, Integer keyType, String userRank, Integer days,
-                           String startTime, String endTime, Integer userType, String level, Integer activeCode,SystemEnum system) {
-        return userInfoMapper.queryCount(userState, key, keyType, userRank, days, startTime, endTime, userType, level, activeCode,system);
+                           String startTime, String endTime, Integer userType, String level, Integer activeCode, SystemEnum system) {
+        return userInfoMapper.queryCount(userState, key, keyType, userRank, days, startTime, endTime, userType, level, activeCode, system);
     }
 
     @Override
     public List<UserInfoVO> query(long start, int count, Integer userState, String key, Integer keyType,
                                   String userRank, Integer days, String startTime, String endTime, Integer orderField, Integer orderMode,
-                                  Integer userType, String level, Integer activeCode,SystemEnum system) {
+                                  Integer userType, String level, Integer activeCode, SystemEnum system) {
 
         List<UserInfoVO> userList = userInfoMapper.query(start, count, userState, key, keyType, userRank, days,
-                startTime, endTime, orderField, orderMode, userType, level, activeCode,system);
+                startTime, endTime, orderField, orderMode, userType, level, activeCode, system);
 
         if (userList == null || userList.size() == 0) {
             return null;
@@ -569,17 +587,50 @@
 
     @Override
     public UserInfo getEffectiveUserInfoByPhone(String phone, SystemEnum system) {
-        return userInfoMapper.getEffectiveUserInfoByPhone(phone, system);
+
+        UserInfoMapper.DaoQuery daoQuery = new UserInfoMapper.DaoQuery();
+        daoQuery.system = system;
+        daoQuery.count = 1000;
+        daoQuery.phone = phone;
+        daoQuery.state = UserInfo.STATE_NORMAL;
+        List<UserInfo> userInfoList = userInfoMapper.list(daoQuery);
+
+        return userInfoList != null && userInfoList.size() > 0 ? userInfoList.get(0) : null;
     }
 
     @Override
     public UserInfo getEffectiveUserInfoByWXUnionId(String unionId, SystemEnum system) {
-        return userInfoMapper.getEffectiveUserInfoByWXUnionId(unionId, system);
+        UserInfoMapper.DaoQuery daoQuery = new UserInfoMapper.DaoQuery();
+        daoQuery.system = system;
+        daoQuery.count = 1000;
+        daoQuery.wxUnionId = unionId;
+        daoQuery.state = UserInfo.STATE_NORMAL;
+        List<UserInfo> userInfoList = userInfoMapper.list(daoQuery);
+
+        return userInfoList != null && userInfoList.size() > 0 ? userInfoList.get(0) : null;
+
+    }
+
+    @Override
+    public UserInfo getEffectiveUserInfoByQQOpenId(String opneId, SystemEnum sysetm) {
+        UserInfoMapper.DaoQuery daoQuery = new UserInfoMapper.DaoQuery();
+        daoQuery.system = sysetm;
+        daoQuery.count = 1000;
+        daoQuery.qqOpenId = opneId;
+        daoQuery.state = UserInfo.STATE_NORMAL;
+        List<UserInfo> userInfoList = userInfoMapper.list(daoQuery);
+        return userInfoList != null && userInfoList.size() > 0 ? userInfoList.get(0) : null;
     }
 
     @Override
     public UserInfo getEffectiveUserInfoByOpenId(String openId, SystemEnum sysetm) {
-        return userInfoMapper.getEffectiveUserInfoByOpenId(openId,sysetm);
+        UserInfoMapper.DaoQuery daoQuery = new UserInfoMapper.DaoQuery();
+        daoQuery.system = sysetm;
+        daoQuery.count = 1000;
+        daoQuery.openId = openId;
+        daoQuery.state = UserInfo.STATE_NORMAL;
+        List<UserInfo> userInfoList = userInfoMapper.list(daoQuery);
+        return userInfoList != null && userInfoList.size() > 0 ? userInfoList.get(0) : null;
     }
 
     @Override

--
Gitblit v1.8.0