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

更新9.30

Browse Source
This commit is contained in:
许允枞 2024-09-30 11:45:40 +08:00
parent 712310817a
commit c802e9ea0a
4 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/entity/FleetConsumeRecord.java
View File

@ -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;
/**
* 创建者

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/xml/FleetConsumeRecordMapper.xml
View File

@ -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>

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/vo/FleetConsumeRecordVo.java
View File

@ -12,4 +12,5 @@ public class FleetConsumeRecordVo extends FleetConsumeRecord {
private String endTime;
private String fleetName;
private String storeName;
private String cardType;
}

26
gasStation-uni/pagesMy/fleetInfo/fund.vue
View File

@ -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
if(this.type == 1) {
this.getFleetLinesChange()
}else{
this.getList()
}
this.show = false
},
cancel1() {