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

bug

Browse Source
This commit is contained in:
cun-nan 2024-03-16 13:40:36 +08:00
parent b49b8c72f0
commit e2c8850da2
12 changed files with 219 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuintAdmin/src/main.js
View File

@ -50,7 +50,8 @@ Vue.prototype.getName = getName
Vue.prototype.download = download Vue.prototype.download = download
Vue.prototype.handleTree = handleTree Vue.prototype.handleTree = handleTree
Vue.prototype.imgurl = 'http://192.168.0.138:8008' Vue.prototype.imgurl = 'http://192.168.0.138:8008'
Vue.prototype.pcUrl = 'http://192.168.0.178:83/' // Vue.prototype.pcUrl = 'http://192.168.0.178:83/'
Vue.prototype.pcUrl = 'https://cashier.youkerr.com/'
// 全局组件挂载 // 全局组件挂载
Vue.component('DictTag', DictTag) Vue.component('DictTag', DictTag)

10
fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
View File

@ -734,9 +734,10 @@
validityOne: null, validityOne: null,
validityTwo:null, validityTwo:null,
validity:row.validity, validity:row.validity,
giftCardDetail: row.useInstructions , //券详情 giftCardDetail: row.cardDetail , //券详情
giftCardTime: row.validity, //券有效期 giftCardTime: row.validity, //券有效期
giftCardTotal: 1 //券数量 giftCardTotal: 1, //券数量
instruction: row.useInstructions, //使用说明
} }
this.duihuanquanlist.push(data) this.duihuanquanlist.push(data)
this.$message.success("新增成功") this.$message.success("新增成功")
@ -762,9 +763,10 @@
validityZero: row.validityZero, validityZero: row.validityZero,
validityOne: row.validityOne, validityOne: row.validityOne,
validityTwo:row.validityTwo, validityTwo:row.validityTwo,
giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情 giftCardDetail:row.cardDetail , //券详情
giftCardTime: "", //券有效期 giftCardTime: "", //券有效期
giftCardTotal: 1//券数量 giftCardTotal: 1,//券数量
instruction: row.instruction,//使用说明
} }
this.youhuiquanlist.push(data) this.youhuiquanlist.push(data)
this.$message.success("新增成功") this.$message.success("新增成功")

2
fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
View File

@ -1017,7 +1017,7 @@ export default {
validityZero: row.validityZero, validityZero: row.validityZero,
validityOne: row.validityOne, validityOne: row.validityOne,
validityTwo:row.validityTwo, validityTwo:row.validityTwo,
giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情 giftCardDetail: row.cardDetail, //券详情
giftCardTime: "", //券有效期 giftCardTime: "", //券有效期
giftCardTotal: 1,//券数量 giftCardTotal: 1,//券数量
instruction: row.instruction,//使用说明 instruction: row.instruction,//使用说明

2
fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
View File

@ -816,7 +816,7 @@ export default {
validityZero: row.validityZero, validityZero: row.validityZero,
validityOne: row.validityOne, validityOne: row.validityOne,
validityTwo:row.validityTwo, validityTwo:row.validityTwo,
giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情 giftCardDetail: row.cardDetail , //券详情
giftCardTime: "", //券有效期 giftCardTime: "", //券有效期
giftCardTotal: 1,//券数量 giftCardTotal: 1,//券数量
instruction: row.instruction,//使用说明 instruction: row.instruction,//使用说明

4
fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
View File

@ -985,7 +985,7 @@ export default {
validityZero: row.validityZero, validityZero: row.validityZero,
validityOne: row.validityOne, validityOne: row.validityOne,
validityTwo:row.validityTwo, validityTwo:row.validityTwo,
giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情 giftCardDetail:row.cardDetail , //券详情
giftCardTime: "", //券有效期 giftCardTime: "", //券有效期
giftCardTotal: 1,//券数量 giftCardTotal: 1,//券数量
instruction: row.instruction,//使用说明 instruction: row.instruction,//使用说明
@ -1015,7 +1015,7 @@ export default {
validityZero: row.validityZero, validityZero: row.validityZero,
validityOne: row.validityOne, validityOne: row.validityOne,
validityTwo:row.validityTwo, validityTwo:row.validityTwo,
giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情 giftCardDetail: row.cardDetail , //券详情
giftCardTime: "", //券有效期 giftCardTime: "", //券有效期
giftCardTotal: 1,//券数量 giftCardTotal: 1,//券数量
instruction: row.instruction,//使用说明 instruction: row.instruction,//使用说明

4
fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue
View File

@ -806,7 +806,7 @@ export default {
validityOne: null, validityOne: null,
validityTwo:null, validityTwo:null,
validity:row.validity, validity:row.validity,
cardDetail: row.useInstructions , //券详情 cardDetail: row.cardDetail , //券详情
giftCardTime: row.validity, //券有效期 giftCardTime: row.validity, //券有效期
giftCardTotal: 1 //券数量 giftCardTotal: 1 //券数量
} }
@ -835,7 +835,7 @@ export default {
validityZero: row.validityZero, validityZero: row.validityZero,
validityOne: row.validityOne, validityOne: row.validityOne,
validityTwo:row.validityTwo, validityTwo:row.validityTwo,
cardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情 cardDetail: row.cardDetail , //券详情
giftCardTime: "", //券有效期 giftCardTime: "", //券有效期
giftCardTotal: 1//券数量 giftCardTotal: 1//券数量
} }

2
fuintAdmin/src/views/userGrade/index.vue
View File

@ -978,7 +978,7 @@ export default {
validityZero: row.validityZero, validityZero: row.validityZero,
validityOne: row.validityOne, validityOne: row.validityOne,
validityTwo:row.validityTwo, validityTwo:row.validityTwo,
giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情 giftCardDetail: row.cardDetail , //券详情
giftCardTime: "", //券有效期 giftCardTime: "", //券有效期
giftCardTotal: 1,//券数量 giftCardTotal: 1,//券数量
instruction: row.instruction,//使用说明 instruction: row.instruction,//使用说明

3
fuintAdmin_zt/src/main.js
View File

@ -49,7 +49,8 @@ Vue.prototype.download = download
Vue.prototype.handleTree = handleTree Vue.prototype.handleTree = handleTree
// Vue.prototype.pcUrl = 'http://192.168.0.121:82/' // Vue.prototype.pcUrl = 'http://192.168.0.121:82/'
// Vue.prototype.pcUrl = 'http://192.168.31.96:82/' // Vue.prototype.pcUrl = 'http://192.168.31.96:82/'
Vue.prototype.pcUrl = 'http://47.95.206.185:85/' // Vue.prototype.pcUrl = 'http://47.95.206.185:85/'
Vue.prototype.pcUrl = 'https://www.youkerr.com/'
// 全局组件挂载 // 全局组件挂载
Vue.component('DictTag', DictTag) Vue.component('DictTag', DictTag)

6
fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
View File

@ -188,7 +188,7 @@ public class FyPayServiceImpl implements FyPayService {
oilOrder.setOrderStatus("paid"); oilOrder.setOrderStatus("paid");
oilOrder.setPayTime(date); oilOrder.setPayTime(date);
oilOrderService.updateCardAndActiveById(oilOrder.getStoreId(),oilOrder.getUserId(),oilOrder.getActiveId(),oilOrder.getCouponId(),oilOrder.getActiveType(),oilOrder.getOrderAmount(),oilOrder.getPayAmount(), Integer.valueOf(oilOrder.getOils())); oilOrderService.updateCardAndActiveById(oilOrder.getStoreId(),oilOrder.getUserId(),oilOrder.getActiveId(),oilOrder.getCouponId(),oilOrder.getActiveType(),oilOrder.getOrderAmount(),oilOrder.getPayAmount(), Integer.valueOf(oilOrder.getOils()));
staffCommissionService.countStaffCommission(oilOrder.getStaffId(),oilOrder.getStoreId(),oilOrder.getOrderAmount(),oilOrder.getPayAmount(),"1",orderNo); if (ObjectUtil.isNotEmpty(oilOrder.getStaffId())) staffCommissionService.countStaffCommission(oilOrder.getStaffId(),oilOrder.getStoreId(),oilOrder.getOrderAmount(),oilOrder.getPayAmount(),"1",orderNo);
// 修改油罐容量 // 修改油罐容量
List<JSONObject> jsonObjects = JSONArray.parseArray(map1.get("oilOrder"), JSONObject.class); List<JSONObject> jsonObjects = JSONArray.parseArray(map1.get("oilOrder"), JSONObject.class);
if (jsonObjects.size()<=1) { if (jsonObjects.size()<=1) {
@ -216,7 +216,7 @@ public class FyPayServiceImpl implements FyPayService {
if (goodsOrder.getUserId()!=null){ if (goodsOrder.getUserId()!=null){
isMember = true; isMember = true;
} }
staffCommissionService.countStaffCommission(goodsOrder.getStaffId(),goodsOrder.getStoreId(),goodsOrder.getAmount(),goodsOrder.getPayAmount(),"2",orderNo); if (ObjectUtil.isNotEmpty(goodsOrder.getStaffId())) staffCommissionService.countStaffCommission(goodsOrder.getStaffId(),goodsOrder.getStoreId(),goodsOrder.getAmount(),goodsOrder.getPayAmount(),"2",orderNo);
if (!map1.get("goodsOrder").equals("[]")){ if (!map1.get("goodsOrder").equals("[]")){
List<JSONObject> goods = JSONArray.parseArray(map1.get("goodsOrder"), JSONObject.class); List<JSONObject> goods = JSONArray.parseArray(map1.get("goodsOrder"), JSONObject.class);
OrderGoods orderGoods = new OrderGoods(); OrderGoods orderGoods = new OrderGoods();
@ -253,7 +253,7 @@ public class FyPayServiceImpl implements FyPayService {
} }
for (OilOrder order : list) { for (OilOrder order : list) {
if (order.getOrderType().equals("主订单")){ if (order.getOrderType().equals("主订单")){
staffCommissionService.countStaffCommission(order.getStaffId(),order.getStoreId(),order.getOrderAmount(),order.getPayAmount(),"1",orderNo); if (ObjectUtil.isNotEmpty(order.getStaffId()))staffCommissionService.countStaffCommission(order.getStaffId(),order.getStoreId(),order.getOrderAmount(),order.getPayAmount(),"1",orderNo);
} }
// 添加多个油品订单 // 添加多个油品订单
order.setOrderStatus("paid"); order.setOrderStatus("paid");

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/StaffCommissionServiceImpl.java
View File

@ -116,6 +116,7 @@ public class StaffCommissionServiceImpl extends ServiceImpl<StaffCommissionMappe
@Override @Override
public void countStaffCommission(Integer staffId,Integer storeId,Double amount,Double payAmount,String type,String orderNo) { public void countStaffCommission(Integer staffId,Integer storeId,Double amount,Double payAmount,String type,String orderNo) {
if (ObjectUtil.isNotEmpty(staffId)) {
LJStaff staff = staffService.selectStaffById(staffId); LJStaff staff = staffService.selectStaffById(staffId);
QueryWrapper queryWrapper = new QueryWrapper<>(); QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("store_id", storeId); queryWrapper.eq("store_id", storeId);
@ -287,3 +288,4 @@ public class StaffCommissionServiceImpl extends ServiceImpl<StaffCommissionMappe
} }
} }
} }
}

37
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
View File

@ -462,7 +462,11 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
order.setPayTime(new Date()); order.setPayTime(new Date());
order.setOrderStatus("paid"); order.setOrderStatus("paid");
} }
if (ObjectUtil.isNotEmpty(this.selectOilOrderByOrderNo(orderNo))){
baseMapper.updateById(order);
}else {
baseMapper.insert(order); baseMapper.insert(order);
}
oilOrder1 = this.selectOilOrderByOrderNo(orderNo); oilOrder1 = this.selectOilOrderByOrderNo(orderNo);
} }
} }
@ -669,6 +673,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
order.setStoreId(accountInfo.getStoreId()); order.setStoreId(accountInfo.getStoreId());
order.setUserId(userId); order.setUserId(userId);
order.setCommissionAmount(Double.valueOf(map.get("commissionAmount"))); order.setCommissionAmount(Double.valueOf(map.get("commissionAmount")));
if (ObjectUtil.isNotEmpty(map.get("staffId")))
order.setStaffId(Integer.valueOf(map.get("staffId"))); order.setStaffId(Integer.valueOf(map.get("staffId")));
order.setTerminal(map.get("terminal")); order.setTerminal(map.get("terminal"));
order.setOils((String) oilOrders.get(i).get("oilName")); order.setOils((String) oilOrders.get(i).get("oilName"));
@ -682,7 +687,11 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
order.setPayTime(new Date()); order.setPayTime(new Date());
this.addOilTrack(oilOrders.get(i), accountInfo.getStoreId()); this.addOilTrack(oilOrders.get(i), accountInfo.getStoreId());
if (ObjectUtil.isNotEmpty(this.selectOilOrderByOrderNo(orderNo))){
baseMapper.updateById(order);
}else {
baseMapper.insert(order); baseMapper.insert(order);
}
oilOrder = this.selectOilOrderByOrderNo(orderNo); oilOrder = this.selectOilOrderByOrderNo(orderNo);
this.updateGrowthValue1(oilAmount,0.0, userId, Integer.valueOf(oilOrder.getOils()), refuelMoneyLiters - Double.valueOf(oilOrders.get(i).get("liters").toString()), storeId,orderNo); this.updateGrowthValue1(oilAmount,0.0, userId, Integer.valueOf(oilOrder.getOils()), refuelMoneyLiters - Double.valueOf(oilOrders.get(i).get("liters").toString()), storeId,orderNo);
@ -706,6 +715,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
order.setStoreId(accountInfo.getStoreId()); order.setStoreId(accountInfo.getStoreId());
order.setUserId(userId); order.setUserId(userId);
order.setCommissionAmount(Double.valueOf(map.get("commissionAmount"))); order.setCommissionAmount(Double.valueOf(map.get("commissionAmount")));
if (ObjectUtil.isNotEmpty(map.get("staffId")))
order.setStaffId(Integer.valueOf(map.get("staffId"))); order.setStaffId(Integer.valueOf(map.get("staffId")));
order.setTerminal(map.get("terminal")); order.setTerminal(map.get("terminal"));
order.setOils((String) oilOrders.get(i).get("oilName")); order.setOils((String) oilOrders.get(i).get("oilName"));
@ -719,7 +729,11 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
order.setPayTime(new Date()); order.setPayTime(new Date());
this.addOilTrack(oilOrders.get(i), accountInfo.getStoreId()); this.addOilTrack(oilOrders.get(i), accountInfo.getStoreId());
if (ObjectUtil.isNotEmpty(this.selectOilOrderByOrderNo(orderNo))){
baseMapper.updateById(order);
}else {
baseMapper.insert(order); baseMapper.insert(order);
}
oilOrder = this.selectOilOrderByOrderNo(orderNo); oilOrder = this.selectOilOrderByOrderNo(orderNo);
this.updateGrowthValue1(oilAmount,(Double.valueOf(oilOrders.get(i).get("liters").toString())-refuelMoneyLiters)*oilPrice, userId, Integer.valueOf(oilOrder.getOils()), 0.0, storeId,orderNo); this.updateGrowthValue1(oilAmount,(Double.valueOf(oilOrders.get(i).get("liters").toString())-refuelMoneyLiters)*oilPrice, userId, Integer.valueOf(oilOrder.getOils()), 0.0, storeId,orderNo);
@ -743,6 +757,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
order.setStoreId(accountInfo.getStoreId()); order.setStoreId(accountInfo.getStoreId());
order.setUserId(userId); order.setUserId(userId);
order.setCommissionAmount(Double.valueOf(map.get("commissionAmount"))); order.setCommissionAmount(Double.valueOf(map.get("commissionAmount")));
if (ObjectUtil.isNotEmpty(map.get("staffId")))
order.setStaffId(Integer.valueOf(map.get("staffId"))); order.setStaffId(Integer.valueOf(map.get("staffId")));
order.setTerminal(map.get("terminal")); order.setTerminal(map.get("terminal"));
order.setOils((String) oilOrders.get(i).get("oilName")); order.setOils((String) oilOrders.get(i).get("oilName"));
@ -756,7 +771,11 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
order.setPayTime(new Date()); order.setPayTime(new Date());
this.addOilTrack(oilOrders.get(i), accountInfo.getStoreId()); this.addOilTrack(oilOrders.get(i), accountInfo.getStoreId());
if (ObjectUtil.isNotEmpty(this.selectOilOrderByOrderNo(orderNo))){
baseMapper.updateById(order);
}else {
baseMapper.insert(order); baseMapper.insert(order);
}
oilOrder = this.selectOilOrderByOrderNo(orderNo); oilOrder = this.selectOilOrderByOrderNo(orderNo);
this.updateGrowthValue1(oilAmount,oilAmount,userId, Integer.valueOf(oilOrder.getOils()),0.0,storeId,orderNo); this.updateGrowthValue1(oilAmount,oilAmount,userId, Integer.valueOf(oilOrder.getOils()),0.0,storeId,orderNo);
@ -785,6 +804,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
order.setStoreId(accountInfo.getStoreId()); order.setStoreId(accountInfo.getStoreId());
order.setUserId(userId); order.setUserId(userId);
order.setCommissionAmount(Double.valueOf(map.get("commissionAmount"))); order.setCommissionAmount(Double.valueOf(map.get("commissionAmount")));
if (ObjectUtil.isNotEmpty(map.get("staffId")))
order.setStaffId(Integer.valueOf(map.get("staffId"))); order.setStaffId(Integer.valueOf(map.get("staffId")));
order.setTerminal(map.get("terminal")); order.setTerminal(map.get("terminal"));
order.setOils((String) oilOrders.get(i).get("oilName")); order.setOils((String) oilOrders.get(i).get("oilName"));
@ -798,7 +818,12 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
order.setPayTime(new Date()); order.setPayTime(new Date());
this.addOilTrack(oilOrders.get(i), accountInfo.getStoreId()); this.addOilTrack(oilOrders.get(i), accountInfo.getStoreId());
if (ObjectUtil.isNotEmpty(this.selectOilOrderByOrderNo(orderNo))){
baseMapper.updateById(order);
}else {
baseMapper.insert(order); baseMapper.insert(order);
}
oilOrder = this.selectOilOrderByOrderNo(orderNo); oilOrder = this.selectOilOrderByOrderNo(orderNo);
this.updateGrowthValue1(oilAmount,oilAmount,userId, Integer.valueOf(oilOrder.getOils()),0.0,storeId,orderNo); this.updateGrowthValue1(oilAmount,oilAmount,userId, Integer.valueOf(oilOrder.getOils()),0.0,storeId,orderNo);
@ -807,6 +832,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
if (flag){ if (flag){
if (ObjectUtil.isNotEmpty(map.get("staffId")))
cashierOrder.setStaffId(Integer.valueOf(map.get("staffId"))); cashierOrder.setStaffId(Integer.valueOf(map.get("staffId")));
cashierOrder.setStoreId(accountInfo.getStoreId()); cashierOrder.setStoreId(accountInfo.getStoreId());
cashierOrder.setPayUser(userVo1.getMobile()); cashierOrder.setPayUser(userVo1.getMobile());
@ -853,6 +879,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
order.setStoreId(accountInfo.getStoreId()); order.setStoreId(accountInfo.getStoreId());
order.setUserId(userId); order.setUserId(userId);
order.setCommissionAmount(Double.valueOf(map.get("commissionAmount"))); order.setCommissionAmount(Double.valueOf(map.get("commissionAmount")));
if (ObjectUtil.isNotEmpty(map.get("staffId")))
order.setStaffId(Integer.valueOf(map.get("staffId"))); order.setStaffId(Integer.valueOf(map.get("staffId")));
order.setTerminal(map.get("terminal")); order.setTerminal(map.get("terminal"));
order.setOils((String) oilOrders.get(i).get("oilName")); order.setOils((String) oilOrders.get(i).get("oilName"));
@ -866,12 +893,17 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
order.setPayTime(new Date()); order.setPayTime(new Date());
this.addOilTrack(oilOrders.get(i), accountInfo.getStoreId()); this.addOilTrack(oilOrders.get(i), accountInfo.getStoreId());
if (ObjectUtil.isNotEmpty(this.selectOilOrderByOrderNo(orderNo))){
baseMapper.updateById(order);
}else {
baseMapper.insert(order); baseMapper.insert(order);
} }
}
OilOrder oilOrder = this.selectOilOrderByOrderNo(orderNo); OilOrder oilOrder = this.selectOilOrderByOrderNo(orderNo);
// 添加收银台订单信息 // 添加收银台订单信息
CashierOrder cashierOrder = new CashierOrder(); CashierOrder cashierOrder = new CashierOrder();
if (ObjectUtil.isNotEmpty(map.get("staffId")))
cashierOrder.setStaffId(Integer.valueOf(map.get("staffId"))); cashierOrder.setStaffId(Integer.valueOf(map.get("staffId")));
cashierOrder.setStoreId(accountInfo.getStoreId()); cashierOrder.setStoreId(accountInfo.getStoreId());
cashierOrder.setPayUser(userVo1.getMobile()); cashierOrder.setPayUser(userVo1.getMobile());
@ -1052,7 +1084,12 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
LJUserVo userVo = userService.selectUserById(oilOrder.getUserId(),oilOrder.getStoreId()); LJUserVo userVo = userService.selectUserById(oilOrder.getUserId(),oilOrder.getStoreId());
oilOrder.setPayUser(userVo.getMobile()); oilOrder.setPayUser(userVo.getMobile());
// baseMapper.insert(oilOrder);
if (ObjectUtil.isNotEmpty(this.selectOilOrderByOrderNo(orderNo))){
baseMapper.updateById(oilOrder);
}else {
baseMapper.insert(oilOrder); baseMapper.insert(oilOrder);
}
return orderNo; return orderNo;
} }

48
fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
View File

@ -134,7 +134,7 @@
余额：{{ item.refuelMoney ? item.refuelMoney : 0.00 }}L） 余额：{{ item.refuelMoney ? item.refuelMoney : 0.00 }}L）
</div> </div>
</div> </div>
<div>- {{ consumeRefuelMoney.toFixed(2) }}L</div> <div>- {{ consumeRefuelMoney }}L</div>
</div> </div>
<div class="center-left-hj" v-show="isMember"> <div class="center-left-hj" v-show="isMember">
<div> <div>
@ -144,7 +144,7 @@
储值卡 储值卡
<span>（账户余额：{{ balance }}元）</span> <span>（账户余额：{{ balance }}元）</span>
</div> </div>
<div>-￥{{ consumeAmount.toFixed(2) }}</div> <div>-￥{{ consumeAmount }}</div>
</div> </div>
<div class="center-left-hj" v-show="isMember && couponDiscount.length>0"> <div class="center-left-hj" v-show="isMember && couponDiscount.length>0">
<div> <div>
@ -1145,7 +1145,7 @@
</div> </div>
<div class="input-box" v-if="isMember && consumeAmount>0"> <div class="input-box" v-if="isMember && consumeAmount>0">
<div>储值卡付款</div> <div>储值卡付款</div>
<div>￥{{ consumeAmount.toFixed(2) }}</div> <div>￥{{ consumeAmount }}</div>
</div> </div>
<div class="input-box" v-if="isMember && consumeRefuelMoney>0"> <div class="input-box" v-if="isMember && consumeRefuelMoney>0">
<div>囤油卡付款</div> <div>囤油卡付款</div>
@ -3320,7 +3320,7 @@
this.checkAll4 = true this.checkAll4 = true
if (this.balance!=0 && this.balance >= this.hoardAmount){ if (this.balance!=0 && this.balance >= this.hoardAmount){
this.oilActualPay = 0 this.oilActualPay = 0
this.consumeAmount = 0 this.consumeAmount = this.hoardAmount
}else { }else {
this.oilActualPay = (this.hoardAmount - this.balance).toFixed(2) this.oilActualPay = (this.hoardAmount - this.balance).toFixed(2)
this.consumeAmount = this.balance this.consumeAmount = this.balance
@ -3345,6 +3345,9 @@
this.oilActualPay = this.oilAmount - this.oilDiscount - this.couponAmount - this.fullReduction - this.balance this.oilActualPay = this.oilAmount - this.oilDiscount - this.couponAmount - this.fullReduction - this.balance
this.consumeAmount = this.balance this.consumeAmount = this.balance
} }
}else {
this.oilActualPay = this.oilAmount - this.oilDiscount - this.couponAmount - this.fullReduction
this.consumeAmount = 0
} }
}else { }else {
this.oilActualPay = this.oilAmount.toFixed(2) this.oilActualPay = this.oilAmount.toFixed(2)
@ -3702,6 +3705,8 @@
_this.oilAmount = 0; _this.oilAmount = 0;
_this.refuelMoney1 = [] _this.refuelMoney1 = []
let hoardAmount1 = 0; let hoardAmount1 = 0;
let index = 0
let lastMoney=0;;
_this.oilOrder.forEach(item => { _this.oilOrder.forEach(item => {
let conRefMon = 0; let conRefMon = 0;
let hoardAmount = 0; let hoardAmount = 0;
@ -3709,39 +3714,40 @@
let amount1 = 0; let amount1 = 0;
let id = "" let id = ""
if (_this.refuelMoney){ if (_this.refuelMoney){
let innerFlag = 0;
for (let i = 0;i < _this.refuelMoney.length;i++){ for (let i = 0;i < _this.refuelMoney.length;i++){
// 囤油卡升数变化 // 囤油卡升数变化
if (_this.refuelMoney[i].oilType==item.oilName && _this.refuelMoney[i].refuelMoney>0){ if (_this.refuelMoney[i].oilType==item.oilName && _this.refuelMoney[i].refuelMoney>0&&_this.consumeRefuelMoney<_this.refuelMoney[i].refuelMoney){
_this.refuelMoney1.push(item) _this.refuelMoney1.push(item)
id = item.id id = item.id
_this.isOilStorageCard = true _this.isOilStorageCard = true
console.log(_this.refuelMoney[i].refuelMoney , item.liters,1547) console.log(_this.refuelMoney[i].refuelMoney , item.liters,1547)
if (+_this.refuelMoney[i].refuelMoney >= +item.liters){ if(item.liters<=_this.refuelMoney[i].refuelMoney- _this.consumeRefuelMoney){
conRefMon= item.liters conRefMon= item.liters
}else { }else {
conRefMon = _this.refuelMoney[i].refuelMoney conRefMon = _this.refuelMoney[i].refuelMoney - _this.consumeRefuelMoney
// 扣除升数后需要消费的金额 //剩余油需要换算钱
hoardAmount = item.amount - (_this.refuelMoney[i].refuelMoney * item.oilPrice).toFixed(2) let lastOil = item.liters - conRefMon
hoardAmount = lastOil * item.oilPrice
}
lastMoney += +hoardAmount
innerFlag =1;
} }
} }
if (_this.refuelMoney[i].oilType!=item.oilName){ if(innerFlag ==0){
amount = item.amount lastMoney += +item.amount
}
} }
}else {
lastMoney += +item.amount
} }
_this.consumeRefuelMoney += +conRefMon _this.consumeRefuelMoney += +conRefMon
console.log(hoardAmount,1254) console.log(hoardAmount,1254)
hoardAmount1 += +hoardAmount _this.hoardAmount = +lastMoney.toFixed(2)
amount1 += +amount
_this.hoardAmount = hoardAmount1
_this.oilAmount += +item.amount _this.oilAmount += +item.amount
// _this.changeBalance(_this.hoardAmount,id)
// if (_this.consumeRefuelMoney!=0){
// _this.isOilStorageCard = true;
// _this.checkAll3 = true;
// _this.consumeAmount = 0;
// }
}) })
_this.isDefaultUseCard(); _this.isDefaultUseCard();
}, },
changeBalance(hoardAmount,id){ changeBalance(hoardAmount,id){