From 0b3ff378a9faaf9d7a4831b7f0de67378fe0dfea Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 五月 2023 12:20:15 +0800
Subject: [PATCH] optimize 统计
---
service-fee/src/main/java/com/java110/fee/cmd/fee/SaveRoomCreateFeeCmd.java | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 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 27e8d1a..3a0d472 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,7 +3,7 @@
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;
@@ -40,7 +40,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;
@@ -79,13 +79,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.getReqHeaders().get(CommonConstant.USER_ID);
- reqJson.put("userId", userId);
- List<RoomDto> roomDtos = null;
FeeConfigDto feeConfigDto = new FeeConfigDto();
feeConfigDto.setCommunityId(reqJson.getString("communityId"));
feeConfigDto.setConfigId(reqJson.getString("configId"));
@@ -96,7 +90,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 +103,23 @@
throw new IllegalArgumentException("缁撴潫鏃堕棿閿欒" + reqJson.getString("endTime"));
}
}
+
+ 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);
@@ -215,7 +226,7 @@
//鍔犲叆 鎴垮眿璐圭敤
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"))) {
+ 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")));
}
@@ -223,6 +234,17 @@
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()));
}
+
+ //瀹氬埗寮�鍙� 鍔犲叆
+ //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()));
--
Gitblit v1.8.0