- 新增子卡
+ 新增子卡
会员信息：{{ form.mobile }}
- 会员信息：{{form.mobile}}
+
-
-
-
+
+
+ {{ parseTime(scope.row.createTime) }}
+
-
-
+
+ 修改
+ 交易记录
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 新增子卡
-
-
-
+
+
+
+
+
+
+
+
+ 搜索
+
-
-
-
+
+
+
+
+ {{ props.row.remark }}
+
+
+
+
+
+
+
+
+
+ {{ scope.row.payTime ? parseTime(scope.row.payTime) :"--" }}
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fuintAdmin/src/views/userGrade/index.vue b/fuintAdmin/src/views/userGrade/index.vue
index 85d06c5a5..4638c45a0 100644
--- a/fuintAdmin/src/views/userGrade/index.vue
+++ b/fuintAdmin/src/views/userGrade/index.vue
@@ -779,9 +779,17 @@ export default {
this.form.naturalGasRule = JSON.stringify(this.naturalGasPreferential)
if (this.form.id) {
updateUserGrade(this.form).then(response => {
- this.$modal.msgSuccess("修改成功");
- this.open = false;
- this.getList();
+ if (response.data==1) {
+ this.$modal.msgSuccess("修改成功");
+ this.open = false;
+ this.getList();
+ }else if (response.data==2) {
+ this.$modal.msgError("修改失败，已存在当前等级的会员等级信息");
+ }else if (response.data==3) {
+ this.$modal.msgError("修改失败，会员等级名称已存在");
+ }else {
+ this.$modal.msgError("修改失败，已存在当前成长值的会员等级");
+ }
});
} else {
queryUserGrade({name:this.form.name}).then( response => {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelRecord.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelRecord.java
index d47450478..d26c1f5b7 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelRecord.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelRecord.java
@@ -133,6 +133,8 @@ public class CardFuelRecord extends BaseEntity {
*/
private String oilName;
+ private String status; //订单处理状态（防止二次执行，0是订单未完成，1是订单完成不可重复执行）
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelChangeMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelChangeMapper.xml
index 0d3dc05e8..b7a342751 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelChangeMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelChangeMapper.xml
@@ -132,6 +132,7 @@
select
ms.name storeName,
cfc.oil_type oilType,
+ cfc.type type,
cfc.change_type changeType,
cfc.balance balance,
cfc.order_no orderNo,
@@ -151,8 +152,8 @@
+ 新增子卡
+
+ 会员信息：{{form.mobile}}
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+ 修改
+ 交易记录
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+
+ {{ props.row.remark }}
+
+
+
+
+
+
+
+
+
+ {{ scope.row.payTime ? parseTime(scope.row.payTime) :"--" }}
+
+
+
+
+
+
- ![]()
+ ![]()
@@ -135,7 +135,7 @@
- {{ consumeRefuelMoney }}L
-
+
@@ -152,17 +152,6 @@
width="400"
trigger="click">
-
-
-
-
-
-
-
-
-
-
-
@@ -482,7 +471,7 @@
:visible.sync="dialogVisiblej"
width="30%"
:close-on-click-modal="false">
-
应收金额
@@ -639,12 +628,12 @@
title="请选择会员"
:visible.sync="dialogVisibleMember"
:close-on-click-modal="false">
-
+
- ![]()
+ ![]()
@@ -804,6 +793,7 @@
name: "homeindex",
data(){
return{
+ baseUrl:process.env.VUE_APP_BASE_API,
// 满减全选
checkAll1: false,
isIndeterminate1: true,
@@ -822,7 +812,7 @@
checkedCities3: [],
cities3: cityOptions,
// 储值卡全选
- checkAll4: true,
+ checkAll4: false,
isIndeterminate4: true,
checkedCities4: [],
cities4: cityOptions,
@@ -852,6 +842,7 @@
loading:false,
// 油号
oilType:'',
+ oilNameID:'',
// 油品类型
type:"",
// 取单列表
@@ -898,6 +889,7 @@
// 会员列表信息
memberList:[],
select1:'会员手机号',
+ storeId:"",
// 查询会员信息参数
userNo:"",
// 查询的商品信息
@@ -1020,7 +1012,7 @@
menu:1,
index:0,
// 是否支付
- isPay:true,
+ isPay:false,
isPaySuccess:false,
// 订单号
orderNo:'',
@@ -1032,7 +1024,7 @@
// 油号列表
oilNumberList:[],
// 是否可以点会员确定按钮
- isSure:false,
+ isSure:true,
// 优惠券消费金额
couponAmount:0,
// 是否为满减互斥
@@ -1242,7 +1234,7 @@
}
this.checkedCities1 = val ? list : [];
this.isIndeterminate1 = false;
- this.isExclusion();
+ this.isDefaultUseCard();
},
handleCheckedCitiesChange1(value) {
this.fullReduction = 0;
@@ -1258,7 +1250,7 @@
let checkedCount = value.length;
this.checkAll1 = checkedCount === this.fullReduceDiscount.length;
this.isIndeterminate1 = checkedCount > 0 && checkedCount < this.fullReduceDiscount.length;
- this.isExclusion();
+ this.isDefaultUseCard();
},
handleCheckAllChange2(val) {
let list = []
@@ -1274,7 +1266,7 @@
}
this.checkedCities2 = val ? list : [];
this.isIndeterminate2 = false;
- this.isExclusion();
+ this.isDefaultUseCard();
},
handleCheckedCitiesChange2(value) {
this.oilDiscount = 0
@@ -1290,7 +1282,7 @@
let checkedCount = value.length;
this.checkAll2 = checkedCount === this.gradeDiscount.length;
this.isIndeterminate2 = checkedCount > 0 && checkedCount < this.gradeDiscount.length;
- this.isExclusion();
+ this.isDefaultUseCard();
},
handleCheckAllChange3(val) {
if (val==false){
@@ -1301,7 +1293,7 @@
this.isOilStorageCard = true;
this.changeRefuelMoney()
}
- this.isExclusion();
+ this.isDefaultUseCard();
},
handleCheckedCitiesChange3(value) {
let checkedCount = value.length;
@@ -1315,7 +1307,7 @@
}else {
this.isUseBalance = false;
}
- this.isExclusion();
+ this.isDefaultUseCard();
},
handleCheckedCitiesChange4(value) {
let checkedCount = value.length;
@@ -1359,7 +1351,7 @@
this.couponAmount = 0
this.checkedCities5 = ""
}
- this.isExclusion();
+ this.isDefaultUseCard();
},
handleCheckedCitiesChange5(value) {
this.couponAmount = 0;
@@ -1375,7 +1367,7 @@
}
})
this.checkAll5 = true;
- this.isExclusion();
+ this.isDefaultUseCard();
},
// 模糊查询商品信息
querySearch(queryString, cb) {
@@ -1908,7 +1900,7 @@
}
_this.oilDiscount = gasolineDiscount + dieselDiscount + naturalGasDiscount
_this.checkAll2 = true;
- _this.isExclusion();
+ _this.isDefaultUseCard();
})
},
// 选择会员
@@ -1918,10 +1910,14 @@
this.map.payUser = data.mobile;
this.map.userId = data.id;
this.balance = this.member.cardBalance;
+ if (data.refuelMoney){
+ // 使用囤油卡
+ this.refuelMoney = JSON.parse(data.refuelMoney)
+ this.changeRefuelMoney();
+ }else
this.getGrade(data.id,data.gradeId)
- this.changeRefuelMoney();
- this.handleChange();
- this.preferentialData.storeId = data.storeId;
+ // this.handleChange();
+ this.preferentialData.storeId = this.storeId;
this.preferentialData.userId = data.id;
this.preferentialData.gradeId = data.gradeId;
if (this.oilOrder.length>0){
@@ -1939,6 +1935,7 @@
_this.couponDiscount =[];
_this.couponIds = [],
selectCoupon(_this.preferentialData).then(response => {
+ // console.log(response)
_this.couponAmount = 0;
_this.couponIds = response.data
if (response.data.length>0){
@@ -2014,23 +2011,25 @@
})
}
_this.checkAll5 = true;
- _this.isExclusion();
+ _this.isDefaultUseCard();
})
})
},
// 使用囤油卡 囤油卡不参与任何优惠
countOilCard(){
- if (this.hoardAmount!=0){
- if (this.balance!=0 && this.balance >= (this.oilAmount - this.hoardAmount)){
+ if (this.hoardAmount>0){
+ if (this.balance!=0 && this.balance >= this.hoardAmount){
this.oilActualPay = 0
this.consumeAmount = this.hoardAmount
}else {
- this.oilActualPay = (this.oilAmount - this.hoardAmount -this.balance).toFixed(2)
+ this.oilActualPay = (this.hoardAmount -this.balance).toFixed(2)
+ this.consumeAmount = this.balance
}
}else {
this.oilActualPay = 0
this.consumeAmount = 0
}
+ console.log("囤油卡",this.isOilStorageCard,this.hoardAmount,this.balance,this.oilAmount,this.oilActualPay,this.consumeAmount)
},
// 使用优惠券不使用满减
countAmountFull(){
@@ -2046,6 +2045,7 @@
}else {
this.oilActualPay = (this.oilAmount - this.oilDiscount).toFixed(2)
}
+ console.log("优惠券",this.oilAmount, this.oilDiscount,this.couponAmount)
},
// 使用优惠券和满减不使用储值卡
countAmountUnBalance(){
@@ -2055,6 +2055,7 @@
this.oilActualPay = (this.oilAmount - this.oilDiscount).toFixed(2)
}
this.consumeAmount = 0
+ console.log("优惠券和满减",this.oilAmount , this.fullReduction , this.oilDiscount , this.couponAmount)
},
// 使用储值卡不使用优惠券 || 使用满减不使用优惠券
countAmountBalance(){
@@ -2069,6 +2070,7 @@
}else {
this.oilActualPay = (this.oilAmount - this.oilDiscount).toFixed(2)
}
+ console.log("储值卡满减",this.oilAmount, this.oilDiscount,this.fullReduction)
},
// 判断互斥限制
isExclusion(){
@@ -2113,20 +2115,39 @@
return;
}
// 使用囤油卡
- if (this.isOilStorageCard){
- this.checkAll1 = false;
- this.fullReduction = 0;
- this.checkAll2 = false;
- this.checkedCities2 = [],
- this.oilDiscount = 0;
- this.checkAll5 = false;
- this.couponAmount = 0;
- this.countOilCard();
- return;
- }
+ // if (this.isOilStorageCard){
+ // this.checkAll1 = false;
+ // this.fullReduction = 0;
+ // this.checkAll2 = false;
+ // this.checkedCities2 = [];
+ // this.oilDiscount = 0;
+ // this.checkAll5 = false;
+ // this.couponAmount = 0;
+ // this.countOilCard();
+ // return;
+ // }
this.countAmountBalance();
}
},
+ // 默认使用囤油卡
+ isDefaultUseCard(){
+ if (this.isOilStorageCard){
+ this.checkAll3 = true;
+ this.checkAll1 = false;
+ this.fullReduction = 0;
+ this.checkAll2 = false;
+ this.checkedCities2 = [];
+ this.oilDiscount = 0;
+ this.checkAll5 = false;
+ this.couponAmount = 0;
+ this.countOilCard();
+ if (this.hoardAmount>0 && this.balance > 0){
+ this.checkAll4 = true;
+ }
+ }else {
+ this.isExclusion()
+ }
+ },
// 调用优惠参数接口
preferential(){
let _this = this;
@@ -2184,17 +2205,17 @@
_this.checkedCities1 = []
_this.fullReduction = 0
}
- _this.isExclusion();
+ _this.isDefaultUseCard();
})
})
},
// 选择会员信息
handleChoose(data) {
- this.isSure = true;
+ this.isSure = false;
this.member = data;
- if (data.refuelMoney != null && data.refuelMoney != ""){
- this.refuelMoney = JSON.parse(data.refuelMoney)
- }
+ // if (data.refuelMoney != null && data.refuelMoney != ""){
+ // this.refuelMoney = JSON.parse(data.refuelMoney)
+ // }
this.dialogVisibleMember = false;
},
// 清空商品订单列表
@@ -2274,8 +2295,10 @@
settlement(){
this.authCode = ""
this.seekZero = 0;
- this.isPay = true
+ this.isPay = false
+ console.log(this.isPay)
this.dialogVisiblej = true
+ this.getStaff()
},
// 重置油品订单
resetting(){
@@ -2306,7 +2329,7 @@
// 油品订单信息
getOilOrder(){
this.dialogVisibleamount = false
- this.form.oilType = this.oilType;
+ this.form.oilType = this.oilNameID;
this.form.type = this.type;
// 计算油的升数
if (this.select == "元"){
@@ -2358,13 +2381,17 @@
_this.consumeRefuelMoney = 0;
_this.oilActualPay = 0;
_this.hoardAmount = 0;
+ _this.oilAmount = 0;
_this.oilOrder.forEach(item => {
let conRefMon = 0;
let hoardAmount = 0;
- if (_this.refuelMoney!=null){
+ let id = ""
+ if (_this.refuelMoney){
for (let i = 0;i < _this.refuelMoney.length;i++){
// 囤油卡升数变化
- if (_this.refuelMoney[i].oilType==item.oilType){
+ if (_this.refuelMoney[i].oilType==item.oilType && _this.refuelMoney[i].refuelMoney>0){
+ id = item.id
+ _this.isOilStorageCard = true
if ((_this.refuelMoney[i].refuelMoney-item.liters)>=0){
conRefMon = item.liters
}else {
@@ -2372,18 +2399,34 @@
// 扣除升数后需要消费的金额
hoardAmount = item.amount - (_this.refuelMoney[i].refuelMoney * item.oilPrice).toFixed(2)
}
+ }else {
+ hoardAmount = item.amount
}
}
}
_this.consumeRefuelMoney += +conRefMon
- if (_this.consumeRefuelMoney!=0){
- _this.isOilStorageCard = true;
- _this.checkAll3 = true;
- _this.consumeAmount = 0;
- }
_this.hoardAmount += +hoardAmount
+ _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.isExclusion();
+ },
+ changeBalance(hoardAmount,id){
+ if (this.balance>0 && id != ""){
+ this.oilOrder.forEach(item => {
+ if (this.balance >= item.amount){
+ this.consumeAmount = item.amount
+ }else {
+ this.consumeAmount = this.balance
+ this.oilActualPay = item.amount - this.balance
+ }
+ })
+ }
},
// 选择“元”或“L”
changeSelect(){
@@ -2424,6 +2467,7 @@
name = item.oilName;
oilType = item.oilType;
_this.oilType = item.oilName;
+ _this.oilNameID = item.id;
_this.type = item.oilType;
}
})
@@ -2442,15 +2486,18 @@
getUserInfoMobile({mobile:this.userNo}).then( response => {
if (response.data!=null){
this.member = response.data
+ this.storeId = response.data.storeId
+ this.isSure = false
}else {
this.$modal.msgError("会员信息不存在")
}
})
}else {
- getUserVoName({name:this.userNo}).then( response => {
- this.memberList = response.data
- })
this.dialogVisibleMember = true;
+ getUserVoName({name:this.userNo}).then( response => {
+ this.memberList = response.data.userVo
+ this.storeId = response.data.storeId
+ })
}
},
// 查询所有商品信息
@@ -2521,13 +2568,13 @@
let _this = this;
if (this.payType=="APPLET_CODE"){
- this.loading = true;
scanAppletQrCode(_this.map).then( resp => {
- if (resp.data.success!=undefined){
+ if (resp.data.success=='success'){
+ this.loading = true;
setTimeout(function (){
_this.isPaySuccess = true;
- this.loading = false;
- _this.isPay = false;
+ _this.loading = false;
+ _this.isPay = true;
_this.resetting1();
},3000)
}else {
@@ -2568,11 +2615,10 @@
})
this.loading = true;
_this.queryPayStatus();
- // console.log(_this.isQuery)
let timer = setInterval(function () {
if (_this.isQuery == false) {
_this.loading = false;
- _this.isPay = false;
+ _this.isPay = true;
clearInterval(_this.timer);
}
},500)
@@ -2582,7 +2628,6 @@
_this.resetting1();
},
resetting1(){
- // console.log(111)
let _this = this;
this.authCode = "";
if (_this.isPaySuccess == true){
@@ -2700,22 +2745,11 @@
},500)
},
handClose(){
- if(this.isPaySuccess){
- this.oilAmount = 0;
- this.oilActualPay = 0;
- this.oilDiscount = 0;
- this.goodsAmount = 0;
- this.goodsActualPay = 0;
- this.goodsDiscount = 0;
- this.consumeAmount = 0;
- this.consumeRefuelMoney = 0;
- this.oilTotal = 0;
- this.goodsTotal = 0;
- this.isMember = false;
- }
- this.isPay = true;
- this.dialogVisiblej = false
+ this.resetting1()
+ this.member = {};
this.isPaySuccess = false;
+ this.isPay = false;
+ this.dialogVisiblej = false
},
// 支付方式
payMethod(payType){
diff --git a/gasStation-uni/pagesRefuel/orderDetail/index.vue b/gasStation-uni/pagesRefuel/orderDetail/index.vue
index 1938d284a..8c40b8223 100644
--- a/gasStation-uni/pagesRefuel/orderDetail/index.vue
+++ b/gasStation-uni/pagesRefuel/orderDetail/index.vue
@@ -148,6 +148,7 @@
oilPrice: 0,
// 油品名称
oilName: "",
+ oilNameId:"",
// 油品类型
oilType:"",
// 油品id
@@ -169,6 +170,7 @@
deductAmount:0,
// 囤油卡信息
refuelMoney:[],
+ refuelMoneyAfter:[],
// 会员等级优惠信息
gradeDiscount:[],
// 优惠券优惠信息
@@ -200,7 +202,7 @@
},
onLoad(e) {
this.orderNo = e.orderNo
- // this.orderNo = "23452024011011251833f48e"
+ // this.orderNo = "234520240111104725ec1fbe"
},
onShow() {
this.getOilOrder();
@@ -211,14 +213,12 @@
methods: {
// 支付接口
payment(){
- let refuel = this.refuelMoney
- refuel.refuelMoney = this.refuelMoney.refuelMoney - this.oilCardRedece
let map = {
orderNo : this.orderNo,
payAmount : this.payAmount,
// payAmount : "0.01",
discountAmount : this.fullRedece+this.gradeRedece+this.couponRedece,
- oilCardAmount : JSON.stringify(refuel),
+ oilCardAmount : JSON.stringify(this.refuelMoneyAfter),
oilCardLiters : this.oilCardRedece,
balanceAmount : this.balanceRedece,
isOilStorageCard : this.isOilStorageCard,
@@ -308,19 +308,23 @@
// 查看是否有可使用的囤油卡
chooseRefuelMoney(){
let falg = false;
- this.refuelMoney.forEach(item => {
- if (item.oilType == this.oilName){
+ for(let i = 0;i= this.oilOrder.oilNum){
+ this.refuelBalance = this.refuelMoney[i].refuelMoney
+ if (this.refuelMoney[i].refuelMoney>0){
+ this.isOilStorageCard = true
+ }
+ if (this.refuelMoney[i].refuelMoney >= this.oilOrder.oilNum){
this.oilCardRedece = this.oilOrder.oilNum
+ this.refuelMoneyAfter[i].refuelMoney = this.refuelMoney[i].refuelMoney - this.oilOrder.oilNum
}else{
- this.oilCardRedece = item.refuelMoney
+ this.oilCardRedece = this.refuelMoney[i].refuelMoney
+ this.refuelMoneyAfter[i].refuelMoney = 0
this.chooseCardBalance(1)
}
}
- })
+ }
if (falg == false) {
this.chooseCardBalance(0)
this.chooseGrade(this.user.id,this.user.gradeId)
@@ -342,12 +346,17 @@
}else{
// 使用囤油卡
// 扣除囤油卡金额后需要支付的金额
- let residueAmount = (this.oilOrder.oilNum - this.oilCardRedece) * this.oilPrice
+ let residueAmount = 0
+ if(this.oilCardRedece>0){
+ residueAmount = ((this.oilOrder.oilNum - this.oilCardRedece) * this.oilPrice).toFixed(2)
+ }else{
+ residueAmount = this.oilOrder.orderAmount
+ }
if (this.user.cardBalance >= residueAmount){
this.balanceRedece = residueAmount
} else {
this.balanceRedece = this.user.cardBalance
- this.payAmount = (this.oilOrder.orderAmount - residueAmount - this.balanceRedece).toFixed(2)
+ this.payAmount = ((residueAmount*100).toFixed(0) - (this.balanceRedece*100).toFixed(0))/100
}
}
}else{
@@ -691,8 +700,10 @@
}
_this.user = res.data.userVo;
_this.user = res.data.userVo;
+ // console.log(res.data.userVo.refuelMoney);
if (res.data.userVo.refuelMoney!=null && res.data.userVo.refuelMoney!=""){
_this.refuelMoney = JSON.parse(res.data.userVo.refuelMoney)
+ _this.refuelMoneyAfter = JSON.parse(res.data.userVo.refuelMoney)
_this.chooseRefuelMoney()
}else{
_this.chooseCardBalance(0)
@@ -751,9 +762,11 @@
method: 'get',
}).then((res) => {
res.data.forEach(item => {
+ // console.log(item);
if (item.oilName == _this.oilOrder.oils) {
_this.oilPrice = item.gbPrice;
_this.oilName = item.oilNames;
+ _this.oilNameId = item.oilName;
_this.oilType = item.oilType;
_this.oilId = item.oilId;
}