From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java
index 30e40a9..e8a1962 100755
--- a/service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java
@@ -162,7 +162,7 @@
if (feeDtos == null || feeDtos.size() != 1) {
throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏌ヨ璐圭敤淇℃伅澶辫触锛屾湭鏌ュ埌鏁版嵁鎴栨煡鍒板鏉℃暟鎹�");
}
- if (!businessFeeDetail.containsKey("state")) {
+ if (!businessFeeDetail.containsKey("state") || StringUtil.isEmpty(businessFeeDetail.getString("state"))) {
businessFeeDetail.put("state", "1400");
}
feeDto = feeDtos.get(0);
@@ -170,7 +170,8 @@
int hours = 0;
Date targetEndTime = null;
BigDecimal cycles = null;
- BigDecimal feePrice = new BigDecimal(computeFeeSMOImpl.getFeePrice(feeDto));
+ Map feePriceAll = computeFeeSMOImpl.getFeePrice(feeDto);
+ BigDecimal feePrice = new BigDecimal(feePriceAll.get("feePrice").toString());
if ("-101".equals(paramInJson.getString("cycles"))) {
Date endTime = feeDto.getEndTime();
Calendar endCalender = Calendar.getInstance();
@@ -222,13 +223,14 @@
if (feeDtos == null || feeDtos.size() != 1) {
throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏌ヨ璐圭敤淇℃伅澶辫触锛屾湭鏌ュ埌鏁版嵁鎴栨煡鍒板鏉℃暟鎹�");
}
- if (!businessFeeDetail.containsKey("state")) {
+ if (!businessFeeDetail.containsKey("state") || StringUtil.isEmpty(businessFeeDetail.getString("state"))) {
businessFeeDetail.put("state", "1400");
}
feeDto = feeDtos.get(0);
businessFeeDetail.put("startTime", paramInJson.getString("startTime"));
BigDecimal cycles = null;
- BigDecimal feePrice = new BigDecimal(computeFeeSMOImpl.getFeePrice(feeDto));
+ Map feePriceAll = computeFeeSMOImpl.getFeePrice(feeDto);
+ BigDecimal feePrice = new BigDecimal(feePriceAll.get("feePrice").toString());
Date endTime = feeDto.getEndTime();
Calendar endCalender = Calendar.getInstance();
endCalender.setTime(endTime);
@@ -295,6 +297,10 @@
endCalender.add(Calendar.MONTH, Integer.parseInt(paramInJson.getString("cycles")));
}
feeInfo.setEndTime(endCalender.getTime());
+ //鍒ゆ柇 缁撴潫鏃堕棿 鏄惁澶т簬 璐圭敤椤� 缁撴潫鏃堕棿锛岃繖閲� 瀹归敊涓�涓嬶紝濡傛灉 璐圭敤缁撴潫鏃堕棿澶т簬 璐圭敤椤圭粨鏉熸椂闂� 30澶� 璧版姤閿� 灞炰簬澶氱即璐�
+ if (feeInfo.getEndTime().getTime() - feeInfo.getConfigEndTime().getTime() > 30 * 24 * 60 * 60 * 1000L) {
+ throw new IllegalArgumentException("缂磋垂瓒呰繃浜� 璐圭敤椤圭粨鏉熸椂闂�");
+ }
Map feeMap = BeanConvertUtil.beanCovertMap(feeInfo);
feeMap.put("startTime", DateUtil.getFormatTimeString(feeInfo.getStartTime(), DateUtil.DATE_FORMATE_STRING_A));
feeMap.put("endTime", DateUtil.getFormatTimeString(feeInfo.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
@@ -331,10 +337,13 @@
if (FeeDto.FEE_FLAG_ONCE.equals(feeInfo.getFeeFlag())) { //缂磋垂缁撴潫
feeMap.put("state", FeeDto.STATE_FINISH);
}
+ Date maxEndTime = feeInfo.getConfigEndTime();
+ if(!FeeDto.FEE_FLAG_CYCLE.equals(feeInfo.getFeeFlag())){
+ maxEndTime = feeInfo.getDeadlineTime();
+ }
try {
Date endTime = DateUtil.getDateFromString(paramInJson.getString("endTime"), DateUtil.DATE_FORMATE_STRING_A);
- Date configEndTime = feeInfo.getConfigEndTime();
- if (endTime.getTime() >= configEndTime.getTime()) {
+ if (endTime.getTime() >= maxEndTime.getTime()) {
feeMap.put("state", FeeDto.STATE_FINISH);
}
} catch (ParseException e) {
@@ -401,9 +410,9 @@
double feePrice = 0.0;
- feePrice = computeFeeSMOImpl.getFeePrice(feeDto);
+ Map feePriceAll = computeFeeSMOImpl.getFeePrice(feeDto);
- BigDecimal receivableAmount = new BigDecimal(feePrice);
+ BigDecimal receivableAmount = new BigDecimal(feePriceAll.get("feePrice").toString());
BigDecimal cycles = new BigDecimal(Double.parseDouble(paramInJson.getString("cycles")));
double tmpReceivableAmount = cycles.multiply(receivableAmount).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
double discountPrice = paramInJson.getDouble("discountPrice");
@@ -436,6 +445,10 @@
endCalender.setTime(endTime);
endCalender.add(Calendar.MONTH, Integer.parseInt(paramInJson.getString("cycles")));
feeInfo.setEndTime(endCalender.getTime());
+ //鍒ゆ柇 缁撴潫鏃堕棿 鏄惁澶т簬 璐圭敤椤� 缁撴潫鏃堕棿锛岃繖閲� 瀹归敊涓�涓嬶紝濡傛灉 璐圭敤缁撴潫鏃堕棿澶т簬 璐圭敤椤圭粨鏉熸椂闂� 30澶� 璧版姤閿� 灞炰簬澶氱即璐�
+ if (feeInfo.getEndTime().getTime() - feeInfo.getConfigEndTime().getTime() > 30 * 24 * 60 * 60 * 1000L) {
+ throw new IllegalArgumentException("缂磋垂瓒呰繃浜� 璐圭敤椤圭粨鏉熸椂闂�" + JSONObject.toJSONString(feeInfo) + "|||" + paramInJson.getString("cycles"));
+ }
Map feeMap = BeanConvertUtil.beanCovertMap(feeInfo);
feeMap.put("startTime", DateUtil.getFormatTimeString(feeInfo.getStartTime(), DateUtil.DATE_FORMATE_STRING_A));
feeMap.put("endTime", DateUtil.getFormatTimeString(feeInfo.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
@@ -448,6 +461,7 @@
paramInJson.put("carPayerObjId", feeInfo.getPayerObjId());
return business;
}
+
public JSONObject modifyTempCarInout(JSONObject reqJson, DataFlowContext context) {
FeeDto feeDto = (FeeDto) reqJson.get("feeInfo");
@@ -606,6 +620,7 @@
businessUnit.put("payerObjType", FeeDto.PAYER_OBJ_TYPE_CAR);
businessUnit.put("feeFlag", paramInJson.getString("feeFlag"));
businessUnit.put("state", "2008001");
+ businessUnit.put("batchId", paramInJson.getString("batchId"));
businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessUnit);
paramInJson.put("feeId", businessUnit.getString("feeId"));
@@ -690,6 +705,7 @@
businessUnit.put("payerObjType", "3333");
businessUnit.put("feeFlag", paramInJson.getString("feeFlag"));
businessUnit.put("state", "2008001");
+ businessUnit.put("batchId", paramInJson.getString("batchId"));
businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessUnit);
paramInJson.put("feeId", businessUnit.getString("feeId"));
@@ -720,6 +736,9 @@
businessUnit.put("feeTypeCd", paramInJson.getString("feeTypeCd"));
businessUnit.put("incomeObjId", paramInJson.getString("storeId"));
businessUnit.put("amount", "-1.00");
+ if (paramInJson.containsKey("amount") && !StringUtil.isEmpty(paramInJson.getString("amount"))) {
+ businessUnit.put("amount", paramInJson.getString("amount"));
+ }
businessUnit.put("startTime", time);
businessUnit.put("endTime", time);
businessUnit.put("communityId", paramInJson.getString("communityId"));
@@ -727,6 +746,7 @@
businessUnit.put("payerObjType", FeeDto.PAYER_OBJ_TYPE_CONTRACT);
businessUnit.put("feeFlag", paramInJson.getString("feeFlag"));
businessUnit.put("state", "2008001");
+ businessUnit.put("batchId", paramInJson.getString("batchId"));
businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessUnit);
paramInJson.put("feeId", businessUnit.getString("feeId"));
--
Gitblit v1.8.0