From 7b09e49e27a01b2125979ca6ed8e50b14946f925 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期六, 25 六月 2022 17:04:43 +0800
Subject: [PATCH] 1、优化巡检明显导出2、优化房屋房间数量展示3、优化优惠赠送规则 赠送月份4、新增收银台缴费选定结束日期
---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java | 82 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 77 insertions(+), 5 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
index f39d84e..fc2c0f0 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
@@ -56,6 +56,7 @@
import java.math.BigDecimal;
import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
@Java110Cmd(serviceCode = "fee.payFee")
@@ -172,6 +173,7 @@
try {
maxEndTime = DateUtil.getDateFromString(feeConfigDtos.get(0).getEndTime(), DateUtil.DATE_FORMATE_STRING_A);
} catch (ParseException e) {
+ } catch (Exception e) {
logger.error("姣旇緝璐圭敤鏃ユ湡澶辫触", e);
}
}
@@ -200,7 +202,37 @@
try {
DistributedLock.waitGetDistributedLock(key, requestId);
JSONObject feeDetail = addFeeDetail(paramObj);
+ JSONObject fee = modifyFee(paramObj);
+ payFeePo = BeanConvertUtil.covertBean(fee, PayFeePo.class);
PayFeeDetailPo payFeeDetailPo = BeanConvertUtil.covertBean(feeDetail, PayFeeDetailPo.class);
+ //鍒ゆ柇鏄惁鏈夎禒閫佽鍒�
+ if (paramObj.containsKey("selectDiscount")) {
+ JSONArray selectDiscount = paramObj.getJSONArray("selectDiscount");
+ if (selectDiscount != null && selectDiscount.size() > 0) {
+ for (int index = 0; index < selectDiscount.size(); index++) {
+ JSONObject paramJson = selectDiscount.getJSONObject(index);
+ if (!StringUtil.isEmpty(paramJson.getString("ruleId")) && paramJson.getString("ruleId").equals("102020008")) { //璧犻�佽鍒�
+ JSONArray feeDiscountSpecs = paramJson.getJSONArray("feeDiscountSpecs");
+ if (feeDiscountSpecs.size() > 0) {
+ for (int specIndex = 0; specIndex < feeDiscountSpecs.size(); specIndex++) {
+ JSONObject paramIn = feeDiscountSpecs.getJSONObject(specIndex);
+ if (!StringUtil.isEmpty(paramIn.getString("specId")) && paramIn.getString("specId").equals("89002020980015")) { //璧犻�佹湀浠�
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String specValue = paramIn.getString("specValue");
+ //鑾峰彇璐圭敤缁撴潫鏃堕棿(涔熷氨鏄笅娆¤垂鐢ㄥ紑濮嬫椂闂�)
+ Date endTime = df.parse(payFeeDetailPo.getEndTime());
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(endTime);
+ cal.add(Calendar.MONTH, Integer.parseInt(specValue));
+ payFeeDetailPo.setEndTime(df.format(cal.getTime()));
+ payFeePo.setEndTime(df.format(cal.getTime()));
+ }
+ }
+ }
+ }
+ }
+ }
+ }
//鍒ゆ柇閫夋嫨鐨勮处鍙�
JSONArray jsonArray = paramObj.getJSONArray("selectUserAccount");
if (jsonArray == null || jsonArray.size() < 1) {
@@ -297,13 +329,13 @@
if (flag < 1) {
throw new CmdException("缂磋垂澶辫触");
}
- JSONObject fee = modifyFee(paramObj);
- payFeePo = BeanConvertUtil.covertBean(fee, PayFeePo.class);
flag = payFeeV1InnerServiceSMOImpl.updatePayFee(payFeePo);
if (flag < 1) {
throw new CmdException("缂磋垂澶辫触");
}
+ } catch (ParseException e) {
+ e.printStackTrace();
} finally {
DistributedLock.releaseDistributedLock(requestId, key);
}
@@ -314,7 +346,11 @@
JSONObject discountBusiness = null;
JSONArray selectDiscounts = paramObj.getJSONArray("selectDiscount");
for (int discountIndex = 0; discountIndex < selectDiscounts.size(); discountIndex++) {
- addPayFeeDetailDiscount(paramObj, selectDiscounts.getJSONObject(discountIndex));
+ JSONObject param = selectDiscounts.getJSONObject(discountIndex);
+ if (!StringUtil.isEmpty(param.getString("ruleId")) && param.getString("ruleId").equals("102020008")) {
+ return;
+ }
+ addPayFeeDetailDiscount(paramObj, param);
}
}
@@ -559,8 +595,28 @@
paramInJson.put("tmpCycles", cycles.doubleValue());
businessFeeDetail.put("cycles", cycles.doubleValue());
businessFeeDetail.put("receivableAmount", receivedAmount.doubleValue());
+ } else if ("-103".equals(paramInJson.getString("cycles"))) {
+ String custEndTime = paramInJson.getString("custEndTime");
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ Date endDates = null;
+ try {
+ endDates = format.parse(custEndTime);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ Calendar c = Calendar.getInstance();
+ c.setTime(endDates);
+ c.add(Calendar.DAY_OF_MONTH, 1);
+ endDates = c.getTime();//杩欐槸鏄庡ぉ
+ targetEndTime = endDates;
+ BigDecimal receivedAmount1 = new BigDecimal(Double.parseDouble(paramInJson.getString("receivedAmount")));
+ cycles = receivedAmount1.divide(feePrice, 4, BigDecimal.ROUND_HALF_EVEN);
+ paramInJson.put("tmpCycles", cycles.doubleValue());
+ businessFeeDetail.put("cycles", cycles.doubleValue());
+ BigDecimal receivedAmount = new BigDecimal(Double.parseDouble(paramInJson.getString("receivedAmount")));
+ businessFeeDetail.put("receivableAmount", receivedAmount.doubleValue());
} else {
- targetEndTime = computeFeeSMOImpl.getFeeEndTimeByCycles(feeDto, paramInJson.getString("cycles"));
+ 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);
@@ -579,8 +635,24 @@
Calendar endCalender = Calendar.getInstance();
endCalender.setTime(endTime);
int hours = 0;
+ //-101鑷畾涔夐噾棰� -102鑷畾涔夊懆鏈� -103 鑷畾涔夌粨鏉熸椂闂�
if ("-101".equals(paramInJson.getString("cycles"))) {
endCalender = getTargetEndTime(endCalender, Double.parseDouble(paramInJson.getString("tmpCycles")));
+ System.out.println(endCalender);
+ } else if ("-103".equals(paramInJson.getString("cycles"))) {
+ String custEndTime = paramInJson.getString("custEndTime");
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ Date endDates = null;
+ try {
+ endDates = format.parse(custEndTime);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ Calendar c = Calendar.getInstance();
+ c.setTime(endDates);
+ c.add(Calendar.DAY_OF_MONTH, 1);
+ endDates = c.getTime();//杩欐槸鏄庡ぉ
+ endCalender.setTime(endDates);
} else {
endCalender.add(Calendar.MONTH, Integer.parseInt(paramInJson.getString("cycles")));
}
@@ -599,7 +671,7 @@
}
feeInfo.setEndTime(endCalender.getTime());
Date maxEndTime = feeInfo.getDeadlineTime();
- if(FeeDto.FEE_FLAG_CYCLE.equals(feeInfo.getFeeFlag())){
+ if (FeeDto.FEE_FLAG_CYCLE.equals(feeInfo.getFeeFlag())) {
maxEndTime = feeInfo.getConfigEndTime();
}
//鍒ゆ柇 缁撴潫鏃堕棿 鏄惁澶т簬 璐圭敤椤� 缁撴潫鏃堕棿锛岃繖閲� 瀹归敊涓�涓嬶紝濡傛灉 璐圭敤缁撴潫鏃堕棿澶т簬 璐圭敤椤圭粨鏉熸椂闂� 30澶� 璧版姤閿� 灞炰簬澶氱即璐�
--
Gitblit v1.8.0