java110 %!s(int64=5) %!d(string=hai) anos
pai
achega
daf1dea7f7

+ 1 - 0
java110-bean/src/main/java/com/java110/dto/fee/BillOweFeeDto.java

@@ -15,6 +15,7 @@ import java.io.Serializable;
 public class BillOweFeeDto extends PageDto implements Serializable {
 
     public static final String STATE_FINISH_FEE = "2000";//已缴费
+    public static final String STATE_WILL_FEE = "1000";//未缴费
 
     private String oweId;
     private String billId;

+ 12 - 1
service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java

@@ -1,6 +1,7 @@
 package com.java110.fee.bmo.impl;
 
 import com.java110.dto.RoomDto;
+import com.java110.dto.fee.BillDto;
 import com.java110.dto.fee.BillOweFeeDto;
 import com.java110.dto.fee.FeeConfigDto;
 import com.java110.dto.fee.FeeDto;
@@ -75,10 +76,20 @@ public class QueryOweFeeImpl implements IQueryOweFee {
             computeFeePrice(tmpFeeDto);
             return;
         }
+        BillDto billDto = new BillDto();
+        billDto.setCommunityId(tmpFeeDto.getCommunityId());
+        billDto.setConfigId(tmpFeeDto.getConfigId());
+        billDto.setCurBill("T");
+        List<BillDto> billDtos = feeInnerServiceSMOImpl.queryBills(billDto);
+        if (billDtos == null || billDtos.size() < 1) {
+            tmpFeeDto.setFeePrice(0.00);
+            return;
+        }
         BillOweFeeDto billOweFeeDto = new BillOweFeeDto();
         billOweFeeDto.setCommunityId(tmpFeeDto.getCommunityId());
         billOweFeeDto.setFeeId(tmpFeeDto.getFeeId());
-        billOweFeeDto.setState("T");
+        billOweFeeDto.setState(BillOweFeeDto.STATE_WILL_FEE);
+        billOweFeeDto.setBillId(billDtos.get(0).getBillId());
         List<BillOweFeeDto> billOweFeeDtos = feeInnerServiceSMOImpl.queryBillOweFees(billOweFeeDto);
         if (billOweFeeDtos == null || billOweFeeDtos.size() < 1) {
             tmpFeeDto.setFeePrice(0.00);