From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java | 127 ++++++++++++++++++++++++++++++++++--------
1 files changed, 102 insertions(+), 25 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 8581215..dec693f 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
@@ -55,6 +55,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
@Java110Cmd(serviceCode = "fee.payFee")
@@ -161,20 +163,26 @@
feeConfigDto.setCommunityId(reqJson.getString("communityId"));
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
- if (feeConfigDtos != null && feeConfigDtos.size() == 1) {
+ if (feeConfigDtos == null || feeConfigDtos.size() != 1) {
+ throw new IllegalArgumentException("璐圭敤椤逛笉瀛樺湪");
+ }
+ //涓�娆℃�ц垂鐢� 鍜岄棿鎺ユ�ц垂鐢�
+ Date maxEndTime = feeDtos.get(0).getDeadlineTime();
+ //鍛ㄦ湡鎬ц垂鐢�
+ if (FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag())
+ || FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeConfigDtos.get(0).getFeeFlag())) {
try {
- Date configEndTime = DateUtil.getDateFromString(feeConfigDtos.get(0).getEndTime(), DateUtil.DATE_FORMATE_STRING_A);
- configEndTime = DateUtil.stepDay(configEndTime,5);
- Date newDate = DateUtil.stepMonth(endTime, reqJson.getInteger("cycles"));
-
- if (newDate.getTime() > configEndTime.getTime()) {
- throw new IllegalArgumentException("缂磋垂鍛ㄦ湡瓒呰繃 缂磋垂缁撴潫鏃堕棿");
- }
-
+ maxEndTime = DateUtil.getDateFromString(feeConfigDtos.get(0).getEndTime(), DateUtil.DATE_FORMATE_STRING_A);
+ } catch (ParseException e) {
} catch (Exception e) {
logger.error("姣旇緝璐圭敤鏃ユ湡澶辫触", e);
}
+ Date newDate = DateUtil.stepMonth(endTime, reqJson.getDouble("cycles").intValue());
+ if (newDate.getTime() > maxEndTime.getTime()) {
+ throw new IllegalArgumentException("缂磋垂鍛ㄦ湡瓒呰繃 缂磋垂缁撴潫鏃堕棿");
+ }
}
+
String selectUserAccount = reqJson.getString("selectUserAccount");
JSONArray params = JSONArray.parseArray(selectUserAccount);
for (int paramIndex = 0; paramIndex < params.size(); paramIndex++) {
@@ -182,6 +190,7 @@
String maximumNumber = param.getString("maximumNumber");
}
}
+
@Override
@Java110Transactional
@@ -194,7 +203,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) {
@@ -291,13 +330,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);
}
@@ -308,7 +347,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);
}
}
@@ -513,11 +556,6 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public JSONObject addFeeDetail(JSONObject paramInJson) {
- String remark = paramInJson.getString("remark");
- if (!StringUtil.isEmpty(remark)) {
- remark = "-" + remark;
- }
- paramInJson.put("remark", "鐜板満鏀堕摱鍙版敮浠�" + remark);
JSONObject businessFeeDetail = new JSONObject();
businessFeeDetail.putAll(paramInJson);
businessFeeDetail.put("detailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
@@ -553,8 +591,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);
@@ -573,8 +631,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")));
}
@@ -592,8 +666,12 @@
feeInfo.setState(FeeDto.STATE_FINISH);
}
feeInfo.setEndTime(endCalender.getTime());
+ Date maxEndTime = feeInfo.getDeadlineTime();
+ if (FeeDto.FEE_FLAG_CYCLE.equals(feeInfo.getFeeFlag())) {
+ maxEndTime = feeInfo.getConfigEndTime();
+ }
//鍒ゆ柇 缁撴潫鏃堕棿 鏄惁澶т簬 璐圭敤椤� 缁撴潫鏃堕棿锛岃繖閲� 瀹归敊涓�涓嬶紝濡傛灉 璐圭敤缁撴潫鏃堕棿澶т簬 璐圭敤椤圭粨鏉熸椂闂� 30澶� 璧版姤閿� 灞炰簬澶氱即璐�
- if (feeInfo.getEndTime().getTime() - feeInfo.getConfigEndTime().getTime() > 30 * 24 * 60 * 60 * 1000L) {
+ if (feeInfo.getEndTime().getTime() - maxEndTime.getTime() > 30 * 24 * 60 * 60 * 1000L) {
throw new IllegalArgumentException("缂磋垂瓒呰繃浜� 璐圭敤椤圭粨鏉熸椂闂�");
}
Map feeMap = BeanConvertUtil.beanCovertMap(feeInfo);
@@ -608,16 +686,15 @@
paramInJson.put("carPayerObjId", feeInfo.getPayerObjId());
// 鍛ㄦ湡鎬ф敹璐广�佺即璐瑰悗锛屽埌鏈熸棩鏈熷湪璐圭敤椤圭粓姝㈡棩鏈熷悗锛屽垯璁剧疆缂磋垂鐘舵�佺粨鏉燂紝璁剧疆缁撴潫鏃ユ湡涓鸿垂鐢ㄩ」缁堟鏃ユ湡
- if (FeeFlagTypeConstant.CYCLE.equals(feeInfo.getFeeFlag())) {
+ if (!FeeFlagTypeConstant.ONETIME.equals(feeInfo.getFeeFlag())) {
//杩欓噷 瀹归敊浜斿ぉ鏃堕棿
- Date configEndTime = feeInfo.getConfigEndTime();
Calendar calendar = Calendar.getInstance();
- calendar.setTime(configEndTime);
+ calendar.setTime(maxEndTime);
calendar.add(Calendar.DAY_OF_MONTH, -5);
- configEndTime = calendar.getTime();
- if (feeInfo.getEndTime().after(configEndTime)) {
+ maxEndTime = calendar.getTime();
+ if (feeInfo.getEndTime().after(maxEndTime)) {
businessFee.put("state", FeeStateConstant.END);
- businessFee.put("endTime", feeInfo.getConfigEndTime());
+ businessFee.put("endTime", maxEndTime);
}
}
return businessFee;
--
Gitblit v1.8.0