dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
cun-nan 2024-03-14 16:02:02 +08:00
parent e65c175ef6
commit 6e88b800c1
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueRecordDTO.java
View File

@ -3,6 +3,8 @@ package com.fuint.business.marketingActivity.cardValue.dto;
import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord; import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord;
import lombok.Data; import lombok.Data;
import java.util.Date;
/** /**
* *
*/ */
@ -25,6 +27,7 @@ public class CardValueRecordDTO extends CardValueRecord {
private String paymentType; private String paymentType;
private String payStatus; private String payStatus;
private String types; private String types;
private Date expireTime;
// /** // /**
// * 会员id // * 会员id

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml
View File

@ -68,15 +68,16 @@
combined_result.OilName, combined_result.OilName,
combined_result.type, combined_result.type,
combined_result.paymentType, combined_result.paymentType,
combined_result.payStatus combined_result.payStatus,
combined_result.expireTime
FROM FROM
(SELECT '储值卡' AS recordName,payment_type paymentType,mt_user_id mtUserId, (SELECT '储值卡' AS recordName,payment_type paymentType,mt_user_id mtUserId,
recharge_balance rechargeBalance, bid_balance obtain, fringe_benefit oilName,royalty_type type, 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 UNION
SELECT '囤油卡' AS recordName,payment_type paymentType,mt_user_id mtUserId, recharge_balance rechargeBalance, 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, 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 UNION
SELECT '储值卡' AS recordName, SELECT '储值卡' AS recordName,
cbc.change_type paymentType, cbc.change_type paymentType,

12
gasStation-uni/pagesMy/oilBalance/oilBalance.vue
View File

@ -10,7 +10,7 @@
<view class="top-box" v-for="(item,index) in refuelMoney" :key="index"> <view class="top-box" v-for="(item,index) in refuelMoney" :key="index">
<!-- <view class="kuangbox">使用规则 </view> --> <!-- <view class="kuangbox">使用规则 </view> -->
<view class="box-title">囤油升数</view> <view class="box-title">囤油升数</view>
<view class="box-nmb">{{item.type}} : {{item.oilName}}</view> <view class="box-nmb">{{item.type}}<!-- : {{item.oilName}} --></view>
<view class="box-nmb">剩余升数: {{item.refuelMoney}}升</view> <view class="box-nmb">剩余升数: {{item.refuelMoney}}升</view>
<!-- <view class="dis-bt"> <!-- <view class="dis-bt">
<view class="">累计获得0.00</view> <view class="">累计获得0.00</view>
@ -35,13 +35,13 @@
<view class="moneyname" v-else>未支付</view> <view class="moneyname" v-else>未支付</view>
</view> </view>
<view class="y-bt"> <view class="y-bt">
<view class="sizehui">油品类型</view> <view class="sizehui">油品名称</view>
<view class="sizehei">￥{{item.type}}</view> <view class="sizehei">￥{{item.type}}</view>
</view> </view>
<view class="y-bt"> <!-- <view class="y-bt">
<view class="sizehui">油品名称</view> <view class="sizehui">油品名称</view>
<view class="sizehei">￥{{item.oilName}}</view> <view class="sizehei">￥{{item.oilName}}</view>
</view> </view> -->
<view class="y-bt"> <view class="y-bt">
<view class="sizehui">订单金额</view> <view class="sizehui">订单金额</view>
<view class="sizehei">￥{{item.rechargeBalance}}</view> <view class="sizehei">￥{{item.rechargeBalance}}</view>
@ -54,6 +54,10 @@
<view class="sizehui">订单时间</view> <view class="sizehui">订单时间</view>
<view class="sizehei">{{item.createTime}}</view> <view class="sizehei">{{item.createTime}}</view>
</view> </view>
<view class="y-bt">
<view class="sizehui">到期时间</view>
<view class="sizehei">{{item.expireTime}}</view>
</view>
<!-- <view class="dibu"> <!-- <view class="dibu">
<view class="xiaanniu">评价有礼</view> <view class="xiaanniu">评价有礼</view>
</view> --> </view> -->