加入充电规则功能

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

@@ -80,6 +80,8 @@ public class FeeDetailDto extends PageDto implements Serializable {
     private String fadStateName;
     private String amount;
 
+    private String primeRateName;
+
     public String getPrimeRate() {
         return primeRate;
     }
@@ -359,4 +361,12 @@ public class FeeDetailDto extends PageDto implements Serializable {
     public void setPayOrderId(String payOrderId) {
         this.payOrderId = payOrderId;
     }
+
+    public String getPrimeRateName() {
+        return primeRateName;
+    }
+
+    public void setPrimeRateName(String primeRateName) {
+        this.primeRateName = primeRateName;
+    }
 }

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

@@ -44,6 +44,9 @@ public class ApiFeeDetailDataVo extends Vo {
     private String fadStateName;
     private String amount;
 
+    private String primeRateName;
+
+
     public String getPrimeRate() {
         return primeRate;
     }
@@ -227,4 +230,12 @@ public class ApiFeeDetailDataVo extends Vo {
     public void setPayFeeDetailDiscountDtoList(List<PayFeeDetailDiscountDto> payFeeDetailDiscountDtoList) {
         this.payFeeDetailDiscountDtoList = payFeeDetailDiscountDtoList;
     }
+
+    public String getPrimeRateName() {
+        return primeRateName;
+    }
+
+    public void setPrimeRateName(String primeRateName) {
+        this.primeRateName = primeRateName;
+    }
 }

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

@@ -121,7 +121,7 @@
         t.state,d.name stateName,t.start_time,t.end_time,t.start_time startTime,t.end_time endTime,pfa.`value`
         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
+        curReadingTime,t.pay_order_id payOrderId,pfc.config_id configId,td.`name` primeRateName
         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'
@@ -131,6 +131,7 @@
             left join pay_fee_attrs pfao on pfao.fee_id = t.fee_id and pfao.spec_cd = '390007' and pfao.status_cd = '0'
         </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'
         where 1 =1
         <if test="configId != null and configId != ''">
             and pf.config_id = #{configId}