Merge remote-tracking branch 'origin/master' into master

debug.log

@@ -1,2 +0,0 @@
-[0104/224528.192:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)
-[0104/225418.866:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)

pom.xml

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

src/main/java/com/shigongli/SpringApplication.java

@@ -2,9 +2,11 @@ package com.shigongli;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @EnableAsync
+@EnableScheduling
 @EnableTransactionManagement
 @SpringBootApplication
 public class SpringApplication {

src/main/java/com/shigongli/config/WeixinConfig.java

@@ -1,20 +1,24 @@
 package com.shigongli.config;
 
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 @Component
 @ConfigurationProperties(prefix = "weixin")
 public class WeixinConfig {
 
     @NestedConfigurationProperty
-    private Ma ma = new Ma();
+    private Ma ma;
 
     @NestedConfigurationProperty
-    private Mp mp = new Mp();
+    private Mp mp;
 
     @Data
     public static class Ma {
@@ -23,6 +27,15 @@ public class WeixinConfig {
         private String token;
         private String aesKey;
         private String msgDataFormat;
+
+        @NestedConfigurationProperty
+        private List<SubscribeMessage> subscribeMessages;
+
+        @Data
+        public static class SubscribeMessage {
+            private String type;
+            private String code;
+        }
     }
 
     @Data

src/main/java/com/shigongli/controller/TaHousePersonController.java

@@ -7,10 +7,9 @@ import com.shigongli.common.BaseController;
 import com.shigongli.common.ResponseBean;
 import com.shigongli.common.StringUtils;
 import com.shigongli.constants.StatusConstant;
-import com.shigongli.entity.TaHouseOrder;
-import com.shigongli.entity.TaHouseSetting;
-import com.shigongli.entity.TaPerson;
+import com.shigongli.entity.*;
 import com.shigongli.service.ITaHouseOrderService;
+import com.shigongli.service.ITaHouseService;
 import com.shigongli.service.ITaHouseSettingService;
 import com.shigongli.vo.HousePersonParams;
 import io.swagger.annotations.Api;
@@ -25,7 +24,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.shigongli.service.ITaHousePersonService;
-import com.shigongli.entity.TaHousePerson;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
@@ -57,6 +55,9 @@ public class TaHousePersonController extends BaseController {
     @Autowired
     ITaHouseSettingService iTaHouseSettingService;
 
+    @Autowired
+    ITaHouseService iTaHouseService;
+
 
     /**
      * 分页查询列表
@@ -102,6 +103,12 @@ public class TaHousePersonController extends BaseController {
             return ResponseBean.error("请设置入住人员信息", ResponseBean.ERROR_MISSING_PARAMS);
         }
 
+        // 房源
+        TaHouse taHouse = iTaHouseService.getById(housePersonParams.getHouseId());
+        if (null == taHouse || StatusConstant.DELETE.equals(taHouse.getStatus())) {
+            return ResponseBean.error("当前房源状态异常", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
         // 订单
         TaHouseOrder taHouseOrder = iTaHouseOrderService.getById(housePersonParams.getOrderId());
         if (null == taHouseOrder) {
@@ -142,6 +149,7 @@ public class TaHousePersonController extends BaseController {
         }
 
         if (iTaHousePersonService.saveBatch(taHousePersonList)){
+            iTaHousePersonService.sendMessageToManager(taHouse, taHouseSetting.getStartDate());
             return ResponseBean.success(taHousePersonList);
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/shigongli/entity/TaShopKeeper.java

@@ -52,4 +52,7 @@ public class TaShopKeeper implements Serializable {
 
     @TableField(exist = false)
     private TaShop taShop;
+
+    @TableField(exist = false)
+    private String openid;
 }

src/main/java/com/shigongli/mapper/TaPersonMapper.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 人员表 Mapper 接口
@@ -17,4 +19,6 @@ import org.apache.ibatis.annotations.Param;
 public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     TaPerson getByOpenId(@Param("openid") String openid);
+
+    List<TaPerson> getCheckoutListBy(@Param("dateStr") String dateStr);
 }

src/main/java/com/shigongli/mapper/TaShopKeeperMapper.java

@@ -3,6 +3,9 @@ package com.shigongli.mapper;
 import com.shigongli.entity.TaShopKeeper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaShopKeeperMapper extends BaseMapper<TaShopKeeper> {
 
+    List<TaShopKeeper> getByHouse(@Param("houseId") String houseId);
 }

src/main/java/com/shigongli/service/ITaHousePersonService.java

@@ -1,5 +1,6 @@
 package com.shigongli.service;
 
+import com.shigongli.entity.TaHouse;
 import com.shigongli.entity.TaHousePerson;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaHousePersonService extends IService<TaHousePerson> {
 
+    void sendMessageToManager(TaHouse taHouse, String dateStr);
 }

src/main/java/com/shigongli/service/ITaPersonService.java

@@ -4,6 +4,8 @@ import com.shigongli.entity.TaPerson;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.shigongli.entity.TaShopKeeper;
 
+import java.util.List;
+
 /**
  * <p>
  * 人员表 服务类
@@ -17,4 +19,6 @@ public interface ITaPersonService extends IService<TaPerson> {
     TaPerson getByOpenId(String openid);
 
     TaPerson getByPhone(String phone);
+
+    List<TaPerson> getCheckoutListBy(String date);
 }

src/main/java/com/shigongli/service/ITaShopKeeperService.java

@@ -23,4 +23,6 @@ public interface ITaShopKeeperService extends IService<TaShopKeeper> {
     List<TaShopKeeper> getByPerson(String personId);
 
     TaShopKeeper getByPhone(String phone, String shopId);
+
+    List<TaShopKeeper> getByHouse(String houseId);
 }

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

@@ -1,11 +1,27 @@
 package com.shigongli.service.impl;
 
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
+import com.shigongli.common.WxUtils;
+import com.shigongli.config.WeixinConfig;
+import com.shigongli.entity.TaHouse;
 import com.shigongli.entity.TaHousePerson;
+import com.shigongli.entity.TaShopKeeper;
 import com.shigongli.mapper.TaHousePersonMapper;
 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.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.subscribe.WxMpSubscribeMessage;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 住房人 服务实现类
@@ -14,7 +30,70 @@ import org.springframework.stereotype.Service;
  * @author yansen
  * @since 2020-12-11
  */
+@Slf4j
 @Service
 public class TaHousePersonServiceImpl extends ServiceImpl<TaHousePersonMapper, TaHousePerson> implements ITaHousePersonService {
+    @Autowired
+    ITaShopKeeperService iTaShopKeeperService;
+
+    @Autowired
+    WxUtils wxUtils;
+
+    @Autowired
+    WeixinConfig weixinConfig;
+
+    @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);
+
+            // 找到消息模板
+            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<>();
+            dataList.add(new WxMaSubscribeMessage.Data("thing6", taHouse.getTitle().substring(0, 10)));
+            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();
+
+            maService.getMsgService().sendSubscribeMsg(wxMaSubscribeMessage);
 
+        } catch (Exception e) {
+            log.error("发送订阅消息给店主失败: {}", e.getMessage());
+            e.printStackTrace();
+        }
+    }
 }

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

@@ -11,6 +11,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 人员表 服务实现类
@@ -42,4 +44,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
         return getOne(queryWrapper);
     }
+
+    @Override
+    public List<TaPerson> getCheckoutListBy(String date) {
+        return taPersonMapper.getCheckoutListBy(date);
+    }
 }

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

@@ -29,6 +29,9 @@ public class TaShopKeeperServiceImpl extends ServiceImpl<TaShopKeeperMapper, TaS
     @Autowired
     ITaShopService iTaShopService;
 
+    @Autowired
+    TaShopKeeperMapper taShopKeeperMapper;
+
     @Override
     public void bindPerson(TaPerson taPerson) {
         List<TaShopKeeper> shopKeeperList = getByPhone(taPerson.getPhone());
@@ -82,4 +85,9 @@ public class TaShopKeeperServiceImpl extends ServiceImpl<TaShopKeeperMapper, TaS
 
         return getOne(queryWrapper);
     }
+
+    @Override
+    public List<TaShopKeeper> getByHouse(String houseId) {
+        return taShopKeeperMapper.getByHouse(houseId);
+    }
 }

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

@@ -0,0 +1,41 @@
+package com.shigongli.task;
+
+import com.shigongli.entity.TaPerson;
+import com.shigongli.service.ITaPersonService;
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.util.DataUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+
+/**
+ * 发送离店提醒
+ */
+@Slf4j
+@Component
+public class SendCheckOutMessage {
+
+    @Autowired
+    ITaPersonService iTaPersonService;
+
+    @Scheduled(cron = "0 0 11 * * ?")
+    public void run() {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        String today = LocalDateTime.now().format(formatter);
+
+        List<TaPerson> taPersonList = iTaPersonService.getCheckoutListBy(today);
+        if (null == taPersonList) {
+            return;
+        }
+
+        // 每隔 1s 发送一条离店提醒
+        for (TaPerson taPerson : taPersonList) {
+            // todo
+        }
+    }
+}

src/main/resources/application.yml

@@ -45,6 +45,12 @@ weixin:
     token:
     aesKey:
     msgDataFormat: JSON
+    subscribe-messages:
+      - type: settled-in
+        code: rMg5CzypZSniRGHoZ7SBdqv_kmf7fPfTJMZ1k1SgobY
+      - type: check-out
+        code:
+
   # 公众号
   mp:
     appid: wx74db171e5f6524ad

src/main/resources/mapper/TaPersonMapper.xml

@@ -5,4 +5,17 @@
     <select id="getByOpenId" resultType="com.shigongli.entity.TaPerson">
         select * from ta_person where openid = #{openid}
     </select>
+    <select id="getCheckoutListBy" resultType="com.shigongli.entity.TaPerson">
+        SELECT DISTINCT
+            m.*
+        FROM
+            ta_house_setting t
+            INNER JOIN ta_house_order s ON t.setting_id = s.setting_id
+            INNER JOIN ta_person m ON m.person_id = s.person_id
+        WHERE
+            t.end_date = #{dateStr}
+            AND t.`status` = 1
+            AND s.`status` = 1
+            AND m.`status` = 1
+    </select>
 </mapper>

src/main/resources/mapper/TaShopKeeperMapper.xml

@@ -2,4 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.shigongli.mapper.TaShopKeeperMapper">
 
+    <select id="getByHouse" resultType="com.shigongli.entity.TaShopKeeper">
+        SELECT DISTINCT
+            t.*,
+            s.openid
+        FROM
+            ta_shop_keeper t
+            INNER JOIN ta_house m ON m.shop_id = t.shop_id
+            INNER JOIN ta_person s ON s.person_id = t.person_id
+        WHERE
+            m.house_id = #{houseId}
+    </select>
 </mapper>