From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-fee/src/main/java/com/java110/fee/cmd/fee/SaveRoomCreateFeeCmd.java | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveRoomCreateFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveRoomCreateFeeCmd.java
index 3a0d472..5891485 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveRoomCreateFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveRoomCreateFeeCmd.java
@@ -6,14 +6,15 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.RoomDto;
+import com.java110.dto.room.RoomDto;
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerDto;
-import com.java110.dto.payFeeBatch.PayFeeBatchDto;
+import com.java110.dto.payFee.PayFeeBatchDto;
import com.java110.dto.user.UserDto;
import com.java110.fee.bmo.fee.IFeeBMO;
+import com.java110.fee.feeMonth.IPayFeeMonth;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
@@ -23,7 +24,7 @@
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.fee.FeeAttrPo;
import com.java110.po.fee.PayFeePo;
-import com.java110.po.payFeeBatch.PayFeeBatchPo;
+import com.java110.po.payFee.PayFeeBatchPo;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
@@ -68,6 +69,9 @@
@Autowired
private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;
+ @Autowired
+ private IPayFeeMonth payFeeMonthImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -104,11 +108,11 @@
}
}
- if (FeeConfigDto.COMPUTING_FORMULA_RANT_RATE.equals(feeConfigDtos.get(0).getComputingFormula())){
+ if (FeeConfigDto.COMPUTING_FORMULA_RANT_RATE.equals(feeConfigDtos.get(0).getComputingFormula())) {
Assert.hasKeyAndValue(reqJson, "rateCycle", "鏈寘鍚�掑鍛ㄦ湡");
Assert.hasKeyAndValue(reqJson, "rate", "鏈寘鍚�掑鐜�");
Assert.hasKeyAndValue(reqJson, "rateStartTime", "鏈寘鍚�掑寮�濮嬫椂闂�");
- reqJson.put("configComputingFormula",feeConfigDtos.get(0).getComputingFormula());
+ reqJson.put("configComputingFormula", feeConfigDtos.get(0).getComputingFormula());
}
@@ -128,8 +132,7 @@
/*if (reqJson.containsKey("roomState") && RoomDto.STATE_SELL.equals(reqJson.getString("roomState"))) {
roomDto.setState(RoomDto.STATE_SELL);
}*/
- if (reqJson.containsKey("roomState")
- && (reqJson.getString("roomState").contains(",") || !StringUtil.isEmpty(reqJson.getString("roomState")))) {
+ if (reqJson.containsKey("roomState") && (reqJson.getString("roomState").contains(",") || !StringUtil.isEmpty(reqJson.getString("roomState")))) {
String states = reqJson.getString("roomState");
roomDto.setStates(states.split(","));
}
@@ -227,27 +230,24 @@
feePos.add(BeanConvertUtil.covertBean(feeBMOImpl.addRoomFee(roomDtos.get(roomIndex), reqJson, context), PayFeePo.class));
if (!StringUtil.isEmpty(roomDtos.get(roomIndex).getOwnerId())) {
if (!FeeDto.FEE_FLAG_CYCLE.equals(reqJson.getString("feeFlag"))) {
- feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
- reqJson.containsKey("endTime") ? reqJson.getString("endTime") : reqJson.getString("configEndTime")));
+ feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME, reqJson.containsKey("endTime") ? reqJson.getString("endTime") : reqJson.getString("configEndTime")));
}
feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_ID, roomDtos.get(roomIndex).getOwnerId()));
feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_LINK, roomDtos.get(roomIndex).getLink()));
feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_NAME, roomDtos.get(roomIndex).getOwnerName()));
}
- //瀹氬埗寮�鍙� 鍔犲叆
+ //todo 瀹氬埗寮�鍙� 鍔犲叆
//1銆佸鍚堝悓绾﹀畾鐨勭閲戦�掑姣斾緥銆侀�掑骞撮檺鍚勪笉鐩稿悓鐨勯棶棰橈紝鏀寔鎸夊悎鍚屽埌鏈熸棩鏈熻绉熼噾閫掑姣斾緥銆�
//2銆佽兘鑷姩璁剧疆閫掑鐨勭閲戝疄琛岃嚜鍔ㄨ绠楀綋鏈堢殑绉熼噾銆�
- if(reqJson.containsKey("configComputingFormula")
- && FeeConfigDto.COMPUTING_FORMULA_RANT_RATE.equals(reqJson.getString("configComputingFormula"))){
+ if (reqJson.containsKey("configComputingFormula") && FeeConfigDto.COMPUTING_FORMULA_RANT_RATE.equals(reqJson.getString("configComputingFormula"))) {
feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_RATE_CYCLE, reqJson.getString("rateCycle")));
feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_RATE, reqJson.getString("rate")));
feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_RATE_START_TIME, reqJson.getString("rateStartTime")));
}
//浠樿垂瀵硅薄鍚嶇О
- feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_PAY_OBJECT_NAME,
- roomDtos.get(roomIndex).getFloorNum() + "-" + roomDtos.get(roomIndex).getUnitNum() + "-" + roomDtos.get(roomIndex).getRoomNum()));
+ feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_PAY_OBJECT_NAME, roomDtos.get(roomIndex).getFloorNum() + "-" + roomDtos.get(roomIndex).getUnitNum() + "-" + roomDtos.get(roomIndex).getRoomNum()));
if (roomIndex % DEFAULT_ADD_FEE_COUNT == 0 && roomIndex != 0) {
saveFlag = saveFeeAndAttrs(feePos, feeAttrsPos);
@@ -275,6 +275,9 @@
}
private int saveFeeAndAttrs(List<PayFeePo> feePos, List<FeeAttrPo> feeAttrsPos) {
+ if (feePos == null || feePos.size() < 1) {
+ return 1;
+ }
int flag = feeInnerServiceSMOImpl.saveFee(feePos);
if (flag < 1) {
return flag;
@@ -282,6 +285,13 @@
flag = feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrsPos);
+ // todo 杩欓噷寮傛鐨勬柟寮忚绠� 鏈堟暟鎹� 鍜屾瑺璐规暟鎹�
+ List<String> feeIds = new ArrayList<>();
+ for (PayFeePo feePo : feePos) {
+ feeIds.add(feePo.getFeeId());
+ }
+ payFeeMonthImpl.doGeneratorFeeMonths(feeIds, feePos.get(0).getCommunityId());
+
return flag;
}
--
Gitblit v1.8.0