傅行帆 5 anos atrás
pai
commit
1422dd2c63

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaHousingResourcesController.java Ver arquivo

275
                     //我的认筹
275
                     //我的认筹
276
                     if (e.getHouseId().equals(r.getHouseId())) {
276
                     if (e.getHouseId().equals(r.getHouseId())) {
277
                         e.setMineRaise("mine");
277
                         e.setMineRaise("mine");
278
-                        if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(r.getHouseLockingStatus())) {
278
+                        if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus())) {
279
                             e.setMineLocked("mine");
279
                             e.setMineLocked("mine");
280
                         }
280
                         }
281
                     }
281
                     }

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaRaiseRecordController.java Ver arquivo

559
             houseList.forEach(e -> {
559
             houseList.forEach(e -> {
560
                 taRaiseHouseList.forEach(r -> {
560
                 taRaiseHouseList.forEach(r -> {
561
                     //我的认筹
561
                     //我的认筹
562
-                    if (e.getHouseId().equals(r.getHouseId()) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(r.getHouseLockingStatus())) {
562
+                    if (e.getHouseId().equals(r.getHouseId()) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus())) {
563
                         e.setMineLocked("mine");
563
                         e.setMineLocked("mine");
564
                     }
564
                     }
565
                 });
565
                 });

+ 0
- 5
src/main/java/com/huiju/estateagents/entity/TaRaiseHouse.java Ver arquivo

50
      */
50
      */
51
     private LocalDateTime createDate;
51
     private LocalDateTime createDate;
52
 
52
 
53
-    /**
54
-     * 锁定状态 locked已锁定unlocked未锁定
55
-     */
56
-    private String houseLockingStatus;
57
-
58
     /**
53
     /**
59
      * 锁定人id
54
      * 锁定人id
60
      */
55
      */

+ 6
- 5
src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java Ver arquivo

694
                 taRaiseRecordMapper.updateById(taRaiseRecord);
694
                 taRaiseRecordMapper.updateById(taRaiseRecord);
695
 
695
 
696
                 // 更新关联表状态
696
                 // 更新关联表状态
697
-                TaRaiseHouse raiseHouse = new TaRaiseHouse();
698
-                raiseHouse.setRaiseHouseId(raiseHouseId);
699
-                raiseHouse.setHouseLockingStatus("locked");
700
-                responseBean.addSuccess(taRaiseHouseService.updateById(raiseHouse));
697
+//                TaRaiseHouse raiseHouse = new TaRaiseHouse();
698
+//                raiseHouse.setRaiseHouseId(raiseHouseId);
699
+//                raiseHouse.setHouseLockingStatus("locked");
700
+//            taRaiseHouseService.updateById(raiseHouse);
701
+                responseBean.addSuccess(taRaiseRecordMapper.updateById(taRaiseRecord));
701
                 return responseBean;
702
                 return responseBean;
702
         }
703
         }
703
 
704
 
725
                 // 更新关联表状态
726
                 // 更新关联表状态
726
                 TaRaiseHouse raiseHouse = new TaRaiseHouse();
727
                 TaRaiseHouse raiseHouse = new TaRaiseHouse();
727
                 raiseHouse.setRaiseHouseId(raiseHouseId);
728
                 raiseHouse.setRaiseHouseId(raiseHouseId);
728
-                raiseHouse.setHouseLockingStatus("unlocked");
729
+//                raiseHouse.setHouseLockingStatus("unlocked");
729
                 raiseHouse.setPersonId("");
730
                 raiseHouse.setPersonId("");
730
                 raiseHouse.setPersonName("");
731
                 raiseHouse.setPersonName("");
731
                 responseBean.addSuccess(taRaiseHouseService.updateById(raiseHouse));
732
                 responseBean.addSuccess(taRaiseHouseService.updateById(raiseHouse));

+ 0
- 3
src/main/java/com/huiju/estateagents/service/impl/TaRaiseRecordServiceImpl.java Ver arquivo

234
             taRaiseHouse.setHouseId(e);
234
             taRaiseHouse.setHouseId(e);
235
             taRaiseHouse.setCreateDate(LocalDateTime.now());
235
             taRaiseHouse.setCreateDate(LocalDateTime.now());
236
             if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO)) {
236
             if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO)) {
237
-                taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
238
                 taRaiseHouse.setPersonId(personId);
237
                 taRaiseHouse.setPersonId(personId);
239
                 taRaiseHouse.setPersonName(taPerson.getName());
238
                 taRaiseHouse.setPersonName(taPerson.getName());
240
-            } else {
241
-                taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
242
             }
239
             }
243
             taRaiseHouse.setOrgId(orgId);
240
             taRaiseHouse.setOrgId(orgId);
244
             taRaiseHouse.setRaiseRecordId(taRaiseRecord.getRaiseRecordId());
241
             taRaiseHouse.setRaiseRecordId(taRaiseRecord.getRaiseRecordId());

+ 4
- 4
src/main/java/com/huiju/estateagents/service/impl/WxPayServiceImpl.java Ver arquivo

274
         taHousingResources.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
274
         taHousingResources.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
275
         taHousingResourcesMapper.updateById(taHousingResources);
275
         taHousingResourcesMapper.updateById(taHousingResources);
276
         //更改此认筹旦和房源关系为解锁状态
276
         //更改此认筹旦和房源关系为解锁状态
277
-        taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
278
-        taRaiseHouseMapper.updateById(taRaiseHouse);
277
+//        taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
278
+//        taRaiseHouseMapper.updateById(taRaiseHouse);
279
         //更改认筹单为解锁状态
279
         //更改认筹单为解锁状态
280
         taRaiseRecord.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
280
         taRaiseRecord.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
281
         taRaiseRecordMapper.updateById(taRaiseRecord);
281
         taRaiseRecordMapper.updateById(taRaiseRecord);
428
         taHousingResources.setHouseLockingPerson(taRaiseHouse.getPersonId());
428
         taHousingResources.setHouseLockingPerson(taRaiseHouse.getPersonId());
429
         taHousingResourcesMapper.updateById(taHousingResources);
429
         taHousingResourcesMapper.updateById(taHousingResources);
430
         //更改此认筹旦和房源关系为锁定状态
430
         //更改此认筹旦和房源关系为锁定状态
431
-        taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
432
-        taRaiseHouseMapper.updateById(taRaiseHouse);
431
+//        taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
432
+//        taRaiseHouseMapper.updateById(taRaiseHouse);
433
         //更改认筹单为锁定状态
433
         //更改认筹单为锁定状态
434
         taRaiseRecord.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
434
         taRaiseRecord.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
435
         taRaiseRecordMapper.updateById(taRaiseRecord);
435
         taRaiseRecordMapper.updateById(taRaiseRecord);