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/SaveContractCreateFeeCmd.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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..f561116 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
@@ -11,7 +11,7 @@
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
-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.intf.fee.IFeeAttrInnerServiceSMO;
@@ -23,15 +23,15 @@
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.exception.CmdException;
import com.java110.utils.util.Assert;
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;
import org.springframework.http.ResponseEntity;
import java.text.ParseException;
@@ -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")));
}
@@ -210,8 +211,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