Browse Source

* bug修复

顾绍勇 5 years ago
parent
commit
3d06ef91f8

+ 6
- 6
src/main/java/com/huiju/estateagents/controller/TaRaiseRecordController.java View File

208
      * @return
208
      * @return
209
      */
209
      */
210
     @RequestMapping(value = "/admin/batchDeleteRaiseRecord", method = RequestMethod.PUT)
210
     @RequestMapping(value = "/admin/batchDeleteRaiseRecord", method = RequestMethod.PUT)
211
-    public ResponseBean batchDeleteRaiseRecord(@RequestBody TaRaiseRecord raiseRecordList) {
211
+    public ResponseBean batchDeleteRaiseRecord(@RequestBody TaRaiseRecord raiseRecordList, HttpServletRequest request) {
212
         logger.info("TaRaiseRecordController.batchDeleteRaiseRecord 接收参数:{}", JSONObject.toJSONString(raiseRecordList));
212
         logger.info("TaRaiseRecordController.batchDeleteRaiseRecord 接收参数:{}", JSONObject.toJSONString(raiseRecordList));
213
 
213
 
214
         ResponseBean responseBean = new ResponseBean();
214
         ResponseBean responseBean = new ResponseBean();
522
             taRaise.setRaisePrice(taRaise.getRaisePrice());
522
             taRaise.setRaisePrice(taRaise.getRaisePrice());
523
             //置业顾问信息
523
             //置业顾问信息
524
             TaUser consultantInfo = taUserService.getById(taRaiseRecord.getUserId());
524
             TaUser consultantInfo = taUserService.getById(taRaiseRecord.getUserId());
525
-            if (null != consultantInfo){
525
+            if (null != consultantInfo) {
526
                 //职业顾问信息
526
                 //职业顾问信息
527
                 TaPerson consultantPerson = taPersonService.getOne(new QueryWrapper<TaPerson>().eq("user_id", taRaiseRecord.getUserId()));
527
                 TaPerson consultantPerson = taPersonService.getOne(new QueryWrapper<TaPerson>().eq("user_id", taRaiseRecord.getUserId()));
528
-                if (null != consultantPerson){
528
+                if (null != consultantPerson) {
529
                     consultantInfo.setConsultantPersonId(consultantPerson.getPersonId());
529
                     consultantInfo.setConsultantPersonId(consultantPerson.getPersonId());
530
                 }
530
                 }
531
             }
531
             }
547
                 });
547
                 });
548
 
548
 
549
                 //塞入户型信息
549
                 //塞入户型信息
550
-                if (!StringUtils.isEmpty(e.getApartmentId())){
550
+                if (!StringUtils.isEmpty(e.getApartmentId())) {
551
                     TaBuildingApartment buildingApartment = taBuildingApartmentService.getById(e.getApartmentId());
551
                     TaBuildingApartment buildingApartment = taBuildingApartmentService.getById(e.getApartmentId());
552
                     e.setApartmentName(buildingApartment.getApartmentName());
552
                     e.setApartmentName(buildingApartment.getApartmentName());
553
                     e.setInsideArea(buildingApartment.getInsideArea());
553
                     e.setInsideArea(buildingApartment.getInsideArea());
559
             map.put("refundOrder", null);
559
             map.put("refundOrder", null);
560
             //订单信息
560
             //订单信息
561
             TaOrder taOrder = taOrderService.getById(taRaiseRecord.getOrderId());
561
             TaOrder taOrder = taOrderService.getById(taRaiseRecord.getOrderId());
562
-            if (null != taOrder){
562
+            if (null != taOrder) {
563
                 //退费信息
563
                 //退费信息
564
-                TaOrder refundOrder = taOrderService.getOne(new QueryWrapper<TaOrder>().eq("parent_order_id",taOrder.getOrderId()));
564
+                TaOrder refundOrder = taOrderService.getOne(new QueryWrapper<TaOrder>().eq("parent_order_id", taOrder.getOrderId()));
565
                 map.put("refundOrder", refundOrder);
565
                 map.put("refundOrder", refundOrder);
566
             }
566
             }
567
             map.put("taRaiseRecord", taRaiseRecord);
567
             map.put("taRaiseRecord", taRaiseRecord);