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

9.26

Browse Source
This commit is contained in:
cun-nan 2024-09-26 17:58:06 +08:00
parent 6a95c2833a
commit 2ec927d3b0
7 changed files with 226 additions and 101 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/fleet/service/impl/FleetInfoServiceImpl.java
View File

@ -231,7 +231,8 @@ public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper,FleetInfo>
//获取所在车队的id集合
List<Integer> fleetIds = fleetMembers.stream().map(FleetMember::getFleetId).collect(Collectors.toList());
if (CollUtil.isEmpty(fleetIds)) {
throw new RuntimeException("未绑定车队");
// throw new RuntimeException("未绑定车队");
return null;
}
List<FleetInfo> fleetInfos = baseMapper.selectList(new LambdaQueryWrapper<FleetInfo>()

44
gasStation-uni/pagesHome/MyCard/MyCard.vue
View File

@ -20,7 +20,7 @@
<view class="card_1" @click="goDetails('oilCard')">
<view class="top_card">
<view class="">囤油卡</view>
<view style="display: flex;" @click="goCode()">
<view style="display: flex;" @click="goCode()">
<view style="margin-right: 5px;">汽油92# 7.28元/L</view>
<image src="../../static/new/rwm.png" style="width: 25px; height: 25px; "></image>
</view>
@ -52,6 +52,21 @@
NO.xxxxxxxxxxxxxxxxxx
</view> -->
</view>
<view class="card_" @click="goFleetDetails()" v-if="fleetInfo()">
<view class="top_card">
<view class="">车队名称</view>
<view class="" @click="goCode()">
<image src="../../static/new/rwm.png" style="width: 25px; height: 25px; "></image>
</view>
</view>
<view class="card-b">
当前余额
</view>
<view class="card-num">
¥{{cardBalance.cardBalance || 0}}
</view>
</view>
</view>
</template>
@ -71,7 +86,8 @@
cardsList: [],
cardsIndex: 0,
title: '',
giftInfo:{},
giftInfo: {},
fleetInfo:{}
}
},
@ -82,8 +98,26 @@
this.query.chainStoreId = uni.getStorageSync('chainStoreId');
// this.getCardFuleRecords();
this.getUserBalance()
this.getFleetInfo()
},
methods: {
getFleetInfo(){
request({
url: '/fleetInfo/getFleetInfoByStoreId',
method: 'get',
params:{storeId:uni.getStorageSync('storeId')}
}).then(res => {
if (res.code == 200) {
this.fleetInfo = res.data
console.log(this.fleetInfo, '111');
}else{
this.fleetInfo = {}
}
})
},
goFleetDetails(){
},
goCode() {
uni.navigateTo({
url: '/pagesHome/QRcode/QRcode'
@ -96,7 +130,7 @@
},
goDetails(val) {
uni.navigateTo({
url: '/pagesHome/cardDetails/index?type='+val
url: '/pagesHome/cardDetails/index?type=' + val
})
},
s_() {
@ -129,7 +163,7 @@
}).then(res => {
if (res.code == 200) {
this.cardsList = res.data.records
console.log(this.cardsList,'131');
console.log(this.cardsList, '131');
}
})
},
@ -350,4 +384,4 @@
text-align: right;
}
</style>
</style>

17
gasStation-uni/pagesHome/certificate/details.vue
View File

@ -55,13 +55,28 @@
</template>
<script>
import request from '../../utils/request';
export default {
data() {
return {
value: 0
value: 0,
certificateId:''
}
},
methods: {
getInfo(){
request({
url: '/cardCoupon/'+this.certificateId,
method: 'get',
params: this.queryParams
}).then(res => {
console.log(res,66);
if (res.code == 200) {
this.list = res.data.records
this.total = res.data.total
}
})
},
valChange(e) {
console.log('当前值为: ' + e.value)
}

13
gasStation-uni/pagesHome/certificate/index.vue
View File

@ -3,20 +3,20 @@
<view class="Candywrapper">
<view class="f-box" v-for="(item,index) in list" :key="index" @click="goDetails()">
<view class="f-top">中建锦绣二期站可用</view>
<view class="f-top">{{item.storeName}}可用</view>
<view class="f-bs">
<image src="../../static/logo.png" style="width: 60px; height: 60px; "></image>
<view class="r-box">
<view class="">
<view class="m_">50元优惠</view>
<view class="p_">最低消费100元</view>
<view class="q_">代金券</view>
<view class="m_">{{item.name}}</view>
<view class="p_">{{item.useCondition}}</view>
<view class="q_">{{item.typeName}}</view>
</view>
<view class="">
<view class="an_">领取</view>
<u-line-progress :percentage="50" :showText="false" height="6"
activeColor="#FA6400"></u-line-progress>
<view class="hui_">券已领70%</view>
<view class="hui_">券已领{{item.scale}}</view>
</view>
</view>
@ -35,7 +35,6 @@
total: 0,
queryParams: {
storeId: '',
useStatus: 0,
pageNo: 1,
pageSize: 30
}
@ -59,7 +58,7 @@
methods: {
getList() {
request({
url: 'business/marketingActivity/cardFavorable/appletList',
url: '/cardCoupon/queryByPageAndStoreId',
method: 'get',
params: this.queryParams
}).then(res => {

153
gasStation-uni/pagesHome/memberRecharge/index.vue
View File

@ -1,51 +1,83 @@
<template>
<view class="centenr">
<!-- 储值卡 -->
<view class="vip-top" v-if="type=='balance'">
<view class="t-right">储值卡 <u-icon name="arrow-down-fill" color="#fff" size="12"></u-icon> </view>
<view class="t-title">当前余额（元）</view>
<view class="t-num">{{cardBalance.cardBalance || 0}}</view>
</view>
<!-- 囤油卡 -->
<view class="vip-top" v-if="type=='oilCard'">
<view class="t-right">囤油卡 <u-icon name="arrow-down-fill" color="#fff" size="12"></u-icon> </view>
<view class="t-title">剩余油量（L）</view>
<view class="t-num">{{cardBalance.cardBalance || 0}}</view>
</view>
<view class="vip-title">
<view class="">{{storeName || "--"}}</view>
<!-- <image src="../../static/new/qh.png" style="width: 18px; height: 18px;" @click="show = true"></image> -->
</view>
<view class="input-box">
<view class="i-title">充值金额</view>
<view class="n_input">
<input type="text" v-model="rechargeOrder.balance" :disabled="isEdit">
<view class="r-title">
{{staff.realName || "--"}}
<!-- 储值卡 -->
<view v-if="type=='balance'">
<view class="input-box">
<view class="i-title">充值金额</view>
<view class="n_input">
<input type="text" v-model="rechargeOrder.balance" :disabled="isEdit">
<view class="r-title">
{{staff.realName || "--"}}
</view>
</view>
</view>
<view class="wrap_box">
<view class="w_box" v-for="(item,index) in rechargeList" :key="index" @click="setIndex(index,item)"
:class="{ 'acvit' :windex == index}">
<view class="">充{{item.rechargeBalance}}元</view>
<view class="">赠{{item.giftBalance}}元</view>
</view>
<view class="w_box" @click="setIndex(rechargeList.length)"
:class="{ 'acvit' :windex == rechargeList.length}">
<view class="" style="line-height: 40px;">自定义金额</view>
</view>
</view>
<view class="input-box">
<view class="i-title">赠送金额</view>
<view class="n_input">
<input type="text" v-model="rechargeOrder.giftBalance" disabled>
</view>
</view>
<view class="input-box">
<view class="i-title">充值备注</view>
<view class="b_input">
<input type="text" v-model="rechargeOrder.remark">
</view>
</view>
</view>
<view class="wrap_box">
<view class="w_box" v-for="(item,index) in rechargeList" :key="index" @click="setIndex(index,item)"
:class="{ 'acvit' :windex == index}">
<view class="">充{{item.rechargeBalance}}元</view>
<view class="">赠{{item.giftBalance}}元</view>
<!-- 囤油卡 -->
<view v-if="type=='oilCard'">
<view class="input-box">
<view class="i-title">充值金额</view>
<view class="n_input">
<input type="text" v-model="rechargeOrder.balance" :disabled="isEdit">
<view class="r-title">
{{staff.realName || "--"}}
</view>
</view>
</view>
<view class="w_box" @click="setIndex(rechargeList.length)"
:class="{ 'acvit' :windex == rechargeList.length}">
<view class="" style="line-height: 40px;">自定义金额</view>
</view>
</view>
<view class="input-box">
<view class="i-title">赠送金额</view>
<view class="n_input">
<input type="text" v-model="rechargeOrder.giftBalance" disabled>
</view>
</view>
<view class="input-box">
<view class="i-title">充值备注</view>
<view class="b_input">
<input type="text" v-model="rechargeOrder.remark">
<view class="wrap_box">
<view class="w_box1" v-for="(item,index) in oilRechargeList" :key="index" @click="setIndex(index,item)"
:class="{ 'acvit' :windex == index}">
<view class="">充值{{item.rechargeBalance}}元，囤油{{item.incomeLitres}}升</view>
<view class="">锁定单价{{item.lockPrice}}元/L</view>
</view>
</view>
<view class="input-box">
<view class="i-title">充值备注</view>
<view class="b_input">
<input type="text" v-model="rechargeOrder.remark">
</view>
</view>
</view>
<view class="title-box">
<view class="i-title">充值有礼</view>
<view class="i-text" v-for="(item,index) in describe" :key="index">{{item.discountActiveDescribe}}</view>
@ -84,13 +116,15 @@
export default {
data() {
return {
type: 'balance',
type: 'oilCard',
show: false,
windex: 0,
storeId: uni.getStorageSync("storeId"),
storeName: "",
// 充值信息列表
rechargeList: [],
// 囤油卡充值列表信息
oilRechargeList: [],
// 员工列表
staffList: [],
staff: {},
@ -120,16 +154,17 @@
},
onShow() {
this.getList()
this.getList1()
this.getUserBalance()
this.getDescribe()
},
methods: {
// 调用充值接口
goRecharge() {
if (this.type=='oilCard'){
if (this.type == 'oilCard') {
uni.showToast({
icon:'error',
title:"暂未开发！"
icon: 'error',
title: "暂未开发！"
})
return;
}
@ -254,6 +289,20 @@
this.staff = res.data.staff
})
},
// 获取列表信息
getList1() {
request({
url: "business/marketingActivity/cardFuelDiesel/selectAllApplet",
method: 'get',
params: {
storeId: this.storeId,
activeStatus: 1
},
}).then((res) => {
this.oilRechargeList = res.data.records
console.log(res, 271);
})
},
getUserBalance() {
request({
url: '/business/userManager/user/getUserBalanceApplet',
@ -270,19 +319,24 @@
},
setIndex(index, data) {
this.windex = index
if (index != this.rechargeList.length) {
this.rechargeOrder.balance = data.rechargeBalance
this.rechargeOrder.payAmount = data.rechargeBalance
this.rechargeOrder.bidBalance = data.bidBalance
this.rechargeOrder.rechargeBalance = data.rechargeBalance
this.rechargeOrder.giftBalance = data.giftBalance
this.rechargeOrder.id = data.id
} else {
this.rechargeOrder.balance = 0
this.rechargeOrder.payAmount = 0
this.rechargeOrder.bidBalance = 0
this.rechargeOrder.rechargeBalance = 0
this.rechargeOrder.giftBalance = 0
if (this.type == 'balance') {
if (index != this.rechargeList.length) {
this.rechargeOrder.balance = data.rechargeBalance
this.rechargeOrder.payAmount = data.rechargeBalance
this.rechargeOrder.bidBalance = data.bidBalance
this.rechargeOrder.rechargeBalance = data.rechargeBalance
this.rechargeOrder.giftBalance = data.giftBalance
this.rechargeOrder.id = data.id
} else {
this.rechargeOrder.balance = 0
this.rechargeOrder.payAmount = 0
this.rechargeOrder.bidBalance = 0
this.rechargeOrder.rechargeBalance = 0
this.rechargeOrder.giftBalance = 0
}
}
if (this.type == 'oilCard') {
}
}
}
@ -404,6 +458,19 @@
margin-right: 1%;
}
.w_box1 {
width: 48%;
border: 1px solid #EEEEEE;
border-radius: 4px;
text-align: center;
color: #333333;
box-sizing: border-box;
padding: 5px;
font-size: 14px;
margin-bottom: 15px;
margin-right: 1%;
}
.anniu_ {
width: 80%;
height: 35px;

23
gasStation-uni/pagesMy/Coupons/details.vue
View File

@ -22,7 +22,8 @@
<view class="si_"> 1、每人限领10张 2、每日</view>
<view class="si_">核销说明：</view>
<view class="si_" style="display: flex;align-items: center;">
<view style="width: 6px;height: 6px;background: #FF9655;margin-right: 5px;border-radius: 50%;"></view>
<view style="width: 6px;height: 6px;background: #FF9655;margin-right: 5px;border-radius: 50%;">
</view>
以下模块可用：一键加油、扫码买单
</view>
</view>
@ -38,11 +39,7 @@
<view class="si">山东省济南市槐荫区 | 3.0km</view>
</view>
</view>
<view class="bottom-box">
<view class="or-num">免费</view>
<view class="anniu">立即领取</view>
<view class="but-sub">保存</view>
</view>
</view>
</template>
@ -148,4 +145,18 @@
display: flex;
align-items: center;
}
.but-sub {
width: 305px;
height: 40px;
line-height: 40px;
margin: 0 auto;
background-color: #FF9655;
color: white;
border-radius: 50px;
text-align: center;
position: absolute;
bottom: 40px;
left: 11%;
}
</style>

74
gasStation-uni/pagesMy/signIn/index.vue
View File

@ -12,7 +12,7 @@
<view class="wrap-box">
<view class="w_box" v-for="(item,index) in 30" :key="index" @click="setIndex(index)"
:class="{'acv_w' : wIndex == index }">
<view class="">第6天</view>
<view class="">第{{item+1}}天</view>
<image src="@/static/imgs/jinbi.png" style="width: 25px; height: 25px; "></image>
<view class="">5积分</view>
</view>
@ -37,8 +37,8 @@
<view class="_bbox">
<!-- <view class="b_title">获取您的位置信息</view> -->
<view class="">
1.签到时间：
{{signInRule}}
<!-- 1.签到时间：
全天可签到，不限制具体时间段。
2.签到方式：
用户通过小程序的签到入口进行点击签到。
@ -48,7 +48,7 @@
激励机制。
4、补签与断签：
不允许用户进行补签，以恢复连续签到天数。
断签后，用户需重新开始计算连续签到天数。
断签后，用户需重新开始计算连续签到天数。 -->
</view>
</view>
@ -64,7 +64,9 @@
return {
wIndex: 0,
show: false,
equityShow: false
equityShow: false,
list: [],
signInRule: ''
}
},
onLoad() {
@ -72,27 +74,39 @@
},
onPullDownRefresh() {
//下拉刷新
this.resetting() //重置方法
this.getList() //调用请求
uni.stopPullDownRefresh()
},
onReachBottom() {
// 触底加载
if (this.pageNo >= this.totalPage) {
uni.showToast({
title: '没有下一页数据',
icon: 'none'
})
} else {
this.pageNo++
this.getList()
}
},
onShow() {
this.getList()
this.getSignIn()
},
components: {
},
methods: {
getSignIn() {
request({
url: '/business/integral/integralSettings/getIntegralSignInRules',
method: 'get',
params: {
storeId: uni.getStorageSync("storeId")
}
}).then((res) => {
console.log(res, 104);
if (res.code == 200) {
this.signInRule = res.data
}
})
},
equityclose() {
this.equityShow = false
},
@ -100,35 +114,19 @@
this.wIndex = index
this.show = true
},
//滞空方法
resetting() {
this.pageNo = 1
this.pageSize = 10
this.totalPage = ''
this.List = []
},
// 分页——网络请求
async getList() {
// uni.showLoading({
// title: '加载中'
// });
let res = await request({
url: '网络请求',
getList() {
request({
url: '/business/integral/integralSettings/getIntegral',
method: 'get',
data: {
pageNo: this.pageNo,
pageSize: this.pageSize,
params: {
storeId: uni.getStorageSync("storeId")
}
}).then((res) => {
console.log(res, 107);
if (res.code == 200) {
this.list = res.data
}
})
if (res.code == 200) {
uni.hideLoading(); //交互反馈
if (this.pageNo != 1) {
this.List = this.ruleList.concat(res.result.records)
} else {
this.List = res.result.records
}
this.totalPage = res.result.pages
}
},
goback() {
uni.navigateBack()