优化车辆创建费用时bug

java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml

@@ -119,14 +119,9 @@
         pa.num areaNum,
         pa.type_cd typeCd,
         t.create_time createTime
-        FROM
-        parking_space t
-        LEFT JOIN t_dict td1 ON t.state = td1.status_cd
-        AND td1.table_name = 'parking_space'
-        AND td1.table_columns = 'state'
-        LEFT JOIN t_dict td2 ON t.parking_type = td2.status_cd
-        AND td2.table_name = 'parking_space'
-        AND td2.table_columns = 'parking_type'
+        FROM parking_space t
+        LEFT JOIN t_dict td1 ON t.state = td1.status_cd AND td1.table_name = 'parking_space' AND td1.table_columns = 'state'
+        LEFT JOIN t_dict td2 ON t.parking_type = td2.status_cd AND td2.table_name = 'parking_space' AND td2.table_columns = 'parking_type'
         LEFT JOIN parking_area pa ON t.pa_id = pa.pa_id
         AND pa.status_cd = '0'
         <where>

service-fee/src/main/java/com/java110/fee/cmd/fee/SaveParkingSpaceCreateFeeCmd.java

@@ -24,10 +24,7 @@ import com.java110.po.fee.FeeAttrPo;
 import com.java110.po.fee.PayFeePo;
 import com.java110.po.payFee.PayFeeBatchPo;
 import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.DateUtil;
-import com.java110.utils.util.StringUtil;
+import com.java110.utils.util.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -238,11 +235,11 @@ public class SaveParkingSpaceCreateFeeCmd extends Cmd {
             }
 
             parkingSpaceDto = new ParkingSpaceDto();
-            parkingSpaceDto.setCarNum(ownerCarDtos.get(ownerCarIndex).getCarNum());
+            parkingSpaceDto.setPsId(ownerCarDtos.get(ownerCarIndex).getPsId());
             parkingSpaceDto.setCommunityId(ownerCarDtos.get(0).getCommunityId());
             parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
 
-            if (parkingSpaceDtos != null && parkingSpaceDtos.size() > 0) {
+            if (!ListUtil.isNull(parkingSpaceDtos)) {
                 carName = parkingSpaceDtos.get(0).getAreaNum() + parkingSpaceDtos.get(0).getNum() + "(" + ownerCarDtos.get(ownerCarIndex).getCarNum() + ")";
             } else {
                 carName = ownerCarDtos.get(ownerCarIndex).getCarNum();