From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-fee/src/main/java/com/java110/fee/cmd/fee/SaveContractCreateFeeCmd.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveContractCreateFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveContractCreateFeeCmd.java
index c00bfec..3919e8d 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveContractCreateFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveContractCreateFeeCmd.java
@@ -83,6 +83,7 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
logger.debug("ServiceDataFlowEvent : {}", event);
+ String storeId = cmdDataFlowContext.getReqHeaders().get("store-id");
// String storeId = cmdDataFlowContext.getReqHeaders().get("store-id");
// String userId = cmdDataFlowContext.getReqHeaders().get("user-id");
// reqJson.put("storeId", storeId);
@@ -97,7 +98,7 @@
reqJson.put("feeFlag", feeConfigDtos.get(0).getFeeFlag());
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 {
@@ -123,8 +124,8 @@
}
contractDto.setContractId(reqJson.getString("contractId"));
-
- contractDto.setCommunityId(reqJson.getString("communityId"));
+ contractDto.setStoreId(storeId);
+ //contractDto.setCommunityId(reqJson.getString("communityId"));
contractDtos = contractInnerServiceSMOImpl.queryContracts(contractDto);
if (contractDtos == null || contractDtos.size() < 1) {
@@ -176,7 +177,7 @@
curFailRoomCount++;
feePos.add(BeanConvertUtil.covertBean(feeBMOImpl.addContractFee(contractDtos.get(roomIndex), reqJson, context), PayFeePo.class));
if (!StringUtil.isEmpty(contractDtos.get(roomIndex).getObjId())) {
- 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")));
}
--
Gitblit v1.8.0