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 29943b5f9..4daead1dc 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 @@ -76,7 +76,21 @@ 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) AS combined_result + store_id storeId,pay_status payStatus FROM card_fuel_record + UNION + SELECT '储值卡' AS recordName, + change_type paymentType, + user_id mtUserId, + balance rechargeBalance, + after_the_change obtain, + order_no oilName, + from_type type, + create_time createTime, + chain_store_id chainStoreId, + store_id storeId, + id payStatus + from card_balance_change cbc + where change_type = 0) AS combined_result diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java index eb0abd143..79c9a8fb1 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java @@ -676,7 +676,15 @@ public class CardValueRecordServiceImpl extends ServiceImpl selectAllRecord(@Param("page") Page page, CardValueRecordDTO cardValueRecord) { cardValueRecord.setStoreId(cardValueRecord.getStoreId()); cardValueRecord.setMtUserId(TokenUtil.getNowAccountInfo().getId()); - return this.cardValueRecordMapper.selectAllRecord(page, cardValueRecord); + IPage cardValueRecordDTOIPage = this.cardValueRecordMapper.selectAllRecord(page, cardValueRecord); + List records = cardValueRecordDTOIPage.getRecords(); + for (CardValueRecordDTO record : records) { + if (record.getPaymentType().equals("0")){ + record.setPayStatus("paid"); + record.setPaymentType("xf"); + } + } + return cardValueRecordDTOIPage; } public void export(HttpServletResponse response, CardValueRecord cardValueRecord) { diff --git a/gasStation-uni/pagesMy/moneyBalance/moneyBalance.vue b/gasStation-uni/pagesMy/moneyBalance/moneyBalance.vue index 545793b48..206b1dc4e 100644 --- a/gasStation-uni/pagesMy/moneyBalance/moneyBalance.vue +++ b/gasStation-uni/pagesMy/moneyBalance/moneyBalance.vue @@ -40,15 +40,16 @@ 微信 支付宝 银联二维码 + 消费 小程序码 订单金额 - ¥{{item.rechargeBalance}} + ¥{{'-'+item.rechargeBalance}} 优惠合计 - ¥{{item.obtain}} + ¥{{item.obtain || 0}} 订单时间