优化代码

service-fee/src/main/java/com/java110/fee/bill/CycleConvertOnceFeeImpl.java

@@ -16,10 +16,7 @@ import com.java110.po.fee.FeeAttrPo;
 import com.java110.po.fee.PayFeePo;
 import com.java110.po.payFee.PayFeeRulePo;
 import com.java110.po.payFee.PayFeeRuleBillPo;
-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.utils.util.*;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -142,7 +139,7 @@ public class CycleConvertOnceFeeImpl implements ICycleConvertOnceFee {
     @Override
     public int rulesGeneratePayFees(List<PayFeeRulePo> payFeeRulePos) {
 
-        if (payFeeRulePos == null || payFeeRulePos.isEmpty()) {
+        if (ListUtil.isNull(payFeeRulePos)) {
             return 0;
         }
 

service-fee/src/main/java/com/java110/fee/cmd/fee/SaveRoomCreateFeeCmd.java

@@ -24,10 +24,7 @@ import com.java110.po.fee.PayFeePo;
 import com.java110.po.payFee.PayFeeBatchPo;
 import com.java110.utils.constant.CommonConstant;
 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.utils.util.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -140,7 +137,7 @@ public class SaveRoomCreateFeeCmd extends Cmd {
         ownerDto.setRoomId(roomDto.getRoomId());
         List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnersByRoom(ownerDto);
 
-        if (ownerDtos != null && !ownerDtos.isEmpty()) {
+        if (ListUtil.isNull(ownerDtos)) {
             roomDto.setOwnerId(ownerDtos.get(0).getOwnerId());
             roomDto.setOwnerName(ownerDtos.get(0).getName());
             roomDto.setLink(ownerDtos.get(0).getLink());

service-fee/src/main/java/com/java110/fee/smo/impl/RuleGeneratorPayFeeBillV1InnerServiceSMOImpl.java

@@ -25,6 +25,7 @@ import com.java110.intf.fee.IPayFeeConfigV1InnerServiceSMO;
 import com.java110.intf.fee.IRuleGeneratorPayFeeBillV1InnerServiceSMO;
 import com.java110.po.fee.PayFeeConfigPo;
 import com.java110.po.fee.PayFeePo;
+import com.java110.utils.util.ListUtil;
 import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -73,7 +74,7 @@ public class RuleGeneratorPayFeeBillV1InnerServiceSMOImpl extends BaseServiceSMO
     @Override
     public String needGeneratorBillData(@RequestBody List<PayFeePo> feePos) {
 
-        if (feePos == null || feePos.isEmpty()) {
+        if (ListUtil.isNull(feePos)) {
             return BILL_NO;
         }
 
@@ -102,7 +103,7 @@ public class RuleGeneratorPayFeeBillV1InnerServiceSMOImpl extends BaseServiceSMO
         List<FeeConfigDto> feeConfigDtos = payFeeConfigV1InnerServiceSMOImpl.queryPayFeeConfigs(feeConfigDto);
 
         //todo 数据有问题 咱不处理
-        if (feeConfigDtos == null || feeConfigDtos.isEmpty()) {
+        if (ListUtil.isNull(feeConfigDtos)) {
             return BILL_NO;
         }