feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.shigongli</groupId>
 	<artifactId>shigongli</artifactId>
-	<version>0.0.8</version>
+	<version>1.0.3</version>
 	<name>shigongli</name>
 	<description>ShiGongli Service</description>
 

src/main/java/com/shigongli/service/impl/TaHousePersonServiceImpl.java

@@ -12,6 +12,7 @@ import com.shigongli.service.ITaHousePersonService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.shigongli.service.ITaShopKeeperService;
 import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -42,60 +43,68 @@ public class TaHousePersonServiceImpl extends ServiceImpl<TaHousePersonMapper, T
     @Async
     @Override
     public void sendMessageToManager(TaHouse taHouse, String dateStr) {
-        try {
-            String houseId = taHouse.getHouseId();
-            List<TaShopKeeper> taShopKeeperList = iTaShopKeeperService.getByHouse(houseId);
-            if (null == taShopKeeperList || taShopKeeperList.size() < 1) {
-                log.error("没有找到房源【{}】对应的店主", houseId);
-                return;
-            }
-
-            // 先暂时发送一个店主
-            TaShopKeeper taShopKeeper = taShopKeeperList.get(0);
+        String houseId = taHouse.getHouseId();
+        List<TaShopKeeper> taShopKeeperList = iTaShopKeeperService.getByHouse(houseId);
+        if (null == taShopKeeperList || taShopKeeperList.size() < 1) {
+            log.error("没有找到房源【{}】对应的店主", houseId);
+            return;
+        }
 
-            // 找到消息模板
-            List<WeixinConfig.Ma.SubscribeMessage> subscribeMessages = weixinConfig.getMa().getSubscribeMessages();
-            WeixinConfig.Ma.SubscribeMessage subscribeMessage = null;
-            if (null == subscribeMessages || subscribeMessages.size() < 1) {
-                log.error("没有找到小程序消息提醒配置");
-                return;
-            }
-            for (WeixinConfig.Ma.SubscribeMessage message : subscribeMessages) {
-                if ("settled-in".equals(message.getType())) {
-                    subscribeMessage = message;
-                    break;
-                }
-            }
-            if (null == subscribeMessage) {
-                log.error("没有找到入店提醒的消息配置");
-                return;
+        // 找到消息模板
+        List<WeixinConfig.Ma.SubscribeMessage> subscribeMessages = weixinConfig.getMa().getSubscribeMessages();
+        WeixinConfig.Ma.SubscribeMessage subscribeMessage = null;
+        if (null == subscribeMessages || subscribeMessages.size() < 1) {
+            log.error("没有找到小程序消息提醒配置");
+            return;
+        }
+        for (WeixinConfig.Ma.SubscribeMessage message : subscribeMessages) {
+            if ("settled-in".equals(message.getType())) {
+                subscribeMessage = message;
+                break;
             }
+        }
+        if (null == subscribeMessage) {
+            log.error("没有找到入店提醒的消息配置");
+            return;
+        }
 
-            // 发送内容
-            List<WxMaSubscribeMessage.Data> dataList = new ArrayList<>();
-            String title = null != taHouse.getTitle() ? taHouse.getTitle() : "";
-            if (title.length() > 10) {
-                title = title.substring(0, 10) + "...";
-            }
+        // 发送内容
+        List<WxMaSubscribeMessage.Data> dataList = new ArrayList<>();
+        String title = null != taHouse.getTitle() ? taHouse.getTitle() : "";
+        if (title.length() > 10) {
+            title = title.substring(0, 10) + "...";
+        }
 
-            dataList.add(new WxMaSubscribeMessage.Data("thing6", title));
-            dataList.add(new WxMaSubscribeMessage.Data("date2", dateStr));
+        dataList.add(new WxMaSubscribeMessage.Data("thing6", title));
+        dataList.add(new WxMaSubscribeMessage.Data("date2", dateStr));
 
-            //
-            WxMaService maService = wxUtils.getMaService();
-            WxMaSubscribeMessage wxMaSubscribeMessage = WxMaSubscribeMessage
-                    .builder()
-                    .templateId(subscribeMessage.getCode())
-                    .toUser(taShopKeeper.getOpenid())
-                    .page(String.format("/pages/house/household/index?houseId=%s", houseId))
-                    .data(dataList)
-                    .build();
+        String page = String.format("/pages/house/household/index?houseId=%s", houseId);
+        String templateId = subscribeMessage.getCode();
 
-            maService.getMsgService().sendSubscribeMsg(wxMaSubscribeMessage);
+        // 暂时先发送给所有店主, 1s 发送一个
+        for (TaShopKeeper taShopKeeper : taShopKeeperList) {
+            try {
+                String toUser = taShopKeeper.getOpenid();
+                sendMaSubscribeMessage(toUser, dataList, page, templateId);
 
-        } catch (Exception e) {
-            log.error("发送订阅消息给店主失败: {}", e.getMessage());
-            e.printStackTrace();
+                Thread.sleep(1000);
+            } catch (Exception e) {
+                log.error("发送订阅消息给店主失败: {}", e.getMessage());
+                e.printStackTrace();
+            }
         }
     }
+
+    private void sendMaSubscribeMessage(String toUser, List<WxMaSubscribeMessage.Data> message, String page, String templateId) throws WxErrorException {
+        WxMaService maService = wxUtils.getMaService();
+        WxMaSubscribeMessage wxMaSubscribeMessage = WxMaSubscribeMessage
+                .builder()
+                .templateId(templateId)
+                .toUser(toUser)
+                .page(page)
+                .data(message)
+                .build();
+
+        maService.getMsgService().sendSubscribeMsg(wxMaSubscribeMessage);
+    }
 }

src/main/java/com/shigongli/task/SendCheckOutMessage.java

@@ -62,14 +62,14 @@ public class SendCheckOutMessage {
             return;
         }
 
-        String remark = "请于12:00之前退房. 退房时请检查您的随身物品!";
+        String remark = "请记得带好您的随身物品";
         WxMaService maService = wxUtils.getMaService();
 
         // 每隔 1s 发送一条离店提醒
         for (TaPerson taPerson : taPersonList) {
             List<WxMaSubscribeMessage.Data> dataList = new ArrayList<>();
-            dataList.add(new WxMaSubscribeMessage.Data("thing5", remark));
-            dataList.add(new WxMaSubscribeMessage.Data("time8", today));
+            dataList.add(new WxMaSubscribeMessage.Data("time1", String.format("%s 12:00", today)));
+            dataList.add(new WxMaSubscribeMessage.Data("thing2", remark));
 
             WxMaSubscribeMessage wxMaSubscribeMessage = WxMaSubscribeMessage
                     .builder()

src/main/resources/application.yml

@@ -49,7 +49,7 @@ weixin:
       - type: settled-in
         code: rMg5CzypZSniRGHoZ7SBdqv_kmf7fPfTJMZ1k1SgobY
       - type: check-out
-        code: OtpD30Kb9qbNBJ2-IVnhu5g1hHnuNvCvdVuFh4e6mPU
+        code: ZRAzMOXwAX1Boh5erwZMNUaUQiEwmd5WEJCsKMBBaa8
 
   # 公众号
   mp:

src/main/resources/mapper/TaShopKeeperMapper.xml

@@ -12,5 +12,6 @@
             INNER JOIN ta_person s ON s.person_id = t.person_id
         WHERE
             m.house_id = #{houseId}
+            AND t.`status` = 1
     </select>
 </mapper>