From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java | 204 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 197 insertions(+), 7 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 05f5c7c..574de1d 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
@@ -13,10 +13,7 @@
import com.java110.core.smo.IComputeFeeSMO;
import com.java110.dto.account.AccountDto;
import com.java110.dto.account.AccountDetailDto;
-import com.java110.dto.fee.FeeAttrDto;
-import com.java110.dto.fee.FeeConfigDto;
-import com.java110.dto.fee.FeeDto;
-import com.java110.dto.fee.FeeReceiptDetailDto;
+import com.java110.dto.fee.*;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.dto.repair.RepairDto;
@@ -32,6 +29,7 @@
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.po.account.AccountDetailPo;
+import com.java110.po.fee.FeeAttrPo;
import com.java110.po.room.ApplyRoomDiscountPo;
import com.java110.po.car.OwnerCarPo;
import com.java110.po.fee.PayFeeDetailPo;
@@ -41,6 +39,7 @@
import com.java110.po.owner.RepairUserPo;
import com.java110.po.payFee.PayFeeDetailDiscountPo;
import com.java110.utils.cache.CommonCache;
+import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.FeeFlagTypeConstant;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.CmdException;
@@ -196,6 +195,9 @@
JSONObject param = params.getJSONObject(paramIndex);
String maximumNumber = param.getString("maximumNumber");
}
+
+ //todo 鏄惁鎸夌即璐规椂闂存缂磋垂
+ validateIfPayFeeStartEndDate(reqJson, feeConfigDtos.get(0));
}
@@ -210,13 +212,20 @@
List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
Assert.listOnlyOne(userDtos, "鐢ㄦ埛鏈櫥褰�");
+ String cycles = paramObj.getString("cycles");
+ Date endTime = null;
+
PayFeePo payFeePo = null;
String requestId = DistributedLock.getLockUUID();
String key = this.getClass().getSimpleName() + paramObj.get("feeId");
try {
DistributedLock.waitGetDistributedLock(key, requestId);
+ //todo 灏佽 缂磋垂璁板綍鎶ユ枃
JSONObject feeDetail = addFeeDetail(paramObj);
+ FeeDto feeInfo = (FeeDto) paramObj.get("feeInfo");
+ endTime = feeInfo.getEndTime();
feeDetail.put("payableAmount", feeDetail.getString("receivableAmount"));
+ //todo 灏佽 淇敼璐圭敤鏃堕棿鎶ユ枃
JSONObject fee = modifyFee(paramObj);
payFeePo = BeanConvertUtil.covertBean(fee, PayFeePo.class);
PayFeeDetailPo payFeeDetailPo = BeanConvertUtil.covertBean(feeDetail, PayFeeDetailPo.class);
@@ -244,10 +253,12 @@
if (flag < 1) {
throw new CmdException("缂磋垂澶辫触");
}
+ // todo 濡傛灉鏄寜 鑷畾涔夋椂闂存缂磋垂锛岃繖閲岃ˉ涓�鏉＄即璐硅褰� 鍜� 娆犺垂璐圭敤
+ ifCustomStartEndTimePayFee(cycles, endTime, payFeeDetailPo, payFeePo, paramObj);
} catch (ParseException e) {
e.printStackTrace();
} finally {
- DistributedLock.releaseDistributedLock(key,requestId);
+ DistributedLock.releaseDistributedLock(key, requestId);
}
//璐︽埛澶勭悊
dealAccount(paramObj);
@@ -288,6 +299,7 @@
cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailDto));
}
+
private void dealUserAccount(JSONObject paramObj, PayFeeDetailPo payFeeDetailPo) {
//鍒ゆ柇閫夋嫨鐨勮处鍙�
@@ -710,7 +722,7 @@
businessFeeDetail.put("receivableAmount", receivedAmount.doubleValue());
}
//todo 濡傛灉搴旀敹灏忎簬瀹炴敹锛屽皢搴旀敹鍒蜂负 瀹炴敹
- if(businessFeeDetail.getDoubleValue("receivableAmount") < receivedAmount.doubleValue()){
+ if (businessFeeDetail.getDoubleValue("receivableAmount") < receivedAmount.doubleValue()) {
businessFeeDetail.put("receivableAmount", receivedAmount.doubleValue());
}
} else if ("-103".equals(paramInJson.getString("cycles"))) { //杩欓噷鎸夌即璐圭粨鏉熸椂闂寸即璐�
@@ -733,9 +745,34 @@
businessFeeDetail.put("receivableAmount", receivedAmount.doubleValue());
}
//todo 濡傛灉搴旀敹灏忎簬瀹炴敹锛屽皢搴旀敹鍒蜂负 瀹炴敹
- if(businessFeeDetail.getDoubleValue("receivableAmount") < receivedAmount.doubleValue()){
+ if (businessFeeDetail.getDoubleValue("receivableAmount") < receivedAmount.doubleValue()) {
businessFeeDetail.put("receivableAmount", receivedAmount.doubleValue());
}
+ } else if ("-105".equals(paramInJson.getString("cycles"))) { //杩欓噷鎸夌即璐圭粨鏉熸椂闂寸即璐�
+ String customEndTime = paramInJson.getString("customEndTime");
+ Date endDates = DateUtil.getDateFromStringB(customEndTime);
+ 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")));
+ //澶勭悊 鍙兘杩樺瓨鍦� 瀹炴敹鎵嬪伐鍑忓厤鐨勬儏鍐�
+ if (paramInJson.containsKey("receivableAmount") && !StringUtil.isEmpty(paramInJson.getString("receivableAmount"))) {
+ businessFeeDetail.put("receivableAmount", paramInJson.getString("receivableAmount"));
+ } else {
+ businessFeeDetail.put("receivableAmount", receivedAmount.doubleValue());
+ }
+ //todo 濡傛灉搴旀敹灏忎簬瀹炴敹锛屽皢搴旀敹鍒蜂负 瀹炴敹
+ if (businessFeeDetail.getDoubleValue("receivableAmount") < receivedAmount.doubleValue()) {
+ businessFeeDetail.put("receivableAmount", receivedAmount.doubleValue());
+ }
+ //todo 鏀瑰啓寮�濮嬫椂闂�
+ businessFeeDetail.put("startTime", paramInJson.getString("customStartTime"));
} else { //鑷畾涔夊懆鏈�
targetEndTime = computeFeeSMOImpl.getFeeEndTimeByCycles(feeDto, paramInJson.getString("cycles"));//鏍规嵁缂磋垂鍛ㄦ湡璁＄畻 缁撴潫鏃堕棿
cycles = new BigDecimal(Double.parseDouble(paramInJson.getString("cycles")));
@@ -770,6 +807,14 @@
} else if ("-103".equals(paramInJson.getString("cycles"))) {
String custEndTime = paramInJson.getString("custEndTime");
Date endDates = DateUtil.getDateFromStringB(custEndTime);
+ Calendar c = Calendar.getInstance();
+ c.setTime(endDates);
+ c.add(Calendar.DAY_OF_MONTH, 1);
+ endDates = c.getTime();//杩欐槸鏄庡ぉ
+ endCalender.setTime(endDates);
+ } else if ("-105".equals(paramInJson.getString("cycles"))) {
+ String customEndTime = paramInJson.getString("customEndTime");
+ Date endDates = DateUtil.getDateFromStringB(customEndTime);
Calendar c = Calendar.getInstance();
c.setTime(endDates);
c.add(Calendar.DAY_OF_MONTH, 1);
@@ -969,6 +1014,151 @@
}
}
+
+ /**
+ * 鏍￠獙鏄惁鎸夌即璐规椂闂存缂磋垂
+ *
+ * @param reqJson
+ * @param feeConfigDto
+ */
+ private void validateIfPayFeeStartEndDate(JSONObject reqJson, FeeConfigDto feeConfigDto) {
+ if (!"-105".equals(reqJson.getString("cycles"))) {
+ return;
+ }
+ // todo 鑷繁鏄棿鎺ユ�ц垂鐢�
+ if (FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeConfigDto.getFeeFlag())) {
+ return;
+ }
+
+ FeeConfigDto tmpFeeConfigDto = new FeeConfigDto();
+ tmpFeeConfigDto.setFeeNameEq(feeConfigDto.getFeeName() + "娆犺垂");
+ tmpFeeConfigDto.setFeeFlag(FeeDto.FEE_FLAG_CYCLE_ONCE);
+ tmpFeeConfigDto.setComputingFormula(feeConfigDto.getComputingFormula());
+ List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(tmpFeeConfigDto);
+
+ Assert.listOnlyOne(feeConfigDtos, "鎸夎嚜瀹氫箟鏃堕棿娈电即璐规椂锛岃垂鐢ㄥ繀椤讳负闂存帴鎬ц垂鐢紝鎴栬�呭瓨鍦ㄥ悕绉颁负 " + feeConfigDto.getFeeName() + "娆犺垂 鐨勯棿鎺ユ�ц垂鐢紝瀹冪殑鍏紡璁＄畻蹇呴』瑕佸拰" + feeConfigDto.getFeeName() + "涓�鑷�");
+ }
+
+
+ /**
+ * 鑷畾涔夋椂闂存 缂磋垂
+ *
+ * @param cycles
+ * @param endTime
+ * @param payFeeDetailPo
+ * @param payFeePo
+ */
+ private void ifCustomStartEndTimePayFee(String cycles, Date endTime, PayFeeDetailPo payFeeDetailPo, PayFeePo payFeePo, JSONObject reqJson) {
+ if (!"-105".equals(cycles)) {
+ return;
+ }
+
+ FeeDto feeInfo = (FeeDto) reqJson.get("feeInfo");
+ String payObjNameRemark = "鎴垮眿";
+ if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeInfo.getPayerObjType())) {
+ payObjNameRemark = "杞﹁締";
+ } else if (FeeDto.PAYER_OBJ_TYPE_CONTRACT.equals(feeInfo.getPayerObjType())) {
+ payObjNameRemark = "鍚堝悓";
+ }
+
+ //todo 琛ュ厖涓�鏉� 缂磋垂璁板綍鏁版嵁
+ PayFeeDetailPo tmpPayFeeDetailPo = BeanConvertUtil.covertBean(payFeeDetailPo, PayFeeDetailPo.class);
+ tmpPayFeeDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
+ tmpPayFeeDetailPo.setCycles("0");
+ tmpPayFeeDetailPo.setReceivableAmount("0");
+ tmpPayFeeDetailPo.setReceivedAmount("0");
+ tmpPayFeeDetailPo.setPayableAmount("0");
+ tmpPayFeeDetailPo.setStartTime(DateUtil.getFormatTimeStringB(endTime));
+ tmpPayFeeDetailPo.setEndTime(reqJson.getString("customStartTime"));
+ tmpPayFeeDetailPo.setState(FeeDetailDto.STATE_OWE);
+ tmpPayFeeDetailPo.setRemark("鎸夌即璐规椂闂存缂磋垂,杩欓儴鍒嗚垂鐢ㄦ寜娆犺垂鐨勬柟寮忛噸鏂扮敓鎴愶紝璇峰湪" + payObjNameRemark + "涓婃煡鐪�");
+ int flag = payFeeDetailNewV1InnerServiceSMOImpl.savePayFeeDetailNew(tmpPayFeeDetailPo);
+
+ if (flag < 1) {
+ throw new CmdException("鐢熸垚娆犺垂澶辫触");
+ }
+
+ //todo 鐢熸垚璐圭敤
+ PayFeePo tmpPayFeePo = BeanConvertUtil.covertBean(feeInfo, PayFeePo.class);
+ tmpPayFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
+ tmpPayFeePo.setEndTime(DateUtil.getFormatTimeStringB(endTime));
+ tmpPayFeePo.setState(FeeDto.STATE_DOING);
+
+ // todo 澶勭悊configId
+ doChangeConfigId(tmpPayFeePo, feeInfo);
+
+
+ flag = payFeeV1InnerServiceSMOImpl.savePayFee(tmpPayFeePo);
+ if (flag < 1) {
+ throw new CmdException("鐢熸垚娆犺垂澶辫触");
+ }
+
+ //todo 琛ュ厖 璐圭敤灞炴��
+ FeeAttrDto feeAttrDto = new FeeAttrDto();
+ feeAttrDto.setFeeId(payFeePo.getFeeId());
+ feeAttrDto.setCommunityId(payFeePo.getCommunityId());
+ List<FeeAttrDto> feeAttrDtos = feeAttrInnerServiceSMOImpl.queryFeeAttrs(feeAttrDto);
+
+ if (feeAttrDtos == null || feeAttrDtos.size() < 1) {
+ return;
+ }
+
+ List<FeeAttrPo> tmpFeeAttrPos = new ArrayList<>();
+ FeeAttrPo tmpFeeAttrPo = null;
+ boolean hasDeadLineTime = false;
+ for (FeeAttrDto tmpFeeAttrDto : feeAttrDtos) {
+ tmpFeeAttrDto.setFeeId(tmpPayFeePo.getFeeId());
+ tmpFeeAttrDto.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId, true));
+
+ if (FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME.equals(tmpFeeAttrDto.getSpecCd())) {
+ tmpFeeAttrDto.setValue(reqJson.getString("customStartTime"));
+ hasDeadLineTime = true;
+ }
+ tmpFeeAttrPo = BeanConvertUtil.covertBean(tmpFeeAttrDto, FeeAttrPo.class);
+ tmpFeeAttrPos.add(tmpFeeAttrPo);
+ }
+ //todo 娌℃湁缁撴潫鏃堕棿鏃�
+ if(!hasDeadLineTime){
+ tmpFeeAttrPo = new FeeAttrPo();
+ tmpFeeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId, true));
+ tmpFeeAttrPo.setFeeId(tmpPayFeePo.getFeeId());
+ tmpFeeAttrPo.setCommunityId(tmpFeeAttrPo.getCommunityId());
+ tmpFeeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME);
+ tmpFeeAttrPo.setValue(reqJson.getString("customStartTime"));
+ tmpFeeAttrPos.add(tmpFeeAttrPo);
+ }
+
+ feeAttrInnerServiceSMOImpl.saveFeeAttrs(tmpFeeAttrPos);
+
+ }
+
+ /**
+ * 澶勭悊璐圭敤椤笽D
+ *
+ * @param tmpPayFeePo
+ * @param feeInfo
+ */
+ private void doChangeConfigId(PayFeePo tmpPayFeePo, FeeDto feeInfo) {
+ FeeConfigDto feeConfigDto = new FeeConfigDto();
+ feeConfigDto.setConfigId(feeInfo.getConfigId());
+ feeConfigDto.setCommunityId(feeInfo.getCommunityId());
+ List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
+ Assert.listOnlyOne(feeConfigDtos, "璐圭敤椤逛笉瀛樺湪");
+ if (FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeConfigDtos.get(0).getFeeFlag())) {
+ return;
+ }
+
+
+ FeeConfigDto tmpFeeConfigDto = new FeeConfigDto();
+ tmpFeeConfigDto.setFeeNameEq(feeConfigDtos.get(0).getFeeName() + "娆犺垂");
+ tmpFeeConfigDto.setFeeFlag(FeeDto.FEE_FLAG_CYCLE_ONCE);
+ tmpFeeConfigDto.setComputingFormula(feeConfigDto.getComputingFormula());
+ //todo 鏍￠獙鐨勬椂鍊欐牎楠岃繃浜� 鎵�浠ヨ繖閲屼笉鍙兘涓虹┖
+ feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(tmpFeeConfigDto);
+
+ tmpPayFeePo.setConfigId(feeConfigDtos.get(0).getConfigId());
+ }
+
private static Calendar getTargetEndTime(Calendar endCalender, Double cycles) {
if (StringUtil.isInteger(cycles.toString())) {
endCalender.add(Calendar.MONTH, new Double(cycles).intValue());
--
Gitblit v1.8.0