优化代码

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

@@ -26,6 +26,7 @@ public class FeeReceiptDetailDto extends PageDto implements Serializable {
     private String feeId;
     private String cycle;
     private String squarePrice;
+    private String remark;
 
 
     private Date createTime;
@@ -137,4 +138,12 @@ public class FeeReceiptDetailDto extends PageDto implements Serializable {
     public void setSquarePrice(String squarePrice) {
         this.squarePrice = squarePrice;
     }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

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

@@ -19,8 +19,10 @@
     <select id="getFeeReceiptDetailInfo" parameterType="Map" resultType="Map">
         select t.area,t.amount,t.fee_name,t.fee_name feeName,t.detail_id,t.detail_id detailId,t.start_time,t.start_time
         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
+        communityId,t.receipt_id,t.receipt_id receiptId,t.fee_id,t.fee_id feeId,t.cycle,t.square_price squarePrice,
+        pfd.remark
         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
         where 1 =1
         <if test="area !=null and area != ''">
             and t.area= #{area}

service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java

@@ -125,7 +125,7 @@ public class FeeBMOImpl extends ApiBaseBMO implements IFeeBMO {
         business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
         JSONObject businessFeeDetail = new JSONObject();
         businessFeeDetail.putAll(paramInJson);
-        businessFeeDetail.put("detailId", "-1");
+        businessFeeDetail.put("detailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
         businessFeeDetail.put("primeRate", "1.00");
         //计算 应收金额
         FeeDto feeDto = new FeeDto();
@@ -172,7 +172,7 @@ public class FeeBMOImpl extends ApiBaseBMO implements IFeeBMO {
         feeReceiptDetailPo.setAmount(businessFeeDetail.getString("receivedAmount"));
         feeReceiptDetailPo.setCommunityId(feeDto.getCommunityId());
         feeReceiptDetailPo.setCycle(businessFeeDetail.getString("cycles"));
-        feeReceiptDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
+        feeReceiptDetailPo.setDetailId(businessFeeDetail.getString("detailId"));
         feeReceiptDetailPo.setEndTime(businessFeeDetail.getString("endTime"));
         feeReceiptDetailPo.setFeeId(feeDto.getFeeId());
         feeReceiptDetailPo.setFeeName(StringUtil.isEmpty(feeDto.getImportFeeName()) ? feeDto.getFeeName() : feeDto.getImportFeeName());
@@ -477,9 +477,9 @@ public class FeeBMOImpl extends ApiBaseBMO implements IFeeBMO {
         businessFeeDetail.put("detailId", "-1");
         businessFeeDetail.put("primeRate", "1.00");
         if (!businessFeeDetail.containsKey("state")) {
-            businessFeeDetail.put("state","1400");
+            businessFeeDetail.put("state", "1400");
         }
-            //计算 应收金额
+        //计算 应收金额
         FeeDto feeDto = new FeeDto();
         feeDto.setFeeId(paramInJson.getString("feeId"));
         feeDto.setCommunityId(paramInJson.getString("communityId"));