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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
cun-nan 2024-01-23 10:45:30 +08:00
commit c2ceb9e13b
2 changed files with 78 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java
View File

@ -71,8 +71,6 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl<CardFavorableRec
*/ */
@Override @Override
public IPage select(Page page, CardFavorableRecord cardFavorableRecord) { public IPage select(Page page, CardFavorableRecord cardFavorableRecord) {
//构建查询条件 //构建查询条件
LambdaQueryWrapper<CardFavorableRecord> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<CardFavorableRecord> queryWrapper = new LambdaQueryWrapper<>();
if (ObjectUtils.isNotEmpty(cardFavorableRecord.getMobile())){ if (ObjectUtils.isNotEmpty(cardFavorableRecord.getMobile())){

78
gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
View File

@ -312,6 +312,45 @@
} }
}); });
} }
if (_this.appltType == "ALIPAY") {
my.tradePay({
tradeNO: res.data.data.reservedTransactionId
}, function(resp) {
if (resp.resultCode == '9000') {
console.log("支付成功")
// 支付成功后调用修改使用后的优惠券情况
/* _this.preferentialData.storeId = _this.oilOrder.storeId
_this.preferentialData.orderAmount = _this.oilOrder.orderAmount
_this.preferentialData.oilId = _this.oilOrder.oils
_this.preferentialData.mtUserLevel = _this.user.gradeId
request({
url: "business/marketingActivity/cardFavorableRecord/updateCardAndActiveById",
method: 'post',
data: _this.preferentialData,
}).then((res)=>{
console.log(res);
}) */
uni.reLaunch({
url: '/pagesRefuel/orderSuccess/index'
})
} else {
request({
url: "/business/allOrderInfo/orderStatus",
method: 'post',
data: {
"orderNo": res.data.data.orderNo,
"status": "payFail"
},
}).then((res) => {
uni.showToast({
title: "支付失败!",
icon: "error"
})
})
console.log('支付失败，' + resp.resultCode);
}
});
}
}) })
}, },
@ -381,6 +420,45 @@
} }
}); });
} }
if (_this.appltType == "ALIPAY") {
my.tradePay({
tradeNO: res.data.data.reservedTransactionId
}, function(resp) {
if (resp.resultCode == '9000') {
console.log("支付成功")
// 支付成功后调用修改使用后的优惠券情况
/* _this.preferentialData.storeId = _this.oilOrder.storeId
_this.preferentialData.orderAmount = _this.oilOrder.orderAmount
_this.preferentialData.oilId = _this.oilOrder.oils
_this.preferentialData.mtUserLevel = _this.user.gradeId
request({
url: "business/marketingActivity/cardFavorableRecord/updateCardAndActiveById",
method: 'post',
data: _this.preferentialData,
}).then((res)=>{
console.log(res);
}) */
uni.reLaunch({
url: '/pagesRefuel/orderSuccess/index'
})
} else {
request({
url: "/business/allOrderInfo/orderStatus",
method: 'post',
data: {
"orderNo": res.data.data.orderNo,
"status": "payFail"
},
}).then((res) => {
uni.showToast({
title: "支付失败!",
icon: "error"
})
})
console.log('支付失败，' + resp.resultCode);
}
});
}
}) })
}, },