wuxw hai 1 ano
pai
achega
b1e54853b1

+ 2 - 2
service-acct/src/main/java/com/java110/acct/payment/business/oweFee/OweFeePaymentBusiness.java

@@ -100,7 +100,7 @@ public class OweFeePaymentBusiness implements IPaymentBusiness {
         feeDto.setState(FeeDto.STATE_DOING);
         List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
 
-        if (feeDtos == null || feeDtos.size() < 1) {
+        if (ListUtil.isNull(feeDtos)) {
             throw new IllegalArgumentException("未包含欠费费用");
         }
 
@@ -180,7 +180,7 @@ public class OweFeePaymentBusiness implements IPaymentBusiness {
         }
 
         JSONArray feeIds = reqJson.getJSONArray("feeIds");
-        if (feeIds == null || feeIds.size() < 1) {
+        if (ListUtil.isNull(feeIds)) {
             return true;
         }
         boolean hasIn = false;

+ 7 - 0
service-fee/src/main/java/com/java110/fee/smo/impl/FeeInnerServiceSMOImpl.java

@@ -88,8 +88,10 @@ public class FeeInnerServiceSMOImpl extends BaseServiceSMO implements IFeeInnerS
         List<FeeAttrDto> feeAttrDtos = BeanConvertUtil.covertBeanList(attrMaps, FeeAttrDto.class);
         List<FeeAttrDto> tmpFeeAttrDtos = null;
         String payerObjName = "";
+        String ownerId = "";
         for (FeeDto tmpFeeDto : fees) {
             payerObjName = "";
+            ownerId = "";
             tmpFeeAttrDtos = new ArrayList<>();
             for (FeeAttrDto feeAttrDto : feeAttrDtos) {
                 if (!tmpFeeDto.getFeeId().equals(feeAttrDto.getFeeId())) {
@@ -99,9 +101,14 @@ public class FeeInnerServiceSMOImpl extends BaseServiceSMO implements IFeeInnerS
                 if (FeeAttrDto.SPEC_CD_PAY_OBJECT_NAME.equals(feeAttrDto.getSpecCd())) {
                     payerObjName = feeAttrDto.getValue();
                 }
+                if (FeeAttrDto.SPEC_CD_OWNER_ID.equals(feeAttrDto.getSpecCd())) {
+                    ownerId = feeAttrDto.getValue();
+                }
+
             }
             tmpFeeDto.setPayerObjName(payerObjName);
             tmpFeeDto.setFeeAttrDtos(tmpFeeAttrDtos);
+            tmpFeeDto.setOwnerId(ownerId);
         }
         return fees;
     }