From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/cmd/returnPayFee/ListReturnPayFeesCmd.java | 68 +++++++++++++++++-----------------
1 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/returnPayFee/ListReturnPayFeesCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/returnPayFee/ListReturnPayFeesCmd.java
index 40e1215..181c023 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/returnPayFee/ListReturnPayFeesCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/returnPayFee/ListReturnPayFeesCmd.java
@@ -18,25 +18,28 @@
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.dto.feeAccountDetail.FeeAccountDetailDto;
+import com.java110.dto.payFeeDetailDiscount.PayFeeDetailDiscountDto;
+import com.java110.intf.fee.IFeeAccountDetailServiceSMO;
+import com.java110.intf.fee.IPayFeeDetailDiscountInnerServiceSMO;
import com.java110.intf.fee.IReturnPayFeeInnerServiceSMO;
-import com.java110.intf.fee.IReturnPayFeeV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.StringUtil;
-import com.java110.vo.ResultVo;
import com.java110.vo.api.returnPayFee.ApiReturnPayFeeDataVo;
import com.java110.vo.api.returnPayFee.ApiReturnPayFeeVo;
import org.springframework.beans.factory.annotation.Autowired;
import com.java110.dto.returnPayFee.ReturnPayFeeDto;
+
import java.util.List;
import java.util.ArrayList;
+
import org.springframework.http.ResponseEntity;
import org.springframework.http.HttpStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* 绫昏〃杩帮細鏌ヨ
@@ -49,17 +52,23 @@
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
@Java110Cmd(serviceCode = "returnPayFee.listReturnPayFees")
-public class ListReturnPayFeesCmd extends AbstractServiceCmdListener {
+public class ListReturnPayFeesCmd extends Cmd {
- private static Logger logger = LoggerFactory.getLogger(ListReturnPayFeesCmd.class);
-
+ private static Logger logger = LoggerFactory.getLogger(ListReturnPayFeesCmd.class);
@Autowired
private IReturnPayFeeInnerServiceSMO returnPayFeeInnerServiceSMOImpl;
+ @Autowired
+ private IFeeAccountDetailServiceSMO feeAccountDetailServiceSMOImpl;
+
+ @Autowired
+ private IPayFeeDetailDiscountInnerServiceSMO payFeeDetailDiscountInnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
super.validatePageInfo(reqJson);
+ Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖轰俊鎭�");
}
@Override
@@ -69,37 +78,28 @@
int count = returnPayFeeInnerServiceSMOImpl.queryReturnPayFeesCount(returnPayFeeDto);
- List<ReturnPayFeeDto> returnPayFeeDtos = null;
+ List<ReturnPayFeeDto> returnPayFeeDtos = new ArrayList<>();
List<ApiReturnPayFeeDataVo> returnPayFees;
if (count > 0) {
//娉ㄦ剰杩欓噷澶勭悊 璁板緱娴嬭瘯閫�璐归�昏緫
- returnPayFeeDtos = returnPayFeeInnerServiceSMOImpl.queryReturnPayFees(returnPayFeeDto);
- //List<ReturnPayFeeDto> returnPayFeeDtoList = new ArrayList<>();
-// for (ReturnPayFeeDto returnPayFee : returnPayFeeDtos) {
-// //鑾峰彇浠樻鏂规爣璇�
-// String payerObjType = returnPayFee.getPayerObjType();
-// if (!StringUtil.isEmpty(payerObjType) && payerObjType.equals("3333")) { //鎴垮眿
-// returnPayFeeDto.setReturnFeeId(returnPayFee.getReturnFeeId());
-// List<ReturnPayFeeDto> returnPayFeeList = returnPayFeeInnerServiceSMOImpl.queryRoomReturnPayFees(returnPayFeeDto);
-// if (returnPayFeeList == null || returnPayFeeList.size() < 1) {
-// continue;
-// }
-// //returnPayFeeDtoList.add(returnPayFeeList.get(0));
-// BeanConvertUtil.covertBean(returnPayFeeList.get(0), returnPayFee);
-// } else if (!StringUtil.isEmpty(payerObjType) && payerObjType.equals("6666")) { //杞﹁締
-// returnPayFeeDto.setReturnFeeId(returnPayFee.getReturnFeeId());
-// List<ReturnPayFeeDto> returnPayFeeList = returnPayFeeInnerServiceSMOImpl.queryCarReturnPayFees(returnPayFeeDto);
-// if (returnPayFeeList == null || returnPayFeeList.size() < 1) {
-// continue;
-// }
-// BeanConvertUtil.covertBean(returnPayFeeList.get(0), returnPayFee);
-// //returnPayFeeDtoList.add(returnPayFeeList.get(0));
-// } else {
-// continue;
-// }
-// }
+ List<ReturnPayFeeDto> returnPayFeeList = returnPayFeeInnerServiceSMOImpl.queryReturnPayFees(returnPayFeeDto);
+ for (ReturnPayFeeDto returnPayFee : returnPayFeeList) {
+ FeeAccountDetailDto feeAccountDetailDto = new FeeAccountDetailDto();
+ feeAccountDetailDto.setDetailId(returnPayFee.getDetailId());
+ List<FeeAccountDetailDto> feeAccountDetailDtos = feeAccountDetailServiceSMOImpl.queryFeeAccountDetails(feeAccountDetailDto);
+ if (feeAccountDetailDtos != null && feeAccountDetailDtos.size() > 0) {
+ returnPayFee.setFeeAccountDetailDtoList(feeAccountDetailDtos);
+ }
+ PayFeeDetailDiscountDto payFeeDetailDiscountDto = new PayFeeDetailDiscountDto();
+ payFeeDetailDiscountDto.setDetailId(returnPayFee.getDetailId());
+ List<PayFeeDetailDiscountDto> payFeeDetailDiscountDtos = payFeeDetailDiscountInnerServiceSMOImpl.queryPayFeeDetailDiscounts(payFeeDetailDiscountDto);
+ if (payFeeDetailDiscountDtos != null && payFeeDetailDiscountDtos.size() > 0) {
+ returnPayFee.setPayFeeDetailDiscountDtoList(payFeeDetailDiscountDtos);
+ }
+ returnPayFeeDtos.add(returnPayFee);
+ }
returnPayFees = BeanConvertUtil.covertBeanList(returnPayFeeDtos, ApiReturnPayFeeDataVo.class);
} else {
returnPayFees = new ArrayList<>();
--
Gitblit v1.8.0