From 240deec0aca6b002be068fdc9553bff9cda2c64b Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 27 十一月 2023 20:06:38 +0800
Subject: [PATCH] 优化欠费缴费 账户扣款
---
service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java | 411 ----------------------------------------------------------
1 files changed, 1 insertions(+), 410 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java
index ea9f438..b97e08c 100644
--- a/service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java
@@ -85,38 +85,6 @@
@Autowired
private IFeeReceiptInnerServiceSMO feeReceiptInnerServiceSMOImpl;
- /**
- * 娣诲姞灏忓尯淇℃伅
- *
- * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
- * @param dataFlowContext 鏁版嵁涓婁笅鏂�
- * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
- */
- public void deleteFeeConfig(JSONObject paramInJson, DataFlowContext dataFlowContext) {
- PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(paramInJson, PayFeeConfigPo.class);
- super.delete(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_FEE_CONFIG);
- }
-
- /**
- * 娣诲姞鐗╀笟璐圭敤
- *
- * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
- * @param dataFlowContext 鏁版嵁涓婁笅鏂�
- * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
- */
- public void deleteFee(JSONObject paramInJson, DataFlowContext dataFlowContext) {
- JSONObject businessUnit = new JSONObject();
- businessUnit.put("feeId", paramInJson.getString("feeId"));
- businessUnit.put("communityId", paramInJson.getString("communityId"));
- PayFeePo payFeePo = BeanConvertUtil.covertBean(businessUnit, PayFeePo.class);
- super.delete(dataFlowContext, payFeePo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_FEE_INFO);
- }
-
- 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());
@@ -130,238 +98,6 @@
int hours = new Double(cycles * futureDay * 24).intValue();
endCalender.add(Calendar.HOUR, hours);
return endCalender;
- }
-
- /**
- * 娣诲姞璐圭敤鏄庣粏淇℃伅
- *
- * @param payFeeDetailPo 璐圭敤鏄庣粏
- * @param dataFlowContext 鏁版嵁涓婁笅鏂�
- * @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;
- }
-
- /**
- * 娣诲姞璐圭敤鏄庣粏淇℃伅
- *
- * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
- * @param dataFlowContext 鏁版嵁涓婁笅鏂�
- * @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);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- JSONObject businessFeeDetail = new JSONObject();
- businessFeeDetail.putAll(paramInJson);
- businessFeeDetail.put("detailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
- //鏀粯鏂瑰紡
- 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, "鏌ヨ璐圭敤淇℃伅澶辫触锛屾湭鏌ュ埌鏁版嵁鎴栨煡鍒板鏉℃暟鎹�");
- }
- if (!businessFeeDetail.containsKey("state") || StringUtil.isEmpty(businessFeeDetail.getString("state"))) {
- businessFeeDetail.put("state", "1400");
- }
- feeDto = feeDtos.get(0);
- businessFeeDetail.put("startTime", DateUtil.getFormatTimeString(feeDto.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
- int hours = 0;
- Date targetEndTime = null;
- BigDecimal cycles = null;
- 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();
- endCalender.setTime(endTime);
- BigDecimal receivedAmount = new BigDecimal(Double.parseDouble(paramInJson.getString("receivedAmount")));
- cycles = receivedAmount.divide(feePrice, 4, BigDecimal.ROUND_HALF_EVEN);
- endCalender = getTargetEndTime(endCalender, cycles.doubleValue());
- targetEndTime = endCalender.getTime();
- paramInJson.put("tmpCycles", cycles.doubleValue());
- businessFeeDetail.put("cycles", cycles.doubleValue());
- businessFeeDetail.put("receivableAmount", receivedAmount.doubleValue());
- } else {
- targetEndTime = computeFeeSMOImpl.getFeeEndTimeByCycles(feeDto, paramInJson.getString("cycles"));
- cycles = new BigDecimal(Double.parseDouble(paramInJson.getString("cycles")));
- 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"));
-
- return business;
- }
-
- /**
- * 娣诲姞璐圭敤鏄庣粏淇℃伅
- *
- * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
- * @param dataFlowContext 鏁版嵁涓婁笅鏂�
- * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
- */
- 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);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- JSONObject businessFeeDetail = new JSONObject();
- businessFeeDetail.putAll(paramInJson);
- businessFeeDetail.put("detailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
- 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, "鏌ヨ璐圭敤淇℃伅澶辫触锛屾湭鏌ュ埌鏁版嵁鎴栨煡鍒板鏉℃暟鎹�");
- }
- 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;
- Map feePriceAll = computeFeeSMOImpl.getFeePrice(feeDto);
- BigDecimal feePrice = new BigDecimal(feePriceAll.get("feePrice").toString());
- Date endTime = feeDto.getEndTime();
- Calendar endCalender = Calendar.getInstance();
- endCalender.setTime(endTime);
- BigDecimal receivedAmount = new BigDecimal(Double.parseDouble(paramInJson.getString("receivedAmount")));
- cycles = receivedAmount.divide(feePrice, 4, BigDecimal.ROUND_HALF_EVEN);
- businessFeeDetail.put("cycles", cycles.doubleValue());
- businessFeeDetail.put("receivableAmount", paramInJson.getString("receivedAmount"));
- businessFeeDetail.put("receivedAmount", paramInJson.getString("receivedAmount"));
- 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"));
- feeReceiptDetailPo.setCommunityId(feeDto.getCommunityId());
- feeReceiptDetailPo.setCycle(businessFeeDetail.getString("cycles"));
- feeReceiptDetailPo.setDetailId(businessFeeDetail.getString("detailId"));
- feeReceiptDetailPo.setEndTime(businessFeeDetail.getString("endTime"));
- feeReceiptDetailPo.setFeeId(feeDto.getFeeId());
- 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);
- //鏌ヨ涓氫富淇℃伅
- OwnerDto ownerDto = computeFeeSMOImpl.getFeeOwnerDto(feeDto);
-
- feeReceiptDetailPos.add(feeReceiptDetailPo);
- feeReceiptPo.setAmount(feeReceiptDetailPo.getAmount());
- feeReceiptPo.setCommunityId(feeReceiptDetailPo.getCommunityId());
- feeReceiptPo.setReceiptId(feeReceiptDetailPo.getReceiptId());
- feeReceiptPo.setObjType(feeDto.getPayerObjType());
- feeReceiptPo.setObjId(feeDto.getPayerObjId());
- feeReceiptPo.setObjName(computeFeeSMOImpl.getFeeObjName(feeDto));
- feeReceiptPo.setPayObjId(ownerDto.getOwnerId());
- feeReceiptPo.setPayObjName(ownerDto.getName());
- feeReceiptPos.add(feeReceiptPo);
- return business;
- }
-
- /**
- * 淇敼璐圭敤淇℃伅
- *
- * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
- * @param dataFlowContext 鏁版嵁涓婁笅鏂�
- * @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);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- JSONObject businessFee = new JSONObject();
- FeeDto feeInfo = (FeeDto) paramInJson.get("feeInfo");
- Date endTime = feeInfo.getEndTime();
- Calendar endCalender = Calendar.getInstance();
- endCalender.setTime(endTime);
- int hours = 0;
- if ("-101".equals(paramInJson.getString("cycles"))) {
- endCalender = getTargetEndTime(endCalender, Double.parseDouble(paramInJson.getString("tmpCycles")));
- } else {
- 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));
- 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;
- }
-
- /**
- * 淇敼璐圭敤淇℃伅
- *
- * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
- * @param dataFlowContext 鏁版嵁涓婁笅鏂�
- * @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);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- JSONObject businessFee = new JSONObject();
- FeeDto feeInfo = (FeeDto) paramInJson.get("feeInfo");
- Map feeMap = BeanConvertUtil.beanCovertMap(feeInfo);
- feeMap.put("startTime", DateUtil.getFormatTimeString(feeInfo.getStartTime(), DateUtil.DATE_FORMATE_STRING_A));
- feeMap.put("endTime", paramInJson.getString("endTime"));
- feeMap.put("cycles", paramInJson.getString("cycles"));
- feeMap.put("configEndTime", feeInfo.getConfigEndTime());
- 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();
- }
- if (maxEndTime != null) { //杩欓噷鏁版嵁闂鐨勬儏鍐典笅
- Date endTime = DateUtil.getDateFromStringA(paramInJson.getString("endTime"));
- if (endTime.getTime() >= maxEndTime.getTime()) {
- feeMap.put("state", FeeDto.STATE_FINISH);
- }
- }
- businessFee.putAll(feeMap);
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessFee);
- return business;
}
/**
@@ -578,114 +314,6 @@
}
/**
- * 娣诲姞璐圭敤鏄庣粏淇℃伅
- *
- * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
- * @param dataFlowContext 鏁版嵁涓婁笅鏂�
- * @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);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- JSONObject businessFeeDetail = new JSONObject();
- businessFeeDetail.putAll(paramInJson);
- businessFeeDetail.put("detailId", "-1");
- businessFeeDetail.put("primeRate", paramInJson.getString("primeRate"));
- if (!businessFeeDetail.containsKey("state")) {
- businessFeeDetail.put("state", "1400");
- }
- //璁＄畻 搴旀敹閲戦
- 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, "鏌ヨ璐圭敤淇℃伅澶辫触锛屾湭鏌ュ埌鏁版嵁鎴栨煡鍒板鏉℃暟鎹�");
- }
- feeDto = feeDtos.get(0);
- paramInJson.put("feeInfo", feeDto);
- FeeConfigDto feeConfigDto = new FeeConfigDto();
- feeConfigDto.setFeeTypeCd(feeDto.getFeeTypeCd());
- feeConfigDto.setConfigId(feeDto.getConfigId());
- feeConfigDto.setCommunityId(feeDto.getCommunityId());
- List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
- if (feeConfigDtos == null || feeConfigDtos.size() != 1) {
- throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏈煡鍒拌垂鐢ㄩ厤缃俊鎭紝鏌ヨ澶氭潯鏁版嵁");
- }
- feeConfigDto = feeConfigDtos.get(0);
- Date nowTime = new Date();
-
- long diff = nowTime.getTime() - feeDto.getStartTime().getTime();
- long nd = 1000 * 24 * 60 * 60;// 涓�澶╃殑姣鏁�
- long nh = 1000 * 60 * 60;// 涓�灏忔椂鐨勬绉掓暟
- long nm = 1000 * 60;// 涓�鍒嗛挓鐨勬绉掓暟
- double day = 0;
- double hour = 0;
- double min = 0;
- day = diff / nd;// 璁＄畻宸灏戝ぉ
- hour = diff % nd / nh + day * 24;// 璁＄畻宸灏戝皬鏃�
- min = diff % nd % nh / nm + day * 24 * 60;// 璁＄畻宸灏戝垎閽�
- double money = 0.00;
- double newHour = hour;
- if (min > 0) { //涓�灏忔椂瓒呰繃
- newHour += 1;
- }
- if (newHour <= 2) {
- money = Double.parseDouble(feeConfigDto.getAdditionalAmount());
- } else {
- BigDecimal lastHour = new BigDecimal(newHour - 2);
- BigDecimal squarePrice = new BigDecimal(Double.parseDouble(feeDto.getSquarePrice()));
- 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;
- }
-
- /**
- * 淇敼璐圭敤淇℃伅
- *
- * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
- * @param dataFlowContext 鏁版嵁涓婁笅鏂�
- * @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);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- JSONObject businessFee = new JSONObject();
- FeeDto feeInfo = (FeeDto) paramInJson.get("feeInfo");
- Map feeMap = BeanConvertUtil.beanCovertMap(feeInfo);
- feeMap.put("startTime", DateUtil.getFormatTimeString(feeInfo.getStartTime(), DateUtil.DATE_FORMATE_STRING_A));
- feeMap.put("endTime", DateUtil.getFormatTimeString(new Date(), DateUtil.DATE_FORMATE_STRING_A));
- feeMap.put("amount", paramInJson.getString("receivableAmount"));
- feeMap.put("state", "2009001");
- businessFee.putAll(feeMap);
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessFee);
- return business;
- }
-
- /**
- * 娣诲姞灏忓尯淇℃伅
- *
- * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
- * @param dataFlowContext 鏁版嵁涓婁笅鏂�
- * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
- */
- public void addFeeConfig(JSONObject paramInJson, DataFlowContext dataFlowContext) {
- paramInJson.put("configId", "-1");
- paramInJson.put("isDefault", "F");
- PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(paramInJson, PayFeeConfigPo.class);
- super.insert(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
- }
-
- /**
* 娣诲姞鐗╀笟璐圭敤
*
* @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
@@ -744,24 +372,7 @@
}
- /**
- * 娣诲姞璐圭敤
- *
- * @param payFeePo 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
- * @param dataFlowContext 鏁版嵁涓婁笅鏂�
- * @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);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- JSONObject businessUnit = null;
- 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;
- }
+
/**
* 娣诲姞鐗╀笟璐圭敤
@@ -847,26 +458,6 @@
businessUnit.put("userId", paramInJson.getString("userId"));
paramInJson.put("feeId", businessUnit.getString("feeId"));
return businessUnit;
- }
-
- /**
- * 娣诲姞璐圭敤椤逛俊鎭�
- *
- * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
- * @param dataFlowContext 鏁版嵁涓婁笅鏂�
- * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
- */
- public void updateFeeConfig(JSONObject paramInJson, DataFlowContext dataFlowContext) {
- FeeConfigDto feeConfigDto = new FeeConfigDto();
- feeConfigDto.setCommunityId(paramInJson.getString("communityId"));
- 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