张延森 4 gadus atpakaļ
vecāks
revīzija
aa745b9fce

+ 1
- 1
pom.xml Parādīt failu

10
 	</parent>
10
 	</parent>
11
 	<groupId>com.huiju</groupId>
11
 	<groupId>com.huiju</groupId>
12
 	<artifactId>xiangsong</artifactId>
12
 	<artifactId>xiangsong</artifactId>
13
-	<version>1.0.29</version>
13
+	<version>1.0.30</version>
14
 	<name>xiangsong</name>
14
 	<name>xiangsong</name>
15
 	<description>香颂</description>
15
 	<description>香颂</description>
16
 
16
 

+ 2
- 0
src/main/java/com/huiju/estateagents/property/dao/TaUserVerifyMapper.java Parādīt failu

7
 import org.apache.ibatis.annotations.*;
7
 import org.apache.ibatis.annotations.*;
8
 
8
 
9
 import java.util.List;
9
 import java.util.List;
10
+import java.util.Map;
10
 
11
 
11
 /**
12
 /**
12
  * <p>
13
  * <p>
163
                                                     @Param("levelId") Integer levelId,
164
                                                     @Param("levelId") Integer levelId,
164
                                                     @Param("roomNoId") Integer roomNoId);
165
                                                     @Param("roomNoId") Integer roomNoId);
165
 
166
 
167
+    Page<Map<String, String>> getPropUserByPaged(Page<Map<String, String>> page, @Param("orgId") Integer orgId);
166
 }
168
 }

+ 9
- 0
src/main/java/com/huiju/estateagents/property/service/ITaUserVerifyService.java Parādīt failu

1
 package com.huiju.estateagents.property.service;
1
 package com.huiju.estateagents.property.service;
2
 
2
 
3
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
3
 import com.baomidou.mybatisplus.extension.service.IService;
4
 import com.baomidou.mybatisplus.extension.service.IService;
4
 import com.huiju.estateagents.base.ResponseBean;
5
 import com.huiju.estateagents.base.ResponseBean;
5
 import com.huiju.estateagents.center.taUser.entity.TaUser;
6
 import com.huiju.estateagents.center.taUser.entity.TaUser;
6
 import com.huiju.estateagents.property.model.TaUserVerify;
7
 import com.huiju.estateagents.property.model.TaUserVerify;
7
 
8
 
9
+import java.util.Map;
10
+
8
 /**
11
 /**
9
  * 审核 业务
12
  * 审核 业务
10
  */
13
  */
80
      */
83
      */
81
     ResponseBean deleteCurrentUserVerify(TaUser userElement, Integer userVerifyId);
84
     ResponseBean deleteCurrentUserVerify(TaUser userElement, Integer userVerifyId);
82
 
85
 
86
+    /**
87
+     * 获取所有业主基础内容
88
+     * @param orgId
89
+     * @return
90
+     */
91
+    Page<Map<String, String>> getPropUserByPaged(Page<Map<String, String>> page, Integer orgId);
83
 }
92
 }

+ 5
- 0
src/main/java/com/huiju/estateagents/property/service/impl/TaUserVerifyServiceImpl.java Parādīt failu

471
         responseBean.addSuccess("操作成功!");
471
         responseBean.addSuccess("操作成功!");
472
         return responseBean;
472
         return responseBean;
473
     }
473
     }
474
+
475
+    @Override
476
+    public Page<Map<String, String>> getPropUserByPaged(Page<Map<String, String>> page, Integer orgId) {
477
+        return taUserVerifyMapper.getPropUserByPaged(page, orgId);
478
+    }
474
 }
479
 }

+ 43
- 0
src/main/java/com/huiju/estateagents/task/MpMessageEvent.java Parādīt failu

1
 package com.huiju.estateagents.task;
1
 package com.huiju.estateagents.task;
2
 
2
 
3
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
4
+import com.huiju.estateagents.common.WxUtils;
5
+import com.huiju.estateagents.entity.TaOrg;
6
+import com.huiju.estateagents.property.service.ITaUserVerifyService;
7
+import com.huiju.estateagents.service.ITaOrgService;
3
 import com.huiju.estateagents.third.service.ITaMpInfoService;
8
 import com.huiju.estateagents.third.service.ITaMpInfoService;
4
 import lombok.extern.slf4j.Slf4j;
9
 import lombok.extern.slf4j.Slf4j;
10
+import me.chanjar.weixin.mp.api.WxMpService;
11
+import org.checkerframework.checker.units.qual.A;
5
 import org.springframework.beans.factory.annotation.Autowired;
12
 import org.springframework.beans.factory.annotation.Autowired;
6
 import org.springframework.scheduling.annotation.Scheduled;
13
 import org.springframework.scheduling.annotation.Scheduled;
7
 import org.springframework.stereotype.Component;
14
 import org.springframework.stereotype.Component;
8
 
15
 
16
+import java.util.HashMap;
17
+import java.util.List;
18
+import java.util.Map;
19
+
9
 @Slf4j
20
 @Slf4j
10
 @Component
21
 @Component
11
 public class MpMessageEvent {
22
 public class MpMessageEvent {
23
+    @Autowired
24
+    WxUtils wxUtils;
12
 
25
 
13
     @Autowired
26
     @Autowired
14
     ITaMpInfoService iTaMpInfoService;
27
     ITaMpInfoService iTaMpInfoService;
15
 
28
 
29
+    @Autowired
30
+    ITaOrgService iTaOrgService;
31
+
32
+    @Autowired
33
+    ITaUserVerifyService iTaUserVerifyService;
34
+
16
     // 发送生日祝福
35
     // 发送生日祝福
17
     @Scheduled(cron = "0 0 8 * * ?")
36
     @Scheduled(cron = "0 0 8 * * ?")
18
     public void sendBirthdayMessage() {
37
     public void sendBirthdayMessage() {
38
+        List<TaOrg> orgList = iTaOrgService.list();
39
+        for (TaOrg org: orgList) {
40
+            WxMpService mpService = wxUtils.getMpService(org.getOrgId());
41
+            if (null == mpService) {
42
+                continue;
43
+            }
44
+
45
+            long pageNum = 1L;
46
+            long pageSize = 10L;
47
+            long total = 0L;
48
+
49
+//            while (true) {
50
+//                Page<Map<String, String>> page = new Page<>(pageNum, pageSize);
51
+//                Page<Map<String, String>> result = iTaUserVerifyService.getPropUserByPaged(page, org.getOrgId());
52
+//
53
+//
54
+//
55
+//                pageNum = result.getCurrent();
56
+//                total = result.getTotal();
57
+//                if ((pageNum - 1) * pageSize >= total) {
58
+//                    break;
59
+//                }
60
+//            }
19
 
61
 
62
+        }
20
     }
63
     }
21
 
64
 
22
     // 发送节日祝福
65
     // 发送节日祝福

+ 15
- 0
src/main/resources/mapper/property/TaUserVerifyMapper.xml Parādīt failu

93
             and verify_status = #{verifyStatus}
93
             and verify_status = #{verifyStatus}
94
         </if>
94
         </if>
95
     </select>
95
     </select>
96
+
97
+    <select id="getPropUserByPaged" resultType="java.util.Map">
98
+        SELECT DISTINCT
99
+            t.person_id as personId,
100
+            t.owner_name as ownerName,
101
+            t.id_card as idCard,
102
+            m.mp_openid as mpOpenid
103
+        FROM
104
+            ta_user_verify t
105
+        INNER JOIN ta_mp_miniapp s ON t.person_id = s.miniapp_person_id
106
+        INNER JOIN ta_mp_person m ON s.mp_person_id = m.mp_person_id
107
+        WHERE
108
+            t.org_id = #{orgId}
109
+            AND t.verify_status = 1
110
+    </select>
96
 </mapper>
111
 </mapper>