diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueRecordDTO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueRecordDTO.java index 33fa75e24..e7bec6a83 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueRecordDTO.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueRecordDTO.java @@ -3,6 +3,8 @@ package com.fuint.business.marketingActivity.cardValue.dto; import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord; import lombok.Data; +import java.util.Date; + /** * */ @@ -25,6 +27,7 @@ public class CardValueRecordDTO extends CardValueRecord { private String paymentType; private String payStatus; private String types; + private Date expireTime; // /** // * 会员id diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml index c54842f2e..351aee6be 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml @@ -68,15 +68,16 @@ combined_result.OilName, combined_result.type, combined_result.paymentType, - combined_result.payStatus + combined_result.payStatus, + combined_result.expireTime FROM (SELECT '储值卡' AS recordName,payment_type paymentType,mt_user_id mtUserId, recharge_balance rechargeBalance, bid_balance obtain, fringe_benefit oilName,royalty_type type, - create_time createTime, chain_store_id chainStoreId, store_id storeId,pay_status payStatus FROM card_value_record + create_time createTime, chain_store_id chainStoreId, store_id storeId,pay_status payStatus,update_time expireTime FROM card_value_record UNION SELECT '囤油卡' AS recordName,payment_type paymentType,mt_user_id mtUserId, recharge_balance rechargeBalance, income_litres obtain,oil_name oilName,type, create_time createTime, chain_store_id chainStoreId, - store_id storeId,pay_status payStatus FROM card_fuel_record + store_id storeId,pay_status payStatus,expire_time expireTime FROM card_fuel_record UNION SELECT '储值卡' AS recordName, cbc.change_type paymentType, diff --git a/gasStation-uni/pagesMy/oilBalance/oilBalance.vue b/gasStation-uni/pagesMy/oilBalance/oilBalance.vue index 3f312d59f..685bf167d 100644 --- a/gasStation-uni/pagesMy/oilBalance/oilBalance.vue +++ b/gasStation-uni/pagesMy/oilBalance/oilBalance.vue @@ -10,7 +10,7 @@ 囤油升数 - {{item.type}} : {{item.oilName}} + {{item.type}} 剩余升数: {{item.refuelMoney}}升 订单金额 ¥{{item.rechargeBalance}} @@ -54,6 +54,10 @@ 订单时间 {{item.createTime}} + + 到期时间 + {{item.expireTime}} +