java110 лет назад: 4
Родитель
Сommit
30e860a9cb

+ 5 - 3
service-api/src/main/java/com/java110/api/listener/owner/DeleteCarParkingSpaceListener.java

@@ -86,9 +86,9 @@ public class DeleteCarParkingSpaceListener extends AbstractServiceApiPlusListene
             throw new IllegalArgumentException("车位已经释放无需释放");
         }
 
-        if (ownerCarDtos.get(0).getEndTime().getTime() > DateUtil.getCurrentDate().getTime()) {
-            throw new IllegalArgumentException("车位租用还未结束不能释放");
-        }
+//        if (ownerCarDtos.get(0).getEndTime().getTime() > DateUtil.getCurrentDate().getTime()) {
+//            throw new IllegalArgumentException("车位租用还未结束不能释放");
+//        }
         reqJson.put("ownerCarDto", ownerCarDtos.get(0));
     }
 
@@ -100,12 +100,14 @@ public class DeleteCarParkingSpaceListener extends AbstractServiceApiPlusListene
         feeDto.setPayerObjId(reqJson.getString("carId"));
         feeDto.setCommunityId(reqJson.getString("communityId"));
         feeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
+        feeDto.setState(FeeDto.STATE_FINISH);
         List<FeeDto> feeDtoList = feeInnerServiceSMOImpl.queryFees(feeDto);
         boolean oweFee = false;
         if (feeDtoList == null || feeDtoList.size() < 1) {
             oweFee = true;
         }
         for (FeeDto tmpFeeDto : feeDtoList) {
+
             if (tmpFeeDto.getEndTime().getTime() <= ownerCarDto.getEndTime().getTime()) {
                 oweFee = true;
                 break;

+ 9 - 0
service-dev/src/main/resources/application-dev.yml

@@ -26,6 +26,15 @@ server:
 
 java110:
   community-service: community-service
+  acct-service: acct-service
+  user-service: user-service
+  store-service: store-service
+  common-service: common-service
+  job-service: job-service
+  fee-service: fee-service
+  report-service: report-service
+  dev-service: dev-service
+  oa-service: oa-service
 
 spring:
   profiles: