优化代码

java110-bean/src/main/java/com/java110/dto/fee/FeeReceiptDetailDto.java

@@ -46,6 +46,8 @@ public class FeeReceiptDetailDto extends PageDto implements Serializable {
 
     private String discountPrice;
 
+    private String payerObjId;
+
 
 
     public String getArea() {
@@ -240,4 +242,12 @@ public class FeeReceiptDetailDto extends PageDto implements Serializable {
     public void setDiscountPrice(String discountPrice) {
         this.discountPrice = discountPrice;
     }
+
+    public String getPayerObjId() {
+        return payerObjId;
+    }
+
+    public void setPayerObjId(String payerObjId) {
+        this.payerObjId = payerObjId;
+    }
 }

java110-db/src/main/resources/mapper/fee/FeeReceiptDetailServiceDaoImplMapper.xml

@@ -39,7 +39,7 @@
         startTime,t.status_cd,t.status_cd statusCd,t.end_time,t.end_time endTime,t.community_id,t.community_id
         communityId,t.receipt_id,t.receipt_id receiptId,t.fee_id,t.fee_id feeId,t.cycle,t.square_price squarePrice,
         pfd.remark,pf.fee_flag feeFlag,mw.pre_degrees preDegrees,mw.cur_degrees curDegrees,d.name primeRate,
-        pfc.units,pfd.pay_order_id payOrderId
+        pfc.units,pfd.pay_order_id payOrderId,pf.payer_obj_id payerObjId
         from fee_receipt_detail t
         left join pay_fee_detail pfd on t.detail_id = pfd.detail_id and pfd.status_cd = '0' and t.community_id =
         pfd.community_id

service-fee/src/main/java/com/java110/fee/bmo/feeReceiptDetail/impl/GetFeeReceiptDetailBMOImpl.java

@@ -15,6 +15,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 @Service("getFeeReceiptDetailBMOImpl")
@@ -134,6 +135,7 @@ public class GetFeeReceiptDetailBMOImpl implements IGetFeeReceiptDetailBMO {
 
     /**
      * 合并一次性费用
+     *
      * @param nOnceFeeReceiptDetailDtos
      * @param feeReceiptDetailDto
      */
@@ -153,7 +155,7 @@ public class GetFeeReceiptDetailBMOImpl implements IGetFeeReceiptDetailBMO {
                 continue;
             }
 
-            if (!nFeeReceiptDetailDto.getPayOrderId().equals(feeReceiptDetailDto.getPayOrderId())) {
+            if (!nFeeReceiptDetailDto.getPayerObjId().equals(feeReceiptDetailDto.getPayerObjId())) {
                 continue;
             }
 
@@ -173,7 +175,10 @@ public class GetFeeReceiptDetailBMOImpl implements IGetFeeReceiptDetailBMO {
         }
 
         nOnceFeeReceiptDetailDto.setEndTime(feeReceiptDetailDto.getEndTime());
-
+        BigDecimal amount = new BigDecimal(nOnceFeeReceiptDetailDto.getAmount());
+        amount = amount.add(new BigDecimal(feeReceiptDetailDto.getAmount()));
+        nOnceFeeReceiptDetailDto.setAmount(amount.doubleValue() + "");
+        nOnceFeeReceiptDetailDto.setCurDegrees(feeReceiptDetailDto.getCurDegrees());
     }
 
 }