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:
齐天大圣 2024-03-06 14:27:54 +08:00
commit e73ff9722c
3 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -463,7 +463,9 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
//会员信息
LJUserVo ljUserVo = ljUserMapper.queryUserByChainStoreId(nowAccountInfo.getId(),store.getChainStoreId());
//员工信息
LJStaff ljStaff = mtStaffService.selectStaffById(cardFuelRecordDTO.getMtStaffId());
LJStaff ljStaff = new LJStaff();
if (ObjectUtil.isNotEmpty(cardFuelRecordDTO.getMtStaffId()))
ljStaff = mtStaffService.selectStaffById(cardFuelRecordDTO.getMtStaffId());
//查询囤油卡信息
CardFuelDiesel cardFuelDiesel = cardFuelDieselService.getById(cardFuelRecordDTO.getId());
cardFuleOrders.setCardFuleId(cardFuelDiesel.getId());
@ -491,9 +493,11 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
cardFuleOrders.setName(ljUserVo.getName());
cardFuleOrders.setMobile(ljUserVo.getMobile());
//员工信息
cardFuleOrders.setStaffId(ljStaff.getId());
cardFuleOrders.setRealName(ljStaff.getRealName());
cardFuleOrders.setStaffMobile(ljStaff.getMobile());
if (ObjectUtil.isNotEmpty(ljStaff)) {
cardFuleOrders.setStaffId(ljStaff.getId());
cardFuleOrders.setRealName(ljStaff.getRealName());
cardFuleOrders.setStaffMobile(ljStaff.getMobile());
}
//订单金额
cardFuleOrders.setAmount(cardFuelDiesel.getRechargeBalance());
//支付金额
@ -522,7 +526,8 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
if (map.get("code").equals("success")){
return JSONObject.parseObject(JSONObject.toJSONString(map.get("data")),ReturnParameter.class);
}else {
throw new Exception(map.get("msg").toString());
// throw new Exception(map.get("msg").toString());
return new ReturnParameter();
}
}

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
View File

@ -282,7 +282,8 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
if (map.get("code").equals("success")){
return JSONObject.parseObject(JSONObject.toJSONString(map.get("data")),ReturnParameter.class);
}else {
throw new Exception(map.get("msg").toString());
// throw new Exception(map.get("msg").toString());
return new ReturnParameter();
}
}

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

@ -316,6 +316,14 @@
if (res.code == 200) {
console.log(res, _this.appltType)
if (_this.appltType == "WECHAT") {
if(!res.data.reservedPayInfo){
uni.showToast({
title:'支付失败，请联系商家',
icon:"none"
})
return;
}
let payProvider = "wxpay"
_this.orderInfo = JSON.parse(res.data.reservedPayInfo);
uni.requestPayment({
@ -352,6 +360,13 @@
}
if (_this.appltType == "ALIPAY") {
if(!res.data.reservedTransactionId){
uni.showToast({
title:'支付失败，请联系商家',
icon:"none"
})
return;
}
my.tradePay({
tradeNO: res.data.reservedTransactionId
}, function(resp) {
@ -414,6 +429,13 @@
if (res.code === 200) {
if (_this.appltType == "WECHAT") {
if(!res.data.reservedPayInfo){
uni.showToast({
title:'支付失败，请联系商家',
icon:"none"
})
return;
}
let payProvider = "wxpay"
_this.orderInfo = JSON.parse(res.data.reservedPayInfo);
uni.requestPayment({
@ -450,23 +472,18 @@
}
}
if (_this.appltType == "ALIPAY") {
if(!res.data.reservedTransactionId){
uni.showToast({
title:'支付失败，请联系商家',
icon:"none"
})
return;
}
my.tradePay({
tradeNO: res.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'
})