From 8954429263a75e3c7d19db20a60370fca005f2bd Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 08 八月 2023 15:44:49 +0800
Subject: [PATCH] 优化代码

---
 service-fee/src/main/java/com/java110/fee/cmd/returnPayFee/ListReturnPayFeesCmd.java |   33 +++++----------------------------
 1 files changed, 5 insertions(+), 28 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 52c0f71..e0fa9b9 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
@@ -20,17 +20,18 @@
 import com.java110.core.context.ICmdDataFlowContext;
 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.dto.fee.FeeAccountDetailDto;
+import com.java110.dto.payFee.PayFeeDetailDiscountDto;
 import com.java110.intf.fee.IFeeAccountDetailServiceSMO;
 import com.java110.intf.fee.IPayFeeDetailDiscountInnerServiceSMO;
 import com.java110.intf.fee.IReturnPayFeeInnerServiceSMO;
 import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 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 com.java110.dto.payFee.ReturnPayFeeDto;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -39,7 +40,6 @@
 import org.springframework.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 
 /**
  * 绫昏〃杩帮細鏌ヨ
@@ -68,6 +68,7 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖轰俊鎭�");
     }
 
     @Override
@@ -99,30 +100,6 @@
                 }
                 returnPayFeeDtos.add(returnPayFee);
             }
-            //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;
-//                }
-//            }
             returnPayFees = BeanConvertUtil.covertBeanList(returnPayFeeDtos, ApiReturnPayFeeDataVo.class);
         } else {
             returnPayFees = new ArrayList<>();

--
Gitblit v1.8.0