From deefb560177d02de63a77d4c91429f7bb146e92b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 20 三月 2021 10:33:08 +0800
Subject: [PATCH] 优化 一次性费用缴费时间处理
---
service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java | 197 ++++++++----------------------------------------
1 files changed, 35 insertions(+), 162 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 2779d4d..0219726 100644
--- 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
@@ -1,6 +1,5 @@
package com.java110.api.bmo.fee.impl;
-
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.ApiBaseBMO;
import com.java110.api.bmo.fee.IFeeBMO;
@@ -18,8 +17,8 @@
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
-import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.po.car.CarInoutPo;
+import com.java110.po.fee.FeeAttrPo;
import com.java110.po.fee.PayFeeConfigPo;
import com.java110.po.fee.PayFeeDetailPo;
import com.java110.po.fee.PayFeePo;
@@ -54,7 +53,6 @@
@Service("feeBMOImpl")
public class FeeBMOImpl extends ApiBaseBMO implements IFeeBMO {
-
@Autowired
private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
@@ -66,9 +64,6 @@
@Autowired
private ICarInoutInnerServiceSMO carInoutInnerServiceSMOImpl;
-
- @Autowired
- private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
@Autowired
private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
@@ -106,29 +101,23 @@
public void updateFee(JSONObject paramInJson, DataFlowContext dataFlowContext) {
PayFeePo payFeePo = BeanConvertUtil.covertBean(paramInJson, PayFeePo.class);
-
super.update(dataFlowContext, payFeePo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FEE_INFO);
}
private static Calendar getTargetEndTime(Calendar endCalender, Double cycles) {
if (StringUtil.isInteger(cycles.toString())) {
endCalender.add(Calendar.MONTH, new Double(cycles).intValue());
-
return endCalender;
}
-
if (cycles >= 1) {
endCalender.add(Calendar.MONTH, new Double(Math.floor(cycles)).intValue());
cycles = cycles - Math.floor(cycles);
}
- //int hours = new Double(cycles * DateUtil.getCurrentMonthDay() * 24).intValue();
int futureDay = endCalender.getActualMaximum(Calendar.DAY_OF_MONTH);
int hours = new Double(cycles * futureDay * 24).intValue();
endCalender.add(Calendar.HOUR, hours);
-
return endCalender;
}
-
/**
* 娣诲姞璐圭敤鏄庣粏淇℃伅
@@ -138,15 +127,12 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public JSONObject addSimpleFeeDetail(PayFeeDetailPo payFeeDetailPo, DataFlowContext dataFlowContext) {
-
-
JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_DETAIL);
business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessFeeDetail = JSONObject.parseObject(JSONObject.toJSONString(payFeeDetailPo));
business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeeDetailPo.class.getSimpleName(), businessFeeDetail);
-
return business;
}
@@ -158,8 +144,6 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public JSONObject addFeeDetail(JSONObject paramInJson, DataFlowContext dataFlowContext, FeeReceiptDetailPo feeReceiptDetailPo, FeeReceiptPo feeReceiptPo) {
-
-
JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_DETAIL);
business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
@@ -167,13 +151,13 @@
JSONObject businessFeeDetail = new JSONObject();
businessFeeDetail.putAll(paramInJson);
businessFeeDetail.put("detailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
- businessFeeDetail.put("primeRate", "1.00");
+ //鏀粯鏂瑰紡
+ businessFeeDetail.put("primeRate", paramInJson.getString("primeRate"));
//璁＄畻 搴旀敹閲戦
FeeDto feeDto = new FeeDto();
feeDto.setFeeId(paramInJson.getString("feeId"));
feeDto.setCommunityId(paramInJson.getString("communityId"));
List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
-
if (feeDtos == null || feeDtos.size() != 1) {
throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏌ヨ璐圭敤淇℃伅澶辫触锛屾湭鏌ュ埌鏁版嵁鎴栨煡鍒板鏉℃暟鎹�");
}
@@ -203,10 +187,8 @@
double tmpReceivableAmount = cycles.multiply(feePrice).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
businessFeeDetail.put("receivableAmount", tmpReceivableAmount);
}
-
businessFeeDetail.put("endTime", DateUtil.getFormatTimeString(targetEndTime, DateUtil.DATE_FORMATE_STRING_A));
paramInJson.put("feeInfo", feeDto);
-
business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeeDetailPo.class.getSimpleName(), businessFeeDetail);
paramInJson.put("detailId", businessFeeDetail.getString("detailId"));
feeReceiptDetailPo.setAmount(businessFeeDetail.getString("receivedAmount"));
@@ -238,8 +220,6 @@
public JSONObject addOweFeeDetail(JSONObject paramInJson, DataFlowContext dataFlowContext,
List<FeeReceiptDetailPo> feeReceiptDetailPos,
List<FeeReceiptPo> feeReceiptPos) {
-
-
JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_DETAIL);
business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
@@ -247,13 +227,12 @@
JSONObject businessFeeDetail = new JSONObject();
businessFeeDetail.putAll(paramInJson);
businessFeeDetail.put("detailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
- businessFeeDetail.put("primeRate", "1.00");
+ businessFeeDetail.put("primeRate", paramInJson.getString("primeRate"));
//璁＄畻 搴旀敹閲戦
FeeDto feeDto = new FeeDto();
feeDto.setFeeId(paramInJson.getString("feeId"));
feeDto.setCommunityId(paramInJson.getString("communityId"));
List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
-
if (feeDtos == null || feeDtos.size() != 1) {
throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏌ヨ璐圭敤淇℃伅澶辫触锛屾湭鏌ュ埌鏁版嵁鎴栨煡鍒板鏉℃暟鎹�");
}
@@ -275,10 +254,8 @@
businessFeeDetail.put("endTime", paramInJson.getString("endTime"));
paramInJson.put("feeInfo", feeDto);
paramInJson.put("cycles", cycles.doubleValue());
-
business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeeDetailPo.class.getSimpleName(), businessFeeDetail);
paramInJson.put("detailId", businessFeeDetail.getString("detailId"));
-
FeeReceiptPo feeReceiptPo = new FeeReceiptPo();
FeeReceiptDetailPo feeReceiptDetailPo = new FeeReceiptDetailPo();
feeReceiptDetailPo.setAmount(businessFeeDetail.getString("receivedAmount"));
@@ -290,6 +267,7 @@
feeReceiptDetailPo.setFeeName(StringUtil.isEmpty(feeDto.getImportFeeName()) ? feeDto.getFeeName() : feeDto.getImportFeeName());
feeReceiptDetailPo.setStartTime(businessFeeDetail.getString("startTime"));
feeReceiptDetailPo.setReceiptId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_receiptId));
+
computeFeeSMOImpl.freshFeeReceiptDetail(feeDto, feeReceiptDetailPo);
feeReceiptDetailPos.add(feeReceiptDetailPo);
feeReceiptPo.setAmount(feeReceiptDetailPo.getAmount());
@@ -298,7 +276,6 @@
feeReceiptPo.setObjType(feeDto.getPayerObjType());
feeReceiptPo.setObjId(feeDto.getPayerObjId());
feeReceiptPo.setObjName(computeFeeSMOImpl.getFeeObjName(feeDto));
-
feeReceiptPos.add(feeReceiptPo);
return business;
}
@@ -311,8 +288,6 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public JSONObject modifyFee(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
-
JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FEE_INFO);
business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
@@ -324,9 +299,6 @@
endCalender.setTime(endTime);
int hours = 0;
if ("-101".equals(paramInJson.getString("cycles"))) {
-// hours = new Double(Double.parseDouble(paramInJson.getString("tmpCycles")) * DateUtil.getCurrentMonthDay() * 24).intValue();
-// endCalender.add(Calendar.HOUR, hours);
-
endCalender = getTargetEndTime(endCalender, Double.parseDouble(paramInJson.getString("tmpCycles")));
} else {
endCalender.add(Calendar.MONTH, Integer.parseInt(paramInJson.getString("cycles")));
@@ -337,16 +309,12 @@
feeMap.put("endTime", DateUtil.getFormatTimeString(feeInfo.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
feeMap.put("cycles", paramInJson.getString("cycles"));
feeMap.put("configEndTime", feeInfo.getConfigEndTime());
-
businessFee.putAll(feeMap);
business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessFee);
-
//涓哄仠杞﹁垂鍗曠嫭澶勭悊
paramInJson.put("carFeeEndTime", feeInfo.getEndTime());
paramInJson.put("carPayerObjType", feeInfo.getPayerObjType());
paramInJson.put("carPayerObjId", feeInfo.getPayerObjId());
-
-
return business;
}
@@ -358,8 +326,6 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public JSONObject modifyOweFee(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
-
JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_ONLY_UPDATE_FEE_INFO); //杩欓噷璧皁nly
business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
@@ -385,7 +351,6 @@
}
businessFee.putAll(feeMap);
business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessFee);
-
return business;
}
@@ -397,8 +362,6 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public JSONObject addFeePreDetail(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
-
JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_DETAIL);
business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
@@ -406,8 +369,7 @@
JSONObject businessFeeDetail = new JSONObject();
businessFeeDetail.putAll(paramInJson);
businessFeeDetail.put("detailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
- businessFeeDetail.put("primeRate", "1.00");
-
+ businessFeeDetail.put("primeRate", paramInJson.getString("primeRate"));
if (!businessFeeDetail.containsKey("state")) {
businessFeeDetail.put("state", "1400");
}
@@ -416,11 +378,9 @@
feeDto.setFeeId(paramInJson.getString("feeId"));
feeDto.setCommunityId(paramInJson.getString("communityId"));
List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
-
if (feeDtos == null || feeDtos.size() != 1) {
throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏌ヨ璐圭敤淇℃伅澶辫触锛屾湭鏌ュ埌鏁版嵁鎴栨煡鍒板鏉℃暟鎹�");
}
-
feeDto = feeDtos.get(0);
paramInJson.put("feeInfo", feeDto);
businessFeeDetail.put("startTime", DateUtil.getFormatTimeString(feeDto.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
@@ -435,7 +395,9 @@
} else {
endCalender.add(Calendar.MONTH, Integer.parseInt(paramInJson.getString("cycles")));
if (FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())) {
- if (!StringUtil.isEmpty(feeDto.getCurDegrees())) {
+ if(feeDto.getDeadlineTime() != null){
+ endCalender.setTime(feeDto.getDeadlineTime());
+ }else if (!StringUtil.isEmpty(feeDto.getCurDegrees())) {
endCalender.setTime(feeDto.getCurReadingTime());
} else if (feeDto.getImportFeeEndTime() == null) {
endCalender.setTime(feeDto.getConfigEndTime());
@@ -446,91 +408,11 @@
}
businessFeeDetail.put("endTime", DateUtil.getFormatTimeString(endCalender.getTime(), DateUtil.DATE_FORMATE_STRING_A));
- BigDecimal feePrice = new BigDecimal("0.00");
+ double feePrice = 0.0;
- if ("3333".equals(feeDto.getPayerObjType())) { //鎴垮眿鐩稿叧
- String computingFormula = feeDto.getComputingFormula();
- if ("1001".equals(computingFormula)) { //闈㈢Н*鍗曚环+闄勫姞璐�
- RoomDto roomDto = new RoomDto();
- roomDto.setRoomId(feeDto.getPayerObjId());
- roomDto.setCommunityId(feeDto.getCommunityId());
- List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
- if (roomDtos == null || roomDtos.size() != 1) {
- throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏈煡鍒版埧灞嬩俊鎭紝鏌ヨ澶氭潯鏁版嵁");
- }
- roomDto = roomDtos.get(0);
- //feePrice = Double.parseDouble(feeDto.getSquarePrice()) * Double.parseDouble(roomDtos.get(0).getBuiltUpArea()) + Double.parseDouble(feeDto.getAdditionalAmount());
- BigDecimal squarePrice = new BigDecimal(Double.parseDouble(feeDto.getSquarePrice()));
- BigDecimal builtUpArea = new BigDecimal(Double.parseDouble(roomDtos.get(0).getBuiltUpArea()));
- BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
- feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(2, BigDecimal.ROUND_HALF_EVEN);
- } else if ("2002".equals(computingFormula)) { // 鍥哄畾璐圭敤
- //feePrice = Double.parseDouble(feeDto.getAdditionalAmount());
- BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
- feePrice = additionalAmount.setScale(2, BigDecimal.ROUND_HALF_EVEN);
- } else if ("4004".equals(computingFormula)) {
- feePrice = new BigDecimal(Double.parseDouble(feeDto.getAmount()));
- } else if ("5005".equals(computingFormula)) {
- if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
- //throw new IllegalArgumentException("鎶勮〃鏁版嵁寮傚父");
- } else {
- BigDecimal curDegree = new BigDecimal(Double.parseDouble(feeDto.getCurDegrees()));
- BigDecimal preDegree = new BigDecimal(Double.parseDouble(feeDto.getPreDegrees()));
- BigDecimal squarePrice = new BigDecimal(Double.parseDouble(feeDto.getSquarePrice()));
- BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
- BigDecimal sub = curDegree.subtract(preDegree);
- feePrice = sub.multiply(squarePrice)
- .add(additionalAmount)
- .setScale(2, BigDecimal.ROUND_HALF_EVEN);
- }
- } else if ("6006".equals(computingFormula)) {
- feePrice = new BigDecimal(Double.parseDouble(feeDto.getAmount()));
- } else {
- throw new IllegalArgumentException("鏆備笉鏀寔璇ョ被鍏紡");
- }
- } else if ("6666".equals(feeDto.getPayerObjType())) {//杞︿綅鐩稿叧
- String computingFormula = feeDto.getComputingFormula();
- if ("1001".equals(computingFormula)) { //闈㈢Н*鍗曚环+闄勫姞璐�
- ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
- parkingSpaceDto.setCommunityId(feeDto.getCommunityId());
- parkingSpaceDto.setPsId(feeDto.getPayerObjId());
- List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
+ feePrice = computeFeeSMOImpl.getFeePrice(feeDto);
- if (parkingSpaceDtos == null || parkingSpaceDtos.size() < 1) { //鏁版嵁鏈夐棶棰�
- throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏈煡鍒板仠杞︿綅淇℃伅锛屾煡璇㈠鏉℃暟鎹�");
- }
- //feePrice = Double.parseDouble(feeDto.getSquarePrice()) * Double.parseDouble(parkingSpaceDtos.get(0).getArea()) + Double.parseDouble(feeDto.getAdditionalAmount());
- BigDecimal squarePrice = new BigDecimal(Double.parseDouble(feeDto.getSquarePrice()));
- BigDecimal builtUpArea = new BigDecimal(Double.parseDouble(parkingSpaceDtos.get(0).getArea()));
- BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
- feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(2, BigDecimal.ROUND_HALF_EVEN);
- } else if ("2002".equals(computingFormula)) { // 鍥哄畾璐圭敤
- //feePrice = Double.parseDouble(feeDto.getAdditionalAmount());
- BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
- feePrice = additionalAmount.setScale(2, BigDecimal.ROUND_HALF_EVEN);
- } else if ("5005".equals(computingFormula)) {
- if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
- throw new IllegalArgumentException("鎶勮〃鏁版嵁寮傚父");
- } else {
- BigDecimal curDegree = new BigDecimal(Double.parseDouble(feeDto.getCurDegrees()));
- BigDecimal preDegree = new BigDecimal(Double.parseDouble(feeDto.getPreDegrees()));
- BigDecimal squarePrice = new BigDecimal(Double.parseDouble(feeDto.getSquarePrice()));
- BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
- BigDecimal sub = curDegree.subtract(preDegree);
- feePrice = sub.multiply(squarePrice)
- .add(additionalAmount)
- .setScale(2, BigDecimal.ROUND_HALF_EVEN);
- }
- } else if ("6006".equals(computingFormula)) {
- feePrice = new BigDecimal(Double.parseDouble(feeDto.getAmount()));
- } else if ("4004".equals(computingFormula)) {
- feePrice = new BigDecimal(Double.parseDouble(feeDto.getAmount()));
- } else {
- throw new IllegalArgumentException("鏆備笉鏀寔璇ョ被鍏紡");
- }
- }
-
- BigDecimal receivableAmount = feePrice;
+ BigDecimal receivableAmount = new BigDecimal(feePrice);
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");
@@ -544,7 +426,6 @@
return business;
}
-
/**
* 淇敼璐圭敤淇℃伅
*
@@ -553,8 +434,6 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public JSONObject modifyPreFee(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
-
JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FEE_INFO);
business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
@@ -571,20 +450,16 @@
feeMap.put("endTime", DateUtil.getFormatTimeString(feeInfo.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
businessFee.putAll(feeMap);
business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessFee);
-
return business;
}
public JSONObject modifyTempCarInout(JSONObject reqJson, DataFlowContext context) {
-
FeeDto feeDto = (FeeDto) reqJson.get("feeInfo");
CarInoutDto tempCarInoutDto = new CarInoutDto();
tempCarInoutDto.setCommunityId(reqJson.getString("communityId"));
tempCarInoutDto.setInoutId(feeDto.getPayerObjId());
List<CarInoutDto> carInoutDtos = carInoutInnerServiceSMOImpl.queryCarInouts(tempCarInoutDto);
-
Assert.listOnlyOne(carInoutDtos, "鏍规嵁璐圭敤淇℃伅鍙嶅樊杞﹁締杩涘満璁板綍鏈煡鍒� 鎴栨煡鍒板鏉�");
-
CarInoutDto carInoutDto = carInoutDtos.get(0);
JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_CAR_INOUT);
@@ -606,8 +481,6 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public JSONObject addFeeTempDetail(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
-
JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_DETAIL);
business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
@@ -615,7 +488,7 @@
JSONObject businessFeeDetail = new JSONObject();
businessFeeDetail.putAll(paramInJson);
businessFeeDetail.put("detailId", "-1");
- businessFeeDetail.put("primeRate", "1.00");
+ businessFeeDetail.put("primeRate", paramInJson.getString("primeRate"));
if (!businessFeeDetail.containsKey("state")) {
businessFeeDetail.put("state", "1400");
}
@@ -663,15 +536,12 @@
BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
money = squarePrice.multiply(lastHour).add(additionalAmount).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
}
-
double receivableAmount = money;
-
businessFeeDetail.put("receivableAmount", receivableAmount);
business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeeDetailPo.class.getSimpleName(), businessFeeDetail);
paramInJson.put("receivableAmount", receivableAmount);
return business;
}
-
/**
* 淇敼璐圭敤淇℃伅
@@ -681,8 +551,6 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public JSONObject modifyTempFee(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
-
JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FEE_INFO);
business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
@@ -696,7 +564,6 @@
feeMap.put("state", "2009001");
businessFee.putAll(feeMap);
business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessFee);
-
return business;
}
@@ -708,8 +575,6 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public void addFeeConfig(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
-
paramInJson.put("configId", "-1");
paramInJson.put("isDefault", "F");
PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(paramInJson, PayFeeConfigPo.class);
@@ -724,19 +589,16 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public JSONObject addFee(OwnerCarDto ownerCarDto, JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
String time = DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A);
-
if (paramInJson.containsKey("startTime")) {
time = paramInJson.getString("startTime");
}
-
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);
business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessUnit = new JSONObject();
- businessUnit.put("feeId", "-1");
+ businessUnit.put("feeId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
businessUnit.put("configId", paramInJson.getString("configId"));
businessUnit.put("feeTypeCd", paramInJson.getString("feeTypeCd"));
businessUnit.put("incomeObjId", paramInJson.getString("storeId"));
@@ -750,8 +612,26 @@
businessUnit.put("state", "2008001");
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"));
return business;
+ }
+
+ @Override
+ public JSONObject addFeeAttr(JSONObject paramInJson, DataFlowContext dataFlowContext, String specCd, String value) {
+
+ 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);
+ business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+ FeeAttrPo feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(paramInJson.getString("communityId"));
+ feeAttrPo.setSpecCd(specCd);
+ feeAttrPo.setValue(value);
+ feeAttrPo.setFeeId(paramInJson.getString("feeId"));
+ feeAttrPo.setAttrId("-1");
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(FeeAttrPo.class.getSimpleName(), JSONObject.parseObject(JSONObject.toJSONString(feeAttrPo)));
+ return business;
+
}
/**
@@ -762,8 +642,6 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public JSONObject addSimpleFee(PayFeePo payFeePo, DataFlowContext dataFlowContext) {
-
-
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);
@@ -772,7 +650,6 @@
businessUnit = JSONObject.parseObject(JSONObject.toJSONString(payFeePo));
businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessUnit);
-
return business;
}
@@ -784,9 +661,7 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public JSONObject addRoomFee(RoomDto roomDto, JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
String time = DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A);
-
if (paramInJson.containsKey("feeEndDate")) {
time = paramInJson.getString("feeEndDate");
} else if (paramInJson.containsKey("startTime")) {
@@ -797,7 +672,7 @@
business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessUnit = new JSONObject();
- businessUnit.put("feeId", "-1");
+ businessUnit.put("feeId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
businessUnit.put("configId", paramInJson.getString("configId"));
businessUnit.put("feeTypeCd", paramInJson.getString("feeTypeCd"));
businessUnit.put("incomeObjId", paramInJson.getString("storeId"));
@@ -811,7 +686,7 @@
businessUnit.put("state", "2008001");
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"));
return business;
}
@@ -828,12 +703,10 @@
feeConfigDto.setConfigId(paramInJson.getString("configId"));
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
Assert.listOnlyOne(feeConfigDtos, "鏈壘鍒拌璐圭敤椤�");
-
JSONObject businessFeeConfig = new JSONObject();
businessFeeConfig.putAll(paramInJson);
businessFeeConfig.put("isDefault", feeConfigDtos.get(0).getIsDefault());
PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
-
super.update(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FEE_CONFIG);
}
--
Gitblit v1.8.0