From 76135256f3029ec95540bbe98b16273c44b3c808 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 12 八月 2020 22:23:31 +0800
Subject: [PATCH] 优化微信手机号登录
---
service-api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java | 49 ++++++++++++++++++++++++-------------------------
1 files changed, 24 insertions(+), 25 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 ce9a48a..39e546e 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.fee.IFeeConfigInnerServiceSMO;
-import com.java110.core.smo.fee.IFeeInnerServiceSMO;
-import com.java110.core.smo.community.IParkingSpaceInnerServiceSMO;
+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;
@@ -326,22 +326,21 @@
// 璁＄畻feeTypeCd
- String feeTypeCd = "1001".equals(parkingSpaceDto.getTypeCd())
- ? (this.isHireParkingSpace(paramInJson)
- ? FeeTypeConstant.FEE_TYPE_HIRE_UP_PARKING_SPACE
- : FeeTypeConstant.FEE_TYPE_SELL_UP_PARKING_SPACE)
- : (this.isHireParkingSpace(paramInJson)
- ? FeeTypeConstant.FEE_TYPE_HIRE_DOWN_PARKING_SPACE
- : FeeTypeConstant.FEE_TYPE_SELL_DOWN_PARKING_SPACE);
-
+// String feeTypeCd = "1001".equals(parkingSpaceDto.getTypeCd())
+// ? (this.isHireParkingSpace(paramInJson)
+// ? FeeTypeConstant.FEE_TYPE_HIRE_UP_PARKING_SPACE
+// : FeeTypeConstant.FEE_TYPE_SELL_UP_PARKING_SPACE)
+// : (this.isHireParkingSpace(paramInJson)
+// ? FeeTypeConstant.FEE_TYPE_HIRE_DOWN_PARKING_SPACE
+// : FeeTypeConstant.FEE_TYPE_SELL_DOWN_PARKING_SPACE);
+ String feeTypeCd = FeeTypeConstant.FEE_TYPE_CAR;
paramInJson.put("feeTypeCd", feeTypeCd);
//璁＄畻 receivableAmount
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 +349,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