From 0fea532b07be89978343cb4aede3693af99f5656 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 25 七月 2023 23:04:41 +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 | 113 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 97 insertions(+), 16 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 12aa2c6..fd1b41b 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,15 +13,13 @@
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;
import com.java110.dto.repair.RepairUserDto;
import com.java110.dto.user.UserDto;
+import com.java110.fee.smo.impl.FeeReceiptInnerServiceSMOImpl;
import com.java110.intf.acct.IAccountDetailInnerServiceSMO;
import com.java110.intf.acct.IAccountInnerServiceSMO;
import com.java110.intf.acct.ICouponUserDetailV1InnerServiceSMO;
@@ -141,6 +139,9 @@
@Autowired
private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+ @Autowired
+ private FeeReceiptInnerServiceSMOImpl feeReceiptInnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
@@ -198,6 +199,9 @@
JSONObject param = params.getJSONObject(paramIndex);
String maximumNumber = param.getString("maximumNumber");
}
+
+ //todo 鏄惁鎸夌即璐规椂闂存缂磋垂
+ validateIfPayFeeStartEndDate(reqJson, feeConfigDtos.get(0));
}
@@ -212,8 +216,11 @@
List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
Assert.listOnlyOne(userDtos, "鐢ㄦ埛鏈櫥褰�");
- String cycle = paramObj.getString("cycle");
+ String cycles = paramObj.getString("cycles");
Date endTime = null;
+
+ //todo 鐢熸垚鏀舵嵁缂栧彿
+ String receiptCode = feeReceiptInnerServiceSMOImpl.generatorReceiptCode(paramObj.getString("communityId"));
PayFeePo payFeePo = null;
String requestId = DistributedLock.getLockUUID();
@@ -230,7 +237,10 @@
payFeePo = BeanConvertUtil.covertBean(fee, PayFeePo.class);
PayFeeDetailPo payFeeDetailPo = BeanConvertUtil.covertBean(feeDetail, PayFeeDetailPo.class);
payFeeDetailPo.setReceivableAmount(feeDetail.getString("totalFeePrice"));
- //鍒ゆ柇鏄惁鏈夎禒閫佽鍒�
+ //todo 缂撳瓨鏀舵嵁缂栧彿
+ CommonCache.setValue(payFeeDetailPo.getDetailId()+CommonCache.RECEIPT_CODE,receiptCode,CommonCache.DEFAULT_EXPIRETIME_TWO_MIN);
+
+ //todo 鍒ゆ柇鏄惁鏈夎禒閫佽鍒�
hasDiscount(paramObj, payFeePo, payFeeDetailPo);
// todo 澶勭悊鐢ㄦ埛璐︽埛
@@ -254,7 +264,7 @@
throw new CmdException("缂磋垂澶辫触");
}
// todo 濡傛灉鏄寜 鑷畾涔夋椂闂存缂磋垂锛岃繖閲岃ˉ涓�鏉＄即璐硅褰� 鍜� 娆犺垂璐圭敤
- ifCustomStartEndTimePayFee(cycle, endTime, payFeeDetailPo, payFeePo, paramObj);
+ ifCustomStartEndTimePayFee(cycles, endTime, payFeeDetailPo, payFeePo, paramObj);
} catch (ParseException e) {
e.printStackTrace();
} finally {
@@ -292,6 +302,7 @@
applyRoomDiscountInnerServiceSMOImpl.updateApplyRoomDiscount(applyRoomDiscountPo);
}
}
+
//鏍规嵁鏄庣粏ID 鏌ヨ鏀舵嵁淇℃伅
FeeReceiptDetailDto feeReceiptDetailDto = new FeeReceiptDetailDto();
@@ -1014,16 +1025,42 @@
}
}
+
+ /**
+ * 鏍￠獙鏄惁鎸夌即璐规椂闂存缂磋垂
+ *
+ * @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 cycle
+ * @param cycles
* @param endTime
* @param payFeeDetailPo
* @param payFeePo
*/
- private void ifCustomStartEndTimePayFee(String cycle, Date endTime, PayFeeDetailPo payFeeDetailPo, PayFeePo payFeePo, JSONObject reqJson) {
- if (!"-105".equals(cycle)) {
+ private void ifCustomStartEndTimePayFee(String cycles, Date endTime, PayFeeDetailPo payFeeDetailPo, PayFeePo payFeePo, JSONObject reqJson) {
+ if (!"-105".equals(cycles)) {
return;
}
@@ -1044,6 +1081,7 @@
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);
@@ -1052,10 +1090,14 @@
}
//todo 鐢熸垚璐圭敤
- PayFeePo tmpPayFeePo = BeanConvertUtil.covertBean(feeInfo, PayFeePo.class);;
+ 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) {
@@ -1068,20 +1110,32 @@
feeAttrDto.setCommunityId(payFeePo.getCommunityId());
List<FeeAttrDto> feeAttrDtos = feeAttrInnerServiceSMOImpl.queryFeeAttrs(feeAttrDto);
- if(feeAttrDtos == null || feeAttrDtos.size() < 1){
+ if (feeAttrDtos == null || feeAttrDtos.size() < 1) {
return;
}
List<FeeAttrPo> tmpFeeAttrPos = new ArrayList<>();
FeeAttrPo tmpFeeAttrPo = null;
- for(FeeAttrDto tmpFeeAttrDto: feeAttrDtos){
+ boolean hasDeadLineTime = false;
+ for (FeeAttrDto tmpFeeAttrDto : feeAttrDtos) {
tmpFeeAttrDto.setFeeId(tmpPayFeePo.getFeeId());
- tmpFeeAttrDto.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId,true));
+ tmpFeeAttrDto.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId, true));
- if(FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME.equals(tmpFeeAttrDto.getSpecCd())){
+ if (FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME.equals(tmpFeeAttrDto.getSpecCd())) {
tmpFeeAttrDto.setValue(reqJson.getString("customStartTime"));
+ hasDeadLineTime = true;
}
- tmpFeeAttrPo = BeanConvertUtil.covertBean(tmpFeeAttrDto,FeeAttrPo.class);
+ 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);
}
@@ -1089,6 +1143,33 @@
}
+ /**
+ * 澶勭悊璐圭敤椤笽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