优化代码

java110-bean/src/main/java/com/java110/dto/machine/CarResultDto.java

@@ -33,6 +33,20 @@ public class CarResultDto {
 
     private String phone;
 
+    private String num;
+
+    private String paId;
+
+    private String areaNum;
+    public String getAreaNum() {
+        return areaNum;
+    }
+
+    public void setAreaNum(String areaNum) {
+        this.areaNum = areaNum;
+    }
+
+
     public String getCarId() {
         return carId;
     }
@@ -128,4 +142,21 @@ public class CarResultDto {
     public void setPhone(String phone) {
         this.phone = phone;
     }
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getPaId() {
+        return paId;
+    }
+
+    public void setPaId(String paId) {
+        this.paId = paId;
+    }
+
 }

java110-utils/src/main/java/com/java110/utils/constant/ServiceCodeConstant.java

@@ -569,6 +569,9 @@ public class ServiceCodeConstant {
     //设置房屋费用
     public static final String SERVICE_CODE_DELETE_FEE = "fee.deleteFee";
 
+    //修改房屋费用
+    public static final String SERVICE_CODE_UPDATE_FEE = "fee.updateFee";
+
     //预交费
     public static final String SERVICE_CODE_PAY_FEE_PRE = "fee.payFeePre";
     /**

service-api/src/main/java/com/java110/api/bmo/machineTranslate/impl/OwnerCarMachineTranslateBMOImpl.java

@@ -6,11 +6,14 @@ import com.java110.dto.machine.CarResultDto;
 import com.java110.dto.machine.MachineTranslateDto;
 import com.java110.dto.owner.OwnerCarDto;
 import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.parking.ParkingSpaceDto;
 import com.java110.intf.common.IFileInnerServiceSMO;
 import com.java110.intf.common.IMachineTranslateInnerServiceSMO;
 import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
 import com.java110.intf.user.IOwnerCarInnerServiceSMO;
 import com.java110.intf.user.IOwnerInnerServiceSMO;
+import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,6 +45,9 @@ public class OwnerCarMachineTranslateBMOImpl implements IOwnerCarMachineTranslat
     @Autowired
     private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
 
+    @Autowired
+    private IParkingSpaceInnerServiceSMO parkingSpaceInnerServiceSMOImpl;
+
     @Override
     public CarResultDto getInfo(JSONObject reqJson) {
 
@@ -65,6 +71,20 @@ public class OwnerCarMachineTranslateBMOImpl implements IOwnerCarMachineTranslat
         }
 
         CarResultDto carResultDto = new CarResultDto();
+        if (!StringUtil.isEmpty(ownerCarDto.getPsId())) {
+            ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
+            parkingSpaceDto.setPsId(ownerCarDto.getPsId());
+            parkingSpaceDto.setCommunityId(communityId);
+            List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
+
+            if (parkingSpaceDtos != null && parkingSpaceDtos.size() > 0) {
+                carResultDto.setPaId(parkingSpaceDtos.get(0).getPaId());
+                carResultDto.setAreaNum(parkingSpaceDtos.get(0).getAreaNum());
+                carResultDto.setNum(parkingSpaceDtos.get(0).getNum());
+            }
+        }
+
+
         carResultDto.setCarId(ownerCarDto.getCarId());
         carResultDto.setCommunityId(communityId);
         carResultDto.setCommunityName(reqJson.getString("communityName"));

service-api/src/main/java/com/java110/api/listener/fee/UpdateFeeListener.java

@@ -0,0 +1,91 @@
+package com.java110.api.listener.fee;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.api.bmo.fee.IFeeBMO;
+import com.java110.api.listener.AbstractServiceApiPlusListener;
+import com.java110.core.annotation.Java110Listener;
+import com.java110.core.context.DataFlowContext;
+import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.dto.fee.FeeDto;
+import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.utils.constant.ServiceCodeConstant;
+import com.java110.utils.util.Assert;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpMethod;
+
+import java.util.List;
+
+/**
+ * @ClassName SaveRoomCreateFeeListener
+ * @Description TODO 变更费用
+ * @Author wuxw
+ * @Date 2020/1/31 15:57
+ * @Version 1.0
+ * add by wuxw 2020/1/31
+ **/
+@Java110Listener("updateFeeListener")
+public class UpdateFeeListener extends AbstractServiceApiPlusListener {
+    private static Logger logger = LoggerFactory.getLogger(UpdateFeeListener.class);
+    @Autowired
+    private IFeeBMO feeBMOImpl;
+
+    private static final int DEFAULT_ADD_FEE_COUNT = 200;
+
+    @Autowired
+    private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
+
+    @Autowired
+    private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
+
+    @Override
+    public String getServiceCode() {
+        return ServiceCodeConstant.SERVICE_CODE_UPDATE_FEE;
+    }
+
+    @Override
+    public HttpMethod getHttpMethod() {
+        return HttpMethod.POST;
+    }
+
+    @Override
+    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+        // super.validatePageInfo(pd);
+        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区ID");
+        Assert.hasKeyAndValue(reqJson, "feeId", "未包含feeId");
+        Assert.hasKeyAndValue(reqJson, "startTime", "未包含开始时间");
+        Assert.hasKeyAndValue(reqJson, "endTime", "未包含结束时间");
+
+        FeeDto feeDto = new FeeDto();
+        feeDto.setCommunityId(reqJson.getString("communityId"));
+        feeDto.setFeeId(reqJson.getString("feeId"));
+
+        List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
+
+        Assert.listOnlyOne(feeDtos, "未查询到费用信息 或查询到多条" + reqJson);
+
+    }
+
+    @Override
+    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+
+        feeBMOImpl.updateFee(reqJson, context);
+
+
+    }
+
+    @Override
+    public int getOrder() {
+        return DEFAULT_ORDER;
+    }
+
+    public IRoomInnerServiceSMO getRoomInnerServiceSMOImpl() {
+        return roomInnerServiceSMOImpl;
+    }
+
+    public void setRoomInnerServiceSMOImpl(IRoomInnerServiceSMO roomInnerServiceSMOImpl) {
+        this.roomInnerServiceSMOImpl = roomInnerServiceSMOImpl;
+    }
+}