张延森 vor 4 Jahren
Ursprung
Commit
667d28d7c5

+ 1
- 1
pom.xml Datei anzeigen

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

+ 5
- 1
src/main/java/com/huiju/estateagents/EstateagentsApplication.java Datei anzeigen

@@ -4,14 +4,18 @@ import com.huiju.estateagents.websocket.ChatServer;
4 4
 import org.springframework.boot.SpringApplication;
5 5
 import org.springframework.boot.autoconfigure.SpringBootApplication;
6 6
 import org.springframework.context.ConfigurableApplicationContext;
7
+import org.springframework.scheduling.annotation.EnableAsync;
8
+import org.springframework.scheduling.annotation.EnableScheduling;
7 9
 
10
+@EnableAsync
11
+@EnableScheduling
8 12
 @SpringBootApplication
9 13
 public class EstateagentsApplication {
10 14
 
11 15
 	public static void main(String[] args) {
12 16
 		SpringApplication springApplication = new SpringApplication(EstateagentsApplication.class);
13 17
 		ConfigurableApplicationContext configurableApplicationContext = springApplication.run(args);
14
-		ChatServer.setApplicationContext(configurableApplicationContext);
18
+//		ChatServer.setApplicationContext(configurableApplicationContext);
15 19
 	}
16 20
 
17 21
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java Datei anzeigen

@@ -569,7 +569,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
569 569
         taPersonBuildingQueryWrapper.eq("user_id", taUser.getUserId());
570 570
         taPersonBuildingMapper.delete(taPersonBuildingQueryWrapper);
571 571
         //保存项目
572
-        if (taUser.getIsConsultant()) {
572
+        if (Boolean.valueOf(true).equals(taUser.getIsConsultant())) {
573 573
             TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
574 574
             taPersonBuilding.setBuildingId(taUser.getBuildingId());
575 575
             taPersonBuilding.setUserId(taUser.getUserId());

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/MiniAppController.java Datei anzeigen

@@ -255,7 +255,7 @@ public class MiniAppController extends BaseController {
255 255
             }
256 256
             taPersonService.updateById(taPerson);
257 257
 
258
-            if (StringUtils.isEmpty(mpOpenId)) {
258
+            if (!StringUtils.isEmpty(mpOpenId)) {
259 259
                 iTaMpMiniappService.mpPerson(taPerson, mpOpenId);
260 260
             }
261 261
 

+ 3
- 1
src/main/java/com/huiju/estateagents/controller/WxPortalController.java Datei anzeigen

@@ -4,6 +4,7 @@ import com.huiju.estateagents.base.BaseController;
4 4
 import com.huiju.estateagents.common.CommConstant;
5 5
 import com.huiju.estateagents.common.WxUtils;
6 6
 import com.huiju.estateagents.entity.TaMiniapp;
7
+import com.huiju.estateagents.redpack.entity.TaMpMiniapp;
7 8
 import com.huiju.estateagents.redpack.entity.TaMpPerson;
8 9
 import com.huiju.estateagents.redpack.service.ITaMpPersonService;
9 10
 import com.huiju.estateagents.service.IMiniAppService;
@@ -122,8 +123,9 @@ public class WxPortalController extends BaseController {
122 123
         TaMiniapp taMiniapp = iMiniAppService.getAppByOrg(mpInfo.getOrgId());
123 124
 
124 125
         WxMpKefuMessage kefuMessage = WxMpKefuMessage.MINIPROGRAMPAGE().appId(taMiniapp.getMiniappId())
126
+                .toUser(person.getMpOpenid())
125 127
                 .title(taMiniapp.getName() + "欢迎您!")
126
-                .pagePath(miniAppIndex + "?mpOpenId=" + message.getOpenId())
128
+                .pagePath(miniAppIndex + "?mpOpenId=" + person.getMpOpenid() )
127 129
                 .thumbMediaId(mpInfo.getMiniappMedia())
128 130
                 .build();
129 131
 

+ 28
- 0
src/main/java/com/huiju/estateagents/task/MpMessageEvent.java Datei anzeigen

@@ -0,0 +1,28 @@
1
+package com.huiju.estateagents.task;
2
+
3
+import com.huiju.estateagents.third.service.ITaMpInfoService;
4
+import lombok.extern.slf4j.Slf4j;
5
+import org.springframework.beans.factory.annotation.Autowired;
6
+import org.springframework.scheduling.annotation.Scheduled;
7
+import org.springframework.stereotype.Component;
8
+
9
+@Slf4j
10
+@Component
11
+public class MpMessageEvent {
12
+
13
+    @Autowired
14
+    ITaMpInfoService iTaMpInfoService;
15
+
16
+    // 发送生日祝福
17
+    @Scheduled(cron = "0 0 8 * * ?")
18
+    public void sendBirthdayMessage() {
19
+
20
+    }
21
+
22
+    // 发送节日祝福
23
+    @Scheduled(cron = "0 0 8 * * ?")
24
+    public void sendFestivalMessage() {
25
+
26
+    }
27
+
28
+}