From e46395d507a9eb1d4534c61184b4d60dbd75f888 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 18 五月 2023 18:28:27 +0800
Subject: [PATCH] optimize
---
service-fee/src/main/java/com/java110/fee/cmd/fee/SaveContractCreateFeeCmd.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 4bd7010..cfdf204 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
@@ -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.core.log.LoggerFactory;
@@ -29,6 +29,7 @@
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -40,7 +41,7 @@
import java.util.List;
@Java110Cmd(serviceCode = "fee.saveContractCreateFee")
-public class SaveContractCreateFeeCmd extends AbstractServiceCmdListener {
+public class SaveContractCreateFeeCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(SaveContractCreateFeeCmd.class);
@@ -83,6 +84,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 +99,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 +125,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 +178,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")));
}
@@ -210,8 +212,8 @@
paramOut.put("totalRoom", contractDtos.size());
paramOut.put("successRoom", contractDtos.size() - failRooms);
paramOut.put("errorRoom", failRooms);
- responseEntity = new ResponseEntity<>(paramOut.toJSONString(), HttpStatus.OK);
- context.setResponseEntity(responseEntity);
+
+ context.setResponseEntity( ResultVo.createResponseEntity(paramOut));
}
--
Gitblit v1.8.0