浏览代码

优化代码

java110 2 年之前
父节点
当前提交
f766c5c863

+ 10 - 0
java110-bean/src/main/java/com/java110/dto/fee/FeeDetailDto.java

@@ -87,6 +87,8 @@ public class FeeDetailDto extends PageDto implements Serializable {
 
     private String feeFlag;
 
+    private String receiptCode;
+
     public String getPrimeRate() {
         return primeRate;
     }
@@ -406,4 +408,12 @@ public class FeeDetailDto extends PageDto implements Serializable {
     public void setFeeFlag(String feeFlag) {
         this.feeFlag = feeFlag;
     }
+
+    public String getReceiptCode() {
+        return receiptCode;
+    }
+
+    public void setReceiptCode(String receiptCode) {
+        this.receiptCode = receiptCode;
+    }
 }

+ 10 - 0
java110-bean/src/main/java/com/java110/vo/api/ApiFeeDetailDataVo.java

@@ -53,6 +53,8 @@ public class ApiFeeDetailDataVo extends Vo {
 
     private String feeFlag;
 
+    private String receiptCode;
+
 
 
     public String getPrimeRate() {
@@ -278,4 +280,12 @@ public class ApiFeeDetailDataVo extends Vo {
     public void setFeeFlag(String feeFlag) {
         this.feeFlag = feeFlag;
     }
+
+    public String getReceiptCode() {
+        return receiptCode;
+    }
+
+    public void setReceiptCode(String receiptCode) {
+        this.receiptCode = receiptCode;
+    }
 }

+ 3 - 1
java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml

@@ -122,7 +122,7 @@
         importFeeName,pfc.fee_name feeName,t.payable_amount,t.payable_amount payableAmount,
         mw.cur_degrees curDegrees,mw.pre_degrees preDegrees, mw.pre_reading_time preReadingTime,mw.cur_reading_time
         curReadingTime,t.pay_order_id payOrderId,pfc.config_id configId,td.`name` primeRateName,pfao1.`value` payerObjName,
-        t.cashier_id cashierId,t.cashier_name cashierName,pfc.fee_flag feeFlag
+        t.cashier_id cashierId,t.cashier_name cashierName,pfc.fee_flag feeFlag,fr.receipt_code receiptCode
         from pay_fee_detail t
         left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002'
         left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
@@ -134,6 +134,8 @@
         </if>
         left join t_dict d on t.state = d.status_cd and d.table_name = 'pay_fee_detail' and d.table_columns = 'state'
         left join t_dict td on t.prime_rate = td.status_cd and td.table_name = 'pay_fee_detail' and td.table_columns = 'prime_rate'
+        left join fee_receipt_detail frd on t.detail_id = frd.detail_id and frd.status_cd = '0'
+        left join fee_receipt fr on frd.receipt_id = fr.receipt_id and fr.status_cd = '0'
         where 1 =1
         <if test="configId != null and configId != ''">
             and pf.config_id = #{configId}