bug

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -631,6 +631,8 @@ public class CommConstant {
      */
     public static final String HOUSE_DETAIL_PATH = "onlineSelling/pages/detail/index?id=%s";
 
+    public static final String RAISE_DETAIL_PATH = "/onlineSelling/pages/raiseProfile/index?id=%s";
+
     /**
      * 已锁定
      */

src/main/java/com/huiju/estateagents/service/impl/TaRaiseRecordServiceImpl.java

@@ -14,9 +14,11 @@ import com.huiju.estateagents.center.taUser.service.impl.TaUserServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
+import com.huiju.estateagents.po.TaHousingResourcesPO;
 import com.huiju.estateagents.service.ITaRaiseRecordService;
 import com.huiju.estateagents.service.ITaUvService;
 import jodd.util.StringUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +26,8 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * <p>
@@ -59,6 +63,15 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
     @Autowired
     private TaUserServiceImpl taUserService;
 
+    @Autowired
+    private MiniAppServiceImpl miniAppService;
+
+    @Autowired
+    private TaPersonServiceImpl taPersonService;
+
+    @Autowired
+    private TaBuildingMapper taBuildingMapper;
+
     @Override
     public ResponseBean listHousingRaiseByCondition(HousingRaiseRequestBO requestBO, Integer pageNumber, Integer pageSize) {
         logger.info("TaRaiseRecordServiceImpl.listRaiseRecordByCondition 接收参数：bo:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(requestBO), pageNumber, pageSize);
@@ -238,4 +251,43 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
         taHousingResources.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
         taHousingResourcesMapper.updateById(taHousingResources);
     }
+
+
+    /**
+     * 发送认筹订阅消息
+     *
+     * @param raiseRecordId  认筹单ID
+     * @param personId   用户ID
+     * @param title  审核类型
+     * @param result     审核结果
+     * @param failReason 失败原因
+     * @param isSuccess  是否成功 true是(只有成功才发送短信)
+     */
+    public void sendRaiseMsg(Integer raiseRecordId, String personId, String title, String result, String failReason,String remark, Boolean isSuccess) {
+        logger.info("sendSubscribeMsg 接收参数：houseId:{},checkType:{},result:{}，failReason:{}",
+                raiseRecordId, title, result, failReason);
+
+        ExecutorService threadPool = Executors.newCachedThreadPool();
+        threadPool.execute(() -> {
+            logger.info("sendSubscribeMsg 开始");
+
+            // 获取房源详情
+            TaRaiseRecord taRaiseRecord = taRaiseRecordMapper.selectById(raiseRecordId);
+            if (null == taRaiseRecord) {
+                logger.info("sendSubscribeMsg 未找到认筹单。");
+                return;
+            }
+            TaBuilding taBuilding = taBuildingMapper.selectById(taRaiseRecord.getBuildingId());
+            // 获取用户信息
+            TaPerson toUser = taPersonService.getById(personId);
+            if (toUser == null) {
+                return;
+            }
+
+            String link = String.format(CommConstant.RAISE_DETAIL_PATH, raiseRecordId);
+
+            miniAppService.sendCheckMessage(toUser, link, title, result, taBuilding.getBuildingName(), failReason, remark, LocalDateTime.now(), isSuccess);
+            logger.info("sendSubscribeMsg 结束");
+        });
+    }
 }

src/main/java/com/huiju/estateagents/service/impl/WxPayServiceImpl.java

@@ -375,12 +375,12 @@ public class WxPayServiceImpl implements IWxPayService {
             throw new Exception("自动锁房只能认筹一个房源。");
         }
         //判断此房源有没有被锁定
-        TaHousingResources taHousingResources = getHousingResourcesById(taRaiseHouseList.get(0).getHouseId());
-        if (taHousingResources.getHouseLockingStatus().equals(CommConstant.HOUSE_LOCKING_STATUS_LOCKED)){
-            throw new Exception("改房源已被锁定暂时无法认筹。");
-        }
+//        TaHousingResources taHousingResources = getHousingResourcesById(taRaiseHouseList.get(0).getHouseId());
+//        if (taHousingResources.getHouseLockingStatus().equals(CommConstant.HOUSE_LOCKING_STATUS_LOCKED)){
+//            throw new Exception("改房源已被锁定暂时无法认筹。");
+//        }
         //锁定此房源并且更改认筹单的锁定状态
-        changeLockingStatus(taRaiseRecord,taRaiseHouseList.get(0),taHousingResources);
+//        changeLockingStatus(taRaiseRecord,taRaiseHouseList.get(0),taHousingResources);
     }
 
     /**