LAPTOP-FO2T5SIU\35838 2 kuukautta sitten
vanhempi
commit
6fcd5eb480

+ 2 - 2
pro-base/src/main/java/com/idea/buildManage/service/ParkRoomService.java

@@ -773,8 +773,8 @@ public class ParkRoomService implements BaseService<ParkRoom, ParkRoomExample> {
                 if (room.getSoldStatus() == 4) {
                     roomResponse.setProjectStatusStr("已退房");
                 }
-                // 初始状态 待售
-                if (room.getIsChoose() == 0) {
+                // 初始状态 待售 (退房后isChoose会变成0)
+                if (room.getIsChoose() == 0 && room.getSoldStatus() != 4) {
                     roomResponse.setProjectStatusStr("初始状态");
                 }
                 parkRoomResponses.add(roomResponse);

+ 2 - 3
pro-base/src/main/java/com/idea/paymentManagement/service/RefundManageService.java

@@ -182,11 +182,10 @@ public class RefundManageService implements BaseService<RefundManage, RefundMana
         Integer collectionStatus = null;
         Integer fundCollectionStatus = null;
         for (RefundDetail detail : details) {
-            if (detail.getType().equals("定金") || detail.getType().equals("房款")) {
-                collectionStatus = 3;
-            }
             if (detail.getType().equals("专项维修资金")) {
                 fundCollectionStatus = 3;
+            }else {
+                collectionStatus = 3;
             }
             detail.setRefundManageId(id);
             detail.setCreatedId(userId);