From c802e9ea0a513fba3125908d7812f60b9d2bfca2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Mon, 30 Sep 2024 11:45:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B09.30?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fleet/entity/FleetConsumeRecord.java      |  2 ++
 .../mapper/xml/FleetConsumeRecordMapper.xml   |  8 ++++--
 .../fleet/vo/FleetConsumeRecordVo.java        |  1 +
 gasStation-uni/pagesMy/fleetInfo/fund.vue     | 28 +++++++++++++------
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/entity/FleetConsumeRecord.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/entity/FleetConsumeRecord.java
index ddb3dfabb..30d616cbf 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/entity/FleetConsumeRecord.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/entity/FleetConsumeRecord.java
@@ -3,6 +3,7 @@ package com.fuint.business.fleet.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fuint.framework.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -72,6 +73,7 @@ public class FleetConsumeRecord extends BaseEntity implements Serializable {
     /**
      * 订单完成时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date paymentTime;
     /**
      * 创建者
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/xml/FleetConsumeRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/xml/FleetConsumeRecordMapper.xml
index d39ae991a..0d481b7e2 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/xml/FleetConsumeRecordMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/xml/FleetConsumeRecordMapper.xml
@@ -24,8 +24,9 @@
         ORDER BY create_time DESC
     </select>
     <select id="selectGrowthValueChangeList" resultType="com.fuint.business.fleet.vo.FleetConsumeRecordVo">
-        SELECT * , mt.name storeName FROM fleet_consume_record fc
+        SELECT * , mt.name storeName , fi.card_type cardType FROM fleet_consume_record fc
         left join mt_store mt on mt.id = fc.store_id
+        left join fleet_info fi on fi.id = fc.fleet_id
         <where>
             <if test="fleetConsumeRecord.storeId != null and fleetConsumeRecord.storeId != ''">
                 and fc.store_id = #{fleetConsumeRecord.storeId}
@@ -36,8 +37,11 @@
             <if test="fleetConsumeRecord.fleetId != null and fleetConsumeRecord.fleetId != ''">
                 and fc.fleet_id = #{fleetConsumeRecord.fleetId}
             </if>
+            <if test="fleetConsumeRecord.fromType != null and fleetConsumeRecord.fromType != ''">
+                and fc.from_type = #{fleetConsumeRecord.fromType}
+            </if>
             <if test="fleetConsumeRecord.startTime != null and fleetConsumeRecord.startTime != ''">
-                and fc.create_time between #{fleetConsumeRecord.startTime} and #{fleetConsumeRecord.endTime}
+                and fc.payment_time between #{fleetConsumeRecord.startTime} and #{fleetConsumeRecord.endTime}
             </if>
 
         </where>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/vo/FleetConsumeRecordVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/vo/FleetConsumeRecordVo.java
index 6ac49ce55..ec660c4d6 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/vo/FleetConsumeRecordVo.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/vo/FleetConsumeRecordVo.java
@@ -12,4 +12,5 @@ public class FleetConsumeRecordVo extends FleetConsumeRecord {
     private String endTime;
     private String fleetName;
     private String storeName;
+    private String cardType;
 }
diff --git a/gasStation-uni/pagesMy/fleetInfo/fund.vue b/gasStation-uni/pagesMy/fleetInfo/fund.vue
index ea89f08e0..4498cc200 100644
--- a/gasStation-uni/pagesMy/fleetInfo/fund.vue
+++ b/gasStation-uni/pagesMy/fleetInfo/fund.vue
@@ -28,7 +28,7 @@
 							<view class="r-text">{{item.cardPaymentAmount}}</view>
 						</view>
 						<view class="right-box">
-							<view class="">储值卡</view>
+							<view class="">{{item.cardType}}</view>
 							<view class="">余额{{item.afterTheChange}}</view>
 						</view>
 						<view class="right-box">
@@ -123,11 +123,14 @@
 						label:'全部类型',
 						type:null
 					}, {
-						label:'油品'
+						label:'油品',
+						type:'油品'
 					}, {
-						label:'积分兑换'
+						label:'积分兑换',
+						type:"积分兑换"
 					}, {
-						label:"会员充值"
+						label:"会员充值",
+						type:'会员充值'
 					}]
 				],
 				queryParams: {
@@ -165,7 +168,8 @@
 				type: "",
 				storeId: uni.getStorageSync("storeId"),
 				changeReason: "",
-				startTime: ""
+				startTime: "",
+				fromType:null
 			}
 			this.getList()
 		},
@@ -179,6 +183,8 @@
 		methods: {
 			getindex(index) {
 				this.type = index
+				this.queryParams.startTime= null
+				this.value1 = Number(new Date())
 				if (index == 1) {
 					this.getFleetLinesChange()
 				} else if (index == 0) {
@@ -252,10 +258,11 @@
 				this.queryParams.pageNo = 1
 				console.log("获取的e:", e);
 				if (e.value[0] == '全部类型') {
-					this.queryParams.formType = null
+					this.queryParams.fromType = null
 				} else {
-					this.queryParams.formType = e.value[0].type
+					this.queryParams.fromType = e.value[0].type
 				}
+				console.log('this.queryParams:',this.queryParams);
 				this.getList()
 				this.show1 = false
 			},
@@ -274,7 +281,12 @@
 			confirm1(e) {
 				this.queryParams.startTime = this.timestampToString(e.value)
 				this.queryParams.pageNo = 1
-				this.getFleetLinesChange()
+				if(this.type == 1) {
+					this.getFleetLinesChange()
+				}else{
+					this.getList()
+				}
+				
 				this.show = false
 			},
 			cancel1() {