|
@@ -8,7 +8,13 @@ import com.huiju.estateagents.bo.request.HousingRaiseRequestBO;
|
8
|
8
|
import com.huiju.estateagents.bo.request.RaiseOrderRequestBO;
|
9
|
9
|
import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
|
10
|
10
|
import com.huiju.estateagents.common.CommConstant;
|
|
11
|
+import com.huiju.estateagents.entity.TaHousingResources;
|
|
12
|
+import com.huiju.estateagents.entity.TaOrder;
|
|
13
|
+import com.huiju.estateagents.entity.TaRaiseHouse;
|
11
|
14
|
import com.huiju.estateagents.entity.TaRaiseRecord;
|
|
15
|
+import com.huiju.estateagents.service.ITaHousingResourcesService;
|
|
16
|
+import com.huiju.estateagents.service.ITaOrderService;
|
|
17
|
+import com.huiju.estateagents.service.ITaRaiseHouseService;
|
12
|
18
|
import com.huiju.estateagents.service.ITaRaiseRecordService;
|
13
|
19
|
import org.apache.commons.collections.CollectionUtils;
|
14
|
20
|
import org.apache.commons.lang3.StringUtils;
|
|
@@ -19,7 +25,10 @@ import org.springframework.web.bind.annotation.*;
|
19
|
25
|
|
20
|
26
|
import javax.servlet.http.HttpServletRequest;
|
21
|
27
|
import java.time.LocalDateTime;
|
|
28
|
+import java.util.HashMap;
|
22
|
29
|
import java.util.List;
|
|
30
|
+import java.util.Map;
|
|
31
|
+import java.util.stream.Collectors;
|
23
|
32
|
|
24
|
33
|
/**
|
25
|
34
|
* <p>
|
|
@@ -38,6 +47,15 @@ public class TaRaiseRecordController extends BaseController {
|
38
|
47
|
@Autowired
|
39
|
48
|
public ITaRaiseRecordService iTaRaiseRecordService;
|
40
|
49
|
|
|
50
|
+ @Autowired
|
|
51
|
+ public ITaRaiseHouseService taRaiseHouseService;
|
|
52
|
+
|
|
53
|
+ @Autowired
|
|
54
|
+ public ITaHousingResourcesService taHousingResourcesService;
|
|
55
|
+
|
|
56
|
+ @Autowired
|
|
57
|
+ public ITaOrderService taOrderService;
|
|
58
|
+
|
41
|
59
|
/**
|
42
|
60
|
* 条件查询房源认筹记录
|
43
|
61
|
*
|
|
@@ -423,9 +441,42 @@ public class TaRaiseRecordController extends BaseController {
|
423
|
441
|
ResponseBean responseBean = new ResponseBean();
|
424
|
442
|
try {
|
425
|
443
|
responseBean.addSuccess(iTaRaiseRecordService.saveRaiseInfo(taRaiseRecord,getOrgId(request),getPersonId(request)));
|
|
444
|
+ } catch (Exception e) {
|
|
445
|
+ logger.error("微信端下认筹单 -=- {}", e.toString());
|
|
446
|
+ responseBean.addError(e.getMessage());
|
|
447
|
+ }
|
|
448
|
+ return responseBean;
|
|
449
|
+ }
|
|
450
|
+
|
|
451
|
+
|
|
452
|
+ /**
|
|
453
|
+ * 微信端获取认筹单详细信息
|
|
454
|
+ *
|
|
455
|
+ * @param raiseRecordId 认筹旦id
|
|
456
|
+ * @return
|
|
457
|
+ */
|
|
458
|
+ @RequestMapping(value = "/wx/taRaiseRecord/{raiseRecordId}", method = RequestMethod.POST)
|
|
459
|
+ public ResponseBean wxGetRaiseRecordById(@PathVariable Integer raiseRecordId,HttpServletRequest request) {
|
|
460
|
+ ResponseBean responseBean = new ResponseBean();
|
|
461
|
+ try {
|
|
462
|
+ //获取认筹单信息
|
|
463
|
+ TaRaiseRecord taRaiseRecord = iTaRaiseRecordService.getById(raiseRecordId);
|
|
464
|
+ //房源与认筹单关系图
|
|
465
|
+ List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(new QueryWrapper<TaRaiseHouse>().eq("raise_record_id", taRaiseRecord.getRaiseRecordId()));
|
|
466
|
+ //房源信息
|
|
467
|
+ List<TaHousingResources> houseList = (List<TaHousingResources>) taHousingResourcesService.listByIds(taRaiseHouseList.stream().map(TaRaiseHouse::getHouseId).collect(Collectors.toList()));
|
|
468
|
+ //订单信息
|
|
469
|
+ TaOrder taOrder = taOrderService.getById(taRaiseRecord.getOrderId());
|
|
470
|
+
|
|
471
|
+ Map<String,Object> map = new HashMap<>();
|
|
472
|
+ map.put("taRaiseRecord",taRaiseRecord);
|
|
473
|
+ map.put("taRaiseHouseList",taRaiseHouseList);
|
|
474
|
+ map.put("houseList",houseList);
|
|
475
|
+ map.put("taOrder",taOrder);
|
|
476
|
+ responseBean.addSuccess(map);
|
426
|
477
|
} catch (Exception e) {
|
427
|
478
|
e.printStackTrace();
|
428
|
|
- logger.error("taRaiseRecordAdd -=- {}", e.toString());
|
|
479
|
+ logger.error("微信端获取认筹单详细信息 -=- {}", e.toString());
|
429
|
480
|
responseBean.addError(e.getMessage());
|
430
|
481
|
}
|
431
|
482
|
return responseBean;
|