From d5c47715dcf791ad31786c38ce369486e75acb35 Mon Sep 17 00:00:00 2001
From: 1098226878 <1098226878@qq.com>
Date: 星期四, 16 九月 2021 10:28:00 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java | 26 ++++++++++++++++++--------
1 files changed, 18 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 871ef53..189e5ec 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
@@ -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();
@@ -228,7 +229,8 @@
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);
@@ -296,7 +298,7 @@
}
feeInfo.setEndTime(endCalender.getTime());
//鍒ゆ柇 缁撴潫鏃堕棿 鏄惁澶т簬 璐圭敤椤� 缁撴潫鏃堕棿锛岃繖閲� 瀹归敊涓�涓嬶紝濡傛灉 璐圭敤缁撴潫鏃堕棿澶т簬 璐圭敤椤圭粨鏉熸椂闂� 30澶� 璧版姤閿� 灞炰簬澶氱即璐�
- if (feeInfo.getEndTime().getTime() - feeInfo.getConfigEndTime().getTime() > 30 * 24 * 60 * 60 * 1000) {
+ if (feeInfo.getEndTime().getTime() - feeInfo.getConfigEndTime().getTime() > 30 * 24 * 60 * 60 * 1000L) {
throw new IllegalArgumentException("缂磋垂瓒呰繃浜� 璐圭敤椤圭粨鏉熸椂闂�");
}
Map feeMap = BeanConvertUtil.beanCovertMap(feeInfo);
@@ -405,9 +407,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");
@@ -441,8 +443,8 @@
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 * 1000) {
- throw new IllegalArgumentException("缂磋垂瓒呰繃浜� 璐圭敤椤圭粨鏉熸椂闂�");
+ 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));
@@ -456,6 +458,7 @@
paramInJson.put("carPayerObjId", feeInfo.getPayerObjId());
return business;
}
+
public JSONObject modifyTempCarInout(JSONObject reqJson, DataFlowContext context) {
FeeDto feeDto = (FeeDto) reqJson.get("feeInfo");
@@ -664,13 +667,20 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addRoomFee(RoomDto roomDto, JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public JSONObject addRoomFee(RoomDto roomDto, JSONObject paramInJson, DataFlowContext dataFlowContext) throws ParseException {
String time = DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A);
if (paramInJson.containsKey("feeEndDate")) {
time = paramInJson.getString("feeEndDate");
} else if (paramInJson.containsKey("startTime")) {
time = paramInJson.getString("startTime");
}
+ //鑾峰彇璐圭敤鏍囪瘑
+ String feeFlag = paramInJson.getString("feeFlag");
+ //鏌ヨ璐圭敤椤�
+ FeeConfigDto feeConfigDto = new FeeConfigDto();
+ feeConfigDto.setConfigId(paramInJson.getString("configId"));
+ List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
+ Assert.listOnlyOne(feeConfigDtos, "鏌ヨ璐圭敤椤归敊璇紒");
JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_INFO);
business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
--
Gitblit v1.8.0