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 |   26 ++------------------------
 1 files changed, 2 insertions(+), 24 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 362f3ea..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
@@ -26,6 +26,7 @@
 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;
@@ -67,6 +68,7 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖轰俊鎭�");
     }
 
     @Override
@@ -98,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