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/SaveRoomCreateFeeCmd.java | 83 +++++++++++++++++++++++++++++------------
1 files changed, 58 insertions(+), 25 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 327a537..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
@@ -3,17 +3,18 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+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,8 @@
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;
import com.java110.utils.util.BeanConvertUtil;
@@ -39,7 +41,7 @@
import java.util.List;
@Java110Cmd(serviceCode = "fee.saveRoomCreateFee")
-public class SaveRoomCreateFeeCmd extends AbstractServiceCmdListener {
+public class SaveRoomCreateFeeCmd extends Cmd {
private static final int DEFAULT_ADD_FEE_COUNT = 200;
@@ -67,6 +69,9 @@
@Autowired
private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;
+ @Autowired
+ private IPayFeeMonth payFeeMonthImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -78,13 +83,7 @@
//Assert.hasKeyAndValue(reqJson, "startTime", "鏈寘鍚敹璐瑰叾瀹炴椂闂�");
//Assert.hasKeyAndValue(reqJson, "billType", "鏈寘鍚嚭璐︾被鍨�");
Assert.hasKeyAndValue(reqJson, "storeId", "鏈寘鍚晢鎴稩D");
- }
- @Override
- public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- String userId = cmdDataFlowContext.getResHeaders().get("user-id");
- reqJson.put("userId", userId);
- List<RoomDto> roomDtos = null;
FeeConfigDto feeConfigDto = new FeeConfigDto();
feeConfigDto.setCommunityId(reqJson.getString("communityId"));
feeConfigDto.setConfigId(reqJson.getString("configId"));
@@ -95,7 +94,7 @@
reqJson.put("configEndTime", feeConfigDtos.get(0).getEndTime());
- if (FeeDto.FEE_FLAG_ONCE.equals(feeConfigDtos.get(0).getFeeFlag()) && reqJson.containsKey("endTime")) {
+ if (!FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag()) && reqJson.containsKey("endTime")) {
Date endTime = null;
Date configEndTime = null;
try {
@@ -109,6 +108,23 @@
}
}
+ 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());
+ }
+
+
+ }
+
+ @Override
+ public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+ String userId = cmdDataFlowContext.getReqHeaders().get(CommonConstant.USER_ID);
+ reqJson.put("userId", userId);
+ List<RoomDto> roomDtos = null;
+
+
//鐢熸垚鎵规鍙�
generatorBatch(reqJson);
//鍒ゆ柇鏀惰垂鑼冨洿
@@ -116,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(","));
}
@@ -211,28 +226,34 @@
int saveFlag = 0;
for (int roomIndex = 0; roomIndex < roomDtos.size(); roomIndex++) {
curFailRoomCount++;
- //businesses.add();
-
//鍔犲叆 鎴垮眿璐圭敤
feePos.add(BeanConvertUtil.covertBean(feeBMOImpl.addRoomFee(roomDtos.get(roomIndex), reqJson, context), PayFeePo.class));
if (!StringUtil.isEmpty(roomDtos.get(roomIndex).getOwnerId())) {
- if (FeeDto.FEE_FLAG_ONCE.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")));
+ 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_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()));
- //浠樿垂瀵硅薄鍚嶇О
- feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_PAY_OBJECT_NAME,
- roomDtos.get(roomIndex).getFloorNum() + "-" + roomDtos.get(0).getUnitNum() + "-" + roomDtos.get(0).getRoomNum()));
-
}
+
+ //todo 瀹氬埗寮�鍙� 鍔犲叆
+ //1銆佸鍚堝悓绾﹀畾鐨勭閲戦�掑姣斾緥銆侀�掑骞撮檺鍚勪笉鐩稿悓鐨勯棶棰橈紝鏀寔鎸夊悎鍚屽埌鏈熸棩鏈熻绉熼噾閫掑姣斾緥銆�
+ //2銆佽兘鑷姩璁剧疆閫掑鐨勭閲戝疄琛岃嚜鍔ㄨ绠楀綋鏈堢殑绉熼噾銆�
+ 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()));
+
if (roomIndex % DEFAULT_ADD_FEE_COUNT == 0 && roomIndex != 0) {
saveFlag = saveFeeAndAttrs(feePos, feeAttrsPos);
feePos = new ArrayList<>();
feeAttrsPos = new ArrayList<>();
- if (saveFlag > 0) {
+ if (saveFlag < 1) {
failRooms += curFailRoomCount;
} else {
curFailRoomCount = 0;
@@ -241,7 +262,7 @@
}
if (feePos != null && feePos.size() > 0) {
saveFlag = saveFeeAndAttrs(feePos, feeAttrsPos);
- if (saveFlag > 0) {
+ if (saveFlag < 1) {
failRooms += curFailRoomCount;
}
}
@@ -254,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;
@@ -261,6 +285,15 @@
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