傅行帆 преди 5 години
родител
ревизия
a990784dea

+ 8
- 0
src/main/java/com/huiju/estateagents/controller/TaRaiseRecordController.java Целия файл

@@ -189,6 +189,8 @@ public class TaRaiseRecordController extends BaseController {
189 189
                 record.setInvalidReason(raiseRecord.getInvalidReason());
190 190
                 record.setUpdateDate(LocalDateTime.now());
191 191
                 record.setStatus(0);
192
+                //发送订阅消息
193
+                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"在线选房认筹通知","认筹单已作废","点击详情查看认筹单","具体原因查看详情",false);
192 194
             });
193 195
 
194 196
             if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
@@ -230,6 +232,8 @@ public class TaRaiseRecordController extends BaseController {
230 232
                 }
231 233
                 record.setStatus(CommConstant.STATUS_DELETE);
232 234
                 record.setUpdateDate(LocalDateTime.now());
235
+                //发送订阅消息
236
+                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"在线选房认筹通知","认筹单已作废","点击详情查看认筹单","具体原因查看详情",false);
233 237
             });
234 238
 
235 239
             if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
@@ -294,6 +298,8 @@ public class TaRaiseRecordController extends BaseController {
294 298
                 }
295 299
                 record.setPayStatus(CommConstant.PAY_STATUS_PAID);
296 300
                 record.setUpdateDate(LocalDateTime.now());
301
+                //发送订阅消息
302
+                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"在线选房认筹通知","认筹已缴费","点击详情查看认筹单","您的认筹已成功缴费",false);
297 303
             });
298 304
 
299 305
             if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
@@ -364,6 +370,8 @@ public class TaRaiseRecordController extends BaseController {
364 370
                 record.setPayStatus(CommConstant.PAY_STATUS_REFUNDED);
365 371
                 record.setRefundReason(refundReason);
366 372
                 record.setUpdateDate(LocalDateTime.now());
373
+                //发送订阅消息
374
+                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"在线选房认筹通知","认筹已退费","点击详情查看认筹单","您的认筹已成功退费",false);
367 375
             });
368 376
 
369 377
             if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {

+ 5
- 0
src/main/java/com/huiju/estateagents/service/ITaRaiseRecordService.java Целия файл

@@ -80,4 +80,9 @@ public interface ITaRaiseRecordService extends IService<TaRaiseRecord> {
80 80
      * @return
81 81
      */
82 82
     Boolean addHouseNum(Integer raiseRecordId, Integer orgId, Integer userId);
83
+
84
+    /**
85
+     * 发送认筹消息
86
+     */
87
+    void sendRaiseMsg(Integer raiseRecordId, String personId, String title, String result, String reason,String remark, Boolean isSuccess);
83 88
 }

+ 18
- 5
src/main/java/com/huiju/estateagents/service/impl/TaRaiseRecordServiceImpl.java Целия файл

@@ -140,6 +140,9 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
140 140
         //插入认筹单
141 141
         saveRaiseRecord(taRaiseRecord, orgId, personId, taRaise);
142 142
 
143
+        //发送订阅消息
144
+        sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),personId,"在线选房认筹通知","已提交认筹","点击详情查看认筹单","房源紧俏,请赶紧缴费",true);
145
+
143 146
         return taRaiseRecord;
144 147
     }
145 148
 
@@ -232,6 +235,15 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
232 235
             taRaiseHouse.setOrgId(orgId);
233 236
             taRaiseHouse.setRaiseRecordId(taRaiseRecord.getRaiseRecordId());
234 237
             taRaiseHouseMapper.insert(taRaiseHouse);
238
+
239
+            //更新房源的实际热度
240
+            TaHousingResources taHousingResources = taHousingResourcesMapper.selectById(e);
241
+            Integer raiseRealHeat = taHousingResources.getRaiseRealHeat();
242
+            if (null == raiseRealHeat){
243
+                raiseRealHeat = 0;
244
+            }
245
+            taHousingResources.setRaiseRealHeat(raiseRealHeat+1);
246
+            taHousingResourcesMapper.updateById(taHousingResources);
235 247
         });
236 248
 
237 249
         //把idcard字断更新进person表
@@ -260,12 +272,13 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
260 272
      * @param personId   用户ID
261 273
      * @param title  审核类型
262 274
      * @param result     审核结果
263
-     * @param failReason 失败原因
275
+     * @param remark 失败原因
264 276
      * @param isSuccess  是否成功 true是(只有成功才发送短信)
265 277
      */
266
-    public void sendRaiseMsg(Integer raiseRecordId, String personId, String title, String result, String failReason,String remark, Boolean isSuccess) {
267
-        logger.info("sendSubscribeMsg 接收参数:houseId:{},checkType:{},result:{},failReason:{}",
268
-                raiseRecordId, title, result, failReason);
278
+    @Override
279
+    public void sendRaiseMsg(Integer raiseRecordId, String personId, String title, String result, String reason,String remark, Boolean isSuccess) {
280
+        logger.info("sendSubscribeMsg 接收参数:houseId:{},checkType:{},result:{},reason:{}, remark:{}",
281
+                raiseRecordId, title, result, reason, remark);
269 282
 
270 283
         ExecutorService threadPool = Executors.newCachedThreadPool();
271 284
         threadPool.execute(() -> {
@@ -286,7 +299,7 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
286 299
 
287 300
             String link = String.format(CommConstant.RAISE_DETAIL_PATH, raiseRecordId);
288 301
 
289
-            miniAppService.sendCheckMessage(toUser, link, title, result, taBuilding.getBuildingName(), failReason, remark, LocalDateTime.now(), isSuccess);
302
+            miniAppService.sendCheckMessage(toUser, link, title, result, taBuilding.getBuildingName(), reason, remark, LocalDateTime.now(), isSuccess);
290 303
             logger.info("sendSubscribeMsg 结束");
291 304
         });
292 305
     }

+ 11
- 0
src/main/java/com/huiju/estateagents/service/impl/WxPayServiceImpl.java Целия файл

@@ -9,6 +9,7 @@ import com.huiju.estateagents.common.wxpay.WXPayUtil;
9 9
 import com.huiju.estateagents.common.wxpay.WxConfig;
10 10
 import com.huiju.estateagents.entity.*;
11 11
 import com.huiju.estateagents.mapper.*;
12
+import com.huiju.estateagents.service.ITaRaiseRecordService;
12 13
 import com.huiju.estateagents.service.IWxPayService;
13 14
 import lombok.extern.slf4j.Slf4j;
14 15
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +59,9 @@ public class WxPayServiceImpl implements IWxPayService {
58 59
     @Autowired
59 60
     private TaPersonMapper taPersonMapper;
60 61
 
62
+    @Autowired
63
+    private ITaRaiseRecordService taRaiseRecordService;
64
+
61 65
     /**
62 66
      * 微信支付-统一下单
63 67
      *
@@ -204,6 +208,8 @@ public class WxPayServiceImpl implements IWxPayService {
204 208
                 taRaiseRecordMapper.updateById(taRaiseRecord);
205 209
                 //更新退款时间
206 210
                 e.setPayTime(LocalDateTime.now());
211
+                //发送订阅消息
212
+                taRaiseRecordService.sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),taRaiseRecord.getRaiseId(),"在线选房认筹通知","线上退费成功","点击详情查看认筹单","线上退费成功",false);
207 213
             }
208 214
             taOrderMapper.updateById(e);
209 215
         });
@@ -266,6 +272,8 @@ public class WxPayServiceImpl implements IWxPayService {
266 272
         TaRaiseRecord taRaiseRecord = taRaiseRecordMapper.selectById(taOrder.getTargetId());
267 273
         taRaiseRecord.setRefundReason(taOrder.getRefundReason());
268 274
         taRaiseRecordMapper.updateById(taRaiseRecord);
275
+        //发送订阅消息
276
+        taRaiseRecordService.sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),taRaiseRecord.getRaiseId(),"在线选房认筹通知","认筹正在退费","点击详情查看认筹单","正在等待微信或银行到账",false);
269 277
     }
270 278
 
271 279
     /**
@@ -321,6 +329,9 @@ public class WxPayServiceImpl implements IWxPayService {
321 329
         TaRaiseRecord taRaiseRecord = taRaiseRecordMapper.selectById(taOrder.getTargetId());
322 330
         taRaiseRecord.setPayStatus(CommConstant.PAY_STATUS_PAID);
323 331
         taRaiseRecordMapper.updateById(taRaiseRecord);
332
+
333
+        //发送订阅消息
334
+        taRaiseRecordService.sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),taRaiseRecord.getRaiseId(),"在线选房认筹通知","认筹支付成功","点击详情查看认筹单","已付款成功",false);
324 335
     }
325 336
 
326 337
     /**