From b2b5bdf6f42597e582da96aa56707e1f68d3936e Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 10 五月 2022 11:41:44 +0800
Subject: [PATCH] 优化 费用
---
service-fee/src/main/java/com/java110/fee/cmd/fee/SaveRoomCreateFeeCmd.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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..27e8d1a 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
@@ -24,6 +24,7 @@
import com.java110.po.fee.FeeAttrPo;
import com.java110.po.fee.PayFeePo;
import com.java110.po.payFeeBatch.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;
@@ -82,7 +83,7 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- String userId = cmdDataFlowContext.getResHeaders().get("user-id");
+ String userId = cmdDataFlowContext.getReqHeaders().get(CommonConstant.USER_ID);
reqJson.put("userId", userId);
List<RoomDto> roomDtos = null;
FeeConfigDto feeConfigDto = new FeeConfigDto();
@@ -211,8 +212,6 @@
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())) {
@@ -223,16 +222,16 @@
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()));
-
}
+ //浠樿垂瀵硅薄鍚嶇О
+ 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 +240,7 @@
}
if (feePos != null && feePos.size() > 0) {
saveFlag = saveFeeAndAttrs(feePos, feeAttrsPos);
- if (saveFlag > 0) {
+ if (saveFlag < 1) {
failRooms += curFailRoomCount;
}
}
@@ -263,4 +262,6 @@
return flag;
}
+
+
}
--
Gitblit v1.8.0