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

Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-05-30 16:05:20 +08:00
commit d6684b413d
4 changed files with 280 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
View File

@ -211,6 +211,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
cardFuelRecordDTO.setStoreId(nowAccountInfo.getStoreId()); cardFuelRecordDTO.setStoreId(nowAccountInfo.getStoreId());
cardFuelRecordDTO.setChainStoreId(nowAccountInfo.getChainStoreId()); cardFuelRecordDTO.setChainStoreId(nowAccountInfo.getChainStoreId());
cardFuelRecordDTO.setPayAmount(cardFuelRecordDTO.getRechargeBalance()); cardFuelRecordDTO.setPayAmount(cardFuelRecordDTO.getRechargeBalance());
cardFuelRecordDTO.setMtStaffId(nowAccountInfo.getStaffId());
LambdaQueryWrapper<CardFuelRecord> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<CardFuelRecord> queryWrapper = new LambdaQueryWrapper<>();

171
pos-uni/pages/index/index.vue
View File

@ -66,7 +66,30 @@
<u-icon name="bell" color="#E61D2A" size="18"></u-icon> <u-icon name="bell" color="#E61D2A" size="18"></u-icon>
<view class="hy-size">您有新的交易日报生成，请点击查看</view> <view class="hy-size">您有新的交易日报生成，请点击查看</view>
</view> --> </view> -->
<view class="box_" v-for="item,index in orderList" :key="index">
<view class="b-bx">
<!-- <view class="title_">京博加油站</view> -->
<view class="zt-size" v-if="item.orderStatus == 'paid'">已支付</view>
<view class="zt-size" v-if="item.orderStatus == 'refund'">已退款</view>
<view class="zt-size" v-if="item.orderStatus == 'unpaid'">未支付</view>
</view>
<view class="centne">
<view class="right-centne">
<view class="h_"> <text class="hao_">订单号:</text> <text>{{item.orderNo}}</text>
</view>
<view class="h_"><text class="hao_">油号:</text>{{item.oilName}}</view>
<view class="h_"><text class="hao_">升数:</text>{{item.shengshu}}L</view>
<view class="h_"><text class="hao_">下单时间:</text>{{item.payTime}}</view>
<view class="b-bx">
<view class=""> <text class="hao_">应付:</text>￥{{item.goodsMoney}}</view>
<view class=""><text class="hao_">优惠:</text>￥0.00</view>
</view>
</view>
</view>
<view class="end-box">实付:￥{{item.payMoney}}</view>
</view>
</view> </view>
<view style="width: 100%;height: 68px;"></view>
<tabbar :msg='msg'></tabbar> <tabbar :msg='msg'></tabbar>
</view> </view>
</template> </template>
@ -83,16 +106,26 @@
List: [], List: [],
show: false, show: false,
status: 'loading', status: 'loading',
orderList: [],
indexData: { indexData: {
totalPayMoney: '0', totalPayMoney: '0',
totalCount: '0', totalCount: '0',
totalRefund: '0', totalRefund: '0',
} },
form: {
page: 1,
pageSize: 10,
status: '',
startTime: '',
endTime: '',
payType: ''
},
} }
}, },
onShow() { onShow() {
// this.actList = ["1", "1", "1", "1", "1", ] // this.actList = ["1", "1", "1", "1", "1", ]
// this.status = "nomore" 底部刷新结束 // this.status = "nomore" 底部刷新结束
this.getPageListByPos()
this.getIndexData(); this.getIndexData();
}, },
onPullDownRefresh() { onPullDownRefresh() {
@ -110,6 +143,24 @@
tabbar tabbar
}, },
methods: { methods: {
getPageListByPos() {
request({
url: 'business/allOrderInfo/getPageListByPosRecentThree',
method: 'get',
params: this.form
}).then((res) => {
if (res.code == 200) {
this.orderList = res.data.records;
} else {
uni.showToast({
title: res.data,
icon: "none"
})
}
})
},
goRecharge() { goRecharge() {
uni.navigateTo({ uni.navigateTo({
url: "/pagesHome/MemberRecharge/MemberRecharge" url: "/pagesHome/MemberRecharge/MemberRecharge"
@ -294,4 +345,122 @@
overflow: hidden; overflow: hidden;
margin-left: 10px; margin-left: 10px;
} }
.box_ {
width: 95%;
border-radius: 8px;
background: #fff;
box-sizing: border-box;
padding: 15px;
margin: 15px auto;
}
.b-bx {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 10px;
}
.title_ {
font-weight: bold;
font-size: 16px;
color: #333333;
}
.zt-size {
font-weight: bold;
font-size: 16px;
color: #FD504E;
}
.centne {
display: flex;
}
.touxiang {
width: 60px;
height: 60px;
border-radius: 50%;
background: #D9D9D9;
margin-right: 15px;
}
.right-centne {
width: 100%;
font-size: 14px;
}
.h_ {
width: 100%;
margin-bottom: 5px;
}
.end-box {
width: 100%;
text-align: right;
font-weight: bold;
font-size: 16px;
color: #0864E9;
}
.time {
font-weight: 500;
font-size: 14px;
color: #333333;
margin: 0px auto;
margin-top: 15px;
}
.time-bs {
width: 100%;
box-sizing: border-box;
background: #FFFFFF;
padding: 15px;
display: flex;
align-items: center;
justify-content: space-around;
}
.time-bs2 {
width: 100%;
box-sizing: border-box;
background: #FFFFFF;
padding: 30px;
// display: flex;
align-items: center;
justify-content: space-around;
}
.time-box {
border: 1px solid #0864E9;
box-sizing: border-box;
padding: 5px 15px;
border-radius: 8px;
font-size: 14px;
color: #333;
display: flex;
align-items: center;
justify-content: center;
}
.time-box2 {
border: 1px solid #0864E9;
box-sizing: border-box;
padding: 5px 15px;
border-radius: 8px;
font-size: 14px;
color: #333;
display: flex;
align-items: center;
justify-content: center;
}
.hao_ {
width: 30%;
font-weight: bold;
margin-right: 5px;
}
</style> </style>

106
pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue
View File

@ -41,9 +41,15 @@
<view class="title_lan">充值记录</view> <view class="title_lan">充值记录</view>
</view> </view>
<view class="wrap-box"> <view class="wrap-box">
<view class="w-box" v-for="(item,index) in numList " :key="index" @click="getindex(index)"> <view class="w-box" v-for="(item,index) in numList " :key="index" @click="getindex(index,item)">
<view class="hezi" :class="{ 'acv' : listindex == index }"> <view class="hezi" :class="{ 'acv' : listindex == index }">
{{item}} {{item.rechargeBalance}}元
</view>
</view>
<view class="w-box" @click="getindex(numList.length,null)">
<view class="hezi" :class="{ 'acv' : listindex == numList.length }">
<!-- 自定义金额 -->
<input placeholder="自定义金额" v-model="value" @input="custom()"></input>
</view> </view>
</view> </view>
</view> </view>
@ -56,7 +62,7 @@
<view class="">微信扫码支付</view> <view class="">微信扫码支付</view>
</view> </view>
<view class="qiu" v-if="memberId != 0" @click="getmemberId(0)"></view> <view class="qiu" v-if="memberId != 0" @click="getmemberId(0,'WECHAT')"></view>
<view class="qiux" v-if="memberId == 0"> <view class="qiux" v-if="memberId == 0">
<u-icon name="checkmark" color="#fff" size="16"></u-icon> <u-icon name="checkmark" color="#fff" size="16"></u-icon>
</view> </view>
@ -69,7 +75,7 @@
<view class="">支付宝扫码支付</view> <view class="">支付宝扫码支付</view>
</view> </view>
<view class="qiu" v-if="memberId != 1" @click="getmemberId(1)"></view> <view class="qiu" v-if="memberId != 1" @click="getmemberId(1,'ALIPAY')"></view>
<view class="qiux" v-if="memberId == 1"> <view class="qiux" v-if="memberId == 1">
<u-icon name="checkmark" color="#fff" size="16"></u-icon> <u-icon name="checkmark" color="#fff" size="16"></u-icon>
</view> </view>
@ -82,7 +88,7 @@
<view class="">银联扫码支付</view> <view class="">银联扫码支付</view>
</view> </view>
<view class="qiu" v-if="memberId != 2" @click="getmemberId(2)"></view> <view class="qiu" v-if="memberId != 2" @click="getmemberId(2,'UNIONPAY')"></view>
<view class="qiux" v-if="memberId == 2"> <view class="qiux" v-if="memberId == 2">
<u-icon name="checkmark" color="#fff" size="16"></u-icon> <u-icon name="checkmark" color="#fff" size="16"></u-icon>
</view> </view>
@ -95,7 +101,7 @@
<view class="">现金支付</view> <view class="">现金支付</view>
</view> </view>
<view class="qiu" v-if="memberId != 3" @click="getmemberId(3)"></view> <view class="qiu" v-if="memberId != 3" @click="getmemberId(3,'CASH')"></view>
<view class="qiux" v-if="memberId == 3"> <view class="qiux" v-if="memberId == 3">
<u-icon name="checkmark" color="#fff" size="16"></u-icon> <u-icon name="checkmark" color="#fff" size="16"></u-icon>
</view> </view>
@ -131,6 +137,12 @@
isChooseUser: false, isChooseUser: false,
userId: "", userId: "",
userInfo: "", userInfo: "",
order: {
paymentType: "WECHAT"
},
value: "",
realyPayBills: 0,
authCode: "",
} }
}, },
onLoad(e) { onLoad(e) {
@ -143,6 +155,7 @@
onShow() { onShow() {
// this.actList = ["1", "1", "1", "1", "1", ] // this.actList = ["1", "1", "1", "1", "1", ]
// this.status = "nomore" 底部刷新结束 // this.status = "nomore" 底部刷新结束
this.getRechargeAmount()
}, },
onPullDownRefresh() { onPullDownRefresh() {
console.log("刷新"); console.log("刷新");
@ -158,9 +171,27 @@
headers headers
}, },
methods: { methods: {
getmemberId(num) { // 自定义金额
custom(val) {
this.order.amount = val
this.realyPayBills = this.order.amount
},
// 获取充值金额列表
getRechargeAmount() {
request({
url: 'business/marketingActivity/cardFuelDiesel',
method: 'get',
params: {
pageNo: 1,
pageSize: 10000
}
}).then((res) => {
this.numList = res.data.records
})
},
getmemberId(num, payType) {
this.memberId = num this.memberId = num
console.log(this.memberId); this.order.paymentType = payType
}, },
// 获取用户信息 // 获取用户信息
getUser() { getUser() {
@ -176,13 +207,64 @@
url: "/pagesHome/searchVip/searchVip?type=1" url: "/pagesHome/searchVip/searchVip?type=1"
}) })
}, },
getindex(index) { getindex(index,data) {
this.listindex = index this.listindex = index
if (data){
this.order.amount = data.rechargeBalance
this.order.rechargeBalance = data.rechargeBalance
this.order.points = data.points
this.realyPayBills = data.rechargeBalance
}
},
// 二维码
scanQrcode() {
if (!this.userInfo) {
uni.showToast({
title: "请先选择会员",
icon: "none"
})
}
if (!this.order.amount){
uni.showToast({
title:"请先选择充值金额",
icon:"none"
})
}
let _this = this
uni.scanCode({
onlyFromCamera: true,
success: (res) => {
console.log('扫描二维码成功,结果:' + JSON.stringify(res) + res.result);
_this.authCode = res.result
_this.govipjs()
},
error: (res) => {
console.log('扫描二维码出现错误')
}
})
}, },
govipjs() { govipjs() {
// uni.navigateTo({ let actualPayment = 0
// url: '/pagesHome/MemberRecharge/list' if (this.order.paymentType == "CASH") actualPayment = this.authCode
// }) // 会员id 会员名字会员手机号码
this.order.mtUserId = this.userInfo.id
this.order.name = this.userInfo.name
this.order.mobile = this.userInfo.mobile
// 支付码
this.order.authCode = this.authCode
this.order.realyPayBills = this.realyPayBills
this.order.actualPayment = actualPayment
request({
url: 'business/marketingActivity/cardFuelRecord/prepaidFuelTopUp',
method: 'post',
data:this.order
}).then((res) => {
// uni.navigateTo({
// url: '/pagesHome/PaymentResults/PaymentResults'
// })
})
}, },
goback() { goback() {
uni.navigateBack() uni.navigateBack()

26
pos-uni/pagesHome/orderList/orderList.vue
View File

@ -22,18 +22,15 @@
<view class="zt-size" v-if="item.orderStatus == 'unpaid'">未支付</view> <view class="zt-size" v-if="item.orderStatus == 'unpaid'">未支付</view>
</view> </view>
<view class="centne"> <view class="centne">
<view class="touxiang">
<!-- <u-avatar :src="src"></u-avatar> -->
<image class="touxiang" :src="baseUrl+item.avatar"></image>
</view>
<view class="right-centne"> <view class="right-centne">
<view class="h_">订单号:{{item.orderNo}}</view> <view class="h_"> <text class="hao_">订单号:</text> <text>{{item.orderNo}}</text>
<view class="h_">油号:{{item.oilName}}</view> </view>
<view class="h_">升数:{{item.shengshu}}L</view> <view class="h_"><text class="hao_">油号:</text>{{item.oilName}}</view>
<view class="h_">下单时间:{{item.payTime}}</view> <view class="h_"><text class="hao_">升数:</text>{{item.shengshu}}L</view>
<view class="h_"><text class="hao_">下单时间:</text>{{item.payTime}}</view>
<view class="b-bx"> <view class="b-bx">
<view class="">应付:￥{{item.goodsMoney}}</view> <view class=""> <text class="hao_">应付:</text>￥{{item.goodsMoney}}</view>
<view class="">优惠:￥0.00</view> <view class=""><text class="hao_">优惠:</text>￥0.00</view>
</view> </view>
</view> </view>
</view> </view>
@ -347,11 +344,12 @@
} }
.right-centne { .right-centne {
width: 70%; width: 100%;
font-size: 14px; font-size: 14px;
} }
.h_ { .h_ {
width: 100%;
margin-bottom: 5px; margin-bottom: 5px;
} }
@ -414,4 +412,10 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.hao_ {
width: 30%;
font-weight: bold;
margin-right: 5px;
}
</style> </style>