领券bug

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
 
         <where>
             <if test="cardValueRecord.mtUserId != null">

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java

@@ -676,7 +676,15 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
     public IPage<CardValueRecordDTO> selectAllRecord(@Param("page") Page page, CardValueRecordDTO cardValueRecord) {
         cardValueRecord.setStoreId(cardValueRecord.getStoreId());
         cardValueRecord.setMtUserId(TokenUtil.getNowAccountInfo().getId());
-        return this.cardValueRecordMapper.selectAllRecord(page, cardValueRecord);
+        IPage<CardValueRecordDTO> cardValueRecordDTOIPage = this.cardValueRecordMapper.selectAllRecord(page, cardValueRecord);
+        List<CardValueRecordDTO> 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) {

gasStation-uni/pagesMy/moneyBalance/moneyBalance.vue

@@ -40,15 +40,16 @@
 						<view class="sizehei" v-else-if="item.paymentType == 'WECHAT'">微信</view>
 						<view class="sizehei" v-else-if="item.paymentType == 'ALIPAY'">支付宝</view>
 						<view class="sizehei" v-else-if="item.paymentType == 'UNIONPAY'">银联二维码</view>
+						<view class="sizehei" v-else-if="item.paymentType == 'xf'">消费</view>
 						<view class="sizehei" v-else>小程序码</view>
 					</view>
 					<view class="y-bt">
 						<view class="sizehui">订单金额</view>
-						<view class="sizehei">￥{{item.rechargeBalance}}</view>
+						<view class="sizehei" v-if="item.paymentType =='xf' ">￥{{'-'+item.rechargeBalance}}</view>
 					</view>
 					<view class="y-bt">
 						<view class="sizehui">优惠合计</view>
-						<view class="sizehong">￥{{item.obtain}}</view>
+						<view class="sizehong">￥{{item.obtain || 0}}</view>
 					</view>
 					<view class="y-bt">
 						<view class="sizehui">订单时间</view>