10.18
This commit is contained in:
parent
48e0da0a92
commit
900b460852
@ -525,8 +525,8 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
|
||||
if (ObjectUtils.isEmpty(selectCard.getChooseStaff()) || selectCard.getChooseStaff() == 0) {
|
||||
cardValueRecordDTO.setMtStaffId(nowAccountInfo.getStaffId());
|
||||
cardValueRecordDTO.setRealName(nowAccountInfo.getRealName());
|
||||
LJUserVo ljUserVo1 = ljUserMapper.selectUserById(nowAccountInfo.getId());
|
||||
cardValueRecordDTO.setStaffMobile(ljUserVo1.getMobile());
|
||||
LJStaff staff = mtStaffService.getById(nowAccountInfo.getStaffId());
|
||||
cardValueRecordDTO.setStaffMobile(staff.getMobile());
|
||||
}else {
|
||||
LJStaff staff = mtStaffService.getById(selectCard.getChooseStaff());
|
||||
cardValueRecordDTO.setRealName(staff.getRealName());
|
||||
@ -575,8 +575,8 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
|
||||
if (ObjectUtils.isEmpty(selectCard.getChooseStaff()) || selectCard.getChooseStaff() == 0) {
|
||||
cardFuelRecordDTO.setMtStaffId(nowAccountInfo.getStaffId());
|
||||
cardFuelRecordDTO.setRealName(nowAccountInfo.getRealName());
|
||||
LJUserVo ljUserVo1 = ljUserMapper.selectUserById(nowAccountInfo.getId());
|
||||
cardFuelRecordDTO.setStaffMobile(ljUserVo1.getMobile());
|
||||
LJStaff staff = mtStaffService.getById(nowAccountInfo.getStaffId());
|
||||
cardFuelRecordDTO.setStaffMobile(staff.getMobile());
|
||||
}else {
|
||||
LJStaff staff = mtStaffService.getById(selectCard.getChooseStaff());
|
||||
cardFuelRecordDTO.setRealName(staff.getRealName());
|
||||
|
||||
@ -16,10 +16,15 @@
|
||||
trigger="hover">
|
||||
<div> 储值卡：￥{{ chooseVipUser.cardBalance || 0 }}</div>
|
||||
<div v-if="chooseVipUser.userFuels">
|
||||
<div v-for="(item,index) in chooseVipUser.userFuels" :key="index"> 囤油卡：￥{{ item.fuelAmount }}</div>
|
||||
<div v-for="(item,index) in chooseVipUser.userFuels" :key="index"> 囤油卡：￥{{
|
||||
item.fuelAmount
|
||||
}}
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="chooseVipUser.fleetInfoUniVos">
|
||||
<div v-for="(item,index) in chooseVipUser.fleetInfoUniVos" :key="index"> 车队卡：￥{{ item.totalBalance }}</div>
|
||||
<div v-for="(item,index) in chooseVipUser.fleetInfoUniVos" :key="index">
|
||||
车队卡：￥{{ item.totalBalance }}
|
||||
</div>
|
||||
</div>
|
||||
<img slot="reference" src="./imgs/kbao.png" style="width: 24px;height: 24px;margin-right: 10px">
|
||||
|
||||
@ -1141,17 +1146,21 @@ export default {
|
||||
},
|
||||
// 打印商品支付后的订单
|
||||
oilOrderReport() {
|
||||
console.log(this.goodsOrder,this.goodsList,1095)
|
||||
//现在油品只有一个了
|
||||
let oilOrderR = [
|
||||
{
|
||||
oilName: this.oilGunClearing.name,
|
||||
amount: this.oilGunClearing.amount + '',
|
||||
}
|
||||
]
|
||||
let oilOrderR = []
|
||||
if (this.oilGunClearing && this.oilGunClearing.amount>0){
|
||||
oilOrderR = [
|
||||
{
|
||||
oilName: this.oilGunClearing.oilType + this.oilGunClearing.oilName,
|
||||
amount: this.oilGunClearing.amount + '',
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
let goodsOrderR = []
|
||||
if (this.goodsOrder && this.goodsOrder.length > 0) {
|
||||
this.goodsOrder.forEach(order => {
|
||||
if (this.goodsList && this.goodsList.length > 0) {
|
||||
this.goodsList.forEach(order => {
|
||||
let o = {
|
||||
oilName: order.name,
|
||||
unit: order.num + order.unit,
|
||||
@ -1168,9 +1177,10 @@ export default {
|
||||
'WECHAT': '微信',
|
||||
'ALIPAY': '支付宝',
|
||||
'UNIONPAY': '银联二维码',
|
||||
'credit': '挂账',
|
||||
'oilCard': '囤油卡',
|
||||
'balance': '储值卡'
|
||||
'after_pay': '挂账',
|
||||
'fule_card': '囤油卡',
|
||||
'card_value': '储值卡',
|
||||
'car_card_value': '车队卡',
|
||||
};
|
||||
let payTypeText = payTypeMap[this.payType] || '小程序码';
|
||||
|
||||
@ -1181,26 +1191,28 @@ export default {
|
||||
unitName: "", // 挂账单位
|
||||
|
||||
// consumeAmount:this.consumeAmount,
|
||||
creditAmount: (this.oilAmount + (+this.goodsAmount)).toFixed(2),//挂账金额
|
||||
creditAmount: this.realAmount,//挂账金额
|
||||
// 优惠合计
|
||||
discount: (this.oilDiscount + this.goodsDiscount + this.fullReduction + this.couponAmount).toFixed(2), // 油惠合计
|
||||
discount: this.disTotal, // 油惠合计
|
||||
// 储值卡付款
|
||||
consumeAmount: this.consumeAmount,
|
||||
consumeAmount: this.realAmount,
|
||||
// 屯油卡付款
|
||||
consumeRefuelMoney: this.consumeRefuelMoney ? this.consumeRefuelMoney.toFixed(2) : 0,
|
||||
consumeRefuelMoney: this.realAmount,
|
||||
// 实付款
|
||||
actualPay: ((+this.oilActualPay) + (+this.goodsActualPay)).toFixed(2),
|
||||
actualPay: this.realAmount,
|
||||
// 找零
|
||||
seekZero: this.seekZero ? this.seekZero.toFixed(2) : 0,
|
||||
}
|
||||
if (this.form1 && this.form1.unitName) f.unitName = this.form1.unitName
|
||||
if (this.credit && this.credit.unitName) f.unitName = this.credit.unitName
|
||||
printOilOrderReport(f).then(res => {
|
||||
console.log(res, 1121)
|
||||
})
|
||||
},
|
||||
//表单重置
|
||||
resetting1() {
|
||||
|
||||
this.realAmount = 0.00
|
||||
//优惠合计金额
|
||||
this.disTotal = 0.00
|
||||
//请输入手机号输入框重置
|
||||
this.userMobile = null
|
||||
//油枪重置
|
||||
@ -1211,6 +1223,8 @@ export default {
|
||||
this.userInfo = false
|
||||
//支付方式 默认 支付宝
|
||||
this.payType = "ALIPAY"
|
||||
|
||||
this.loading = false;
|
||||
},
|
||||
// 查询订单支付状态
|
||||
queryPayStatus() {
|
||||
@ -1393,8 +1407,8 @@ export default {
|
||||
// 油罐id
|
||||
// 活动id
|
||||
// 活动类型
|
||||
|
||||
if (this.oilGunClearing) {
|
||||
console.log(this.oilGunClearing)
|
||||
if (this.oilGunClearing && this.oilGunClearing.amount>0) {
|
||||
this.payForm.oilOrder = JSON.stringify({
|
||||
oilPrice: this.oilGunClearing.oilPrice,
|
||||
oils: this.oilGunClearing.oilNameId,
|
||||
@ -1993,8 +2007,8 @@ export default {
|
||||
}
|
||||
this.accountPending = true
|
||||
}
|
||||
if (value == 'car_card_value'){
|
||||
if (!this.userInfo){
|
||||
if (value == 'car_card_value') {
|
||||
if (!this.userInfo) {
|
||||
this.$message.error("请先选择会员")
|
||||
return
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user