From c74a42b5c4e2a8803eeb4dfbdd4863968c81c0a5 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 15 十二月 2020 18:57:03 +0800
Subject: [PATCH] 优化欠费缴费完成
---
service-api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java
index bc89e53..c91abdf 100644
--- a/service-api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java
@@ -4,9 +4,9 @@
import com.java110.api.bmo.ApiBaseBMO;
import com.java110.api.bmo.parkingSpace.IParkingSpaceBMO;
import com.java110.core.context.DataFlowContext;
-import com.java110.core.smo.community.IParkingSpaceInnerServiceSMO;
-import com.java110.core.smo.fee.IFeeConfigInnerServiceSMO;
-import com.java110.core.smo.fee.IFeeInnerServiceSMO;
+import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
+import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
+import com.java110.intf.fee.IFeeInnerServiceSMO;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerCarDto;
@@ -214,7 +214,8 @@
businessOwnerCar.putAll(paramInJson);
businessOwnerCar.put("carId", "-1");
OwnerCarPo ownerCarPo = BeanConvertUtil.covertBean(businessOwnerCar, OwnerCarPo.class);
- super.delete(dataFlowContext, ownerCarPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_OWNER_CAR);
+ ownerCarPo.setState(OwnerCarDto.STATE_NORMAL);
+ super.insert(dataFlowContext, ownerCarPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_OWNER_CAR);
}
/**
@@ -231,7 +232,8 @@
List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
if (parkingSpaceDtos == null || parkingSpaceDtos.size() != 1) {
- throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏈煡璇㈠埌鍋滆溅浣嶄俊鎭�" + JSONObject.toJSONString(parkingSpaceDto));
+ //throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏈煡璇㈠埌鍋滆溅浣嶄俊鎭�" + JSONObject.toJSONString(parkingSpaceDto));
+ return ;
}
parkingSpaceDto = parkingSpaceDtos.get(0);
@@ -239,9 +241,9 @@
JSONObject businessParkingSpace = new JSONObject();
businessParkingSpace.putAll(BeanConvertUtil.beanCovertMap(parkingSpaceDto));
- businessParkingSpace.put("state", this.isHireParkingSpace(paramInJson) ? "H" : "S");
+ businessParkingSpace.put("state", paramInJson.getString("carNumType"));
ParkingSpacePo parkingSpacePo = BeanConvertUtil.covertBean(businessParkingSpace, ParkingSpacePo.class);
- super.delete(dataFlowContext, parkingSpacePo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_PARKING_SPACE);
+ super.update(dataFlowContext, parkingSpacePo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_PARKING_SPACE);
}
@@ -340,8 +342,7 @@
FeeConfigDto feeConfigDto = new FeeConfigDto();
- feeConfigDto.setFeeTypeCd(feeTypeCd);
- feeConfigDto.setIsDefault("T");
+ feeConfigDto.setConfigId(paramInJson.getString("configId"));
feeConfigDto.setCommunityId(paramInJson.getString("communityId"));
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
if (feeConfigDtos == null || feeConfigDtos.size() != 1) {
@@ -350,29 +351,29 @@
feeConfigDto = feeConfigDtos.get(0);
- double receivableAmount = isHireParkingSpace(paramInJson) ? Double.parseDouble(feeConfigDto.getAdditionalAmount())
- * Double.parseDouble(paramInJson.getString("cycles")) : Double.parseDouble(feeConfigDto.getAdditionalAmount());
+ double receivableAmount = Double.parseDouble(feeConfigDto.getAdditionalAmount())
+ * Double.parseDouble(paramInJson.getString("cycles"));
paramInJson.put("receivableAmount", receivableAmount);
paramInJson.put("configId", feeConfigDto.getConfigId());
//璁＄畻 amount
- String amount = isHireParkingSpace(paramInJson) ? "-1.00" : String.valueOf(receivableAmount);
+ String amount = "-1.00";
paramInJson.put("amount", amount);
//璁＄畻 cycles
- String cycles = isHireParkingSpace(paramInJson) ? paramInJson.getString("cycles") : "1";
+ String cycles = paramInJson.getString("cycles");
paramInJson.put("cycles", cycles);
//璁＄畻缁撴潫鏃堕棿
- String endTime = "2038-01-01 00:00:00";
- if (isHireParkingSpace(paramInJson)) {
- Date et = DateUtil.getCurrentDate();
- Calendar endCalender = Calendar.getInstance();
- endCalender.setTime(et);
- endCalender.add(Calendar.MONTH, Integer.parseInt(paramInJson.getString("cycles")));
- endTime = DateUtil.getFormatTimeString(endCalender.getTime(), DateUtil.DATE_FORMATE_STRING_A);
- }
+ String endTime = "";
+
+ Date et = DateUtil.getCurrentDate();
+ Calendar endCalender = Calendar.getInstance();
+ endCalender.setTime(et);
+ endCalender.add(Calendar.MONTH, Integer.parseInt(paramInJson.getString("cycles")));
+ endTime = DateUtil.getFormatTimeString(endCalender.getTime(), DateUtil.DATE_FORMATE_STRING_A);
+
paramInJson.put("endTime", endTime);
--
Gitblit v1.8.0