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-10 15:40:30 +08:00
commit 6ee781c488
7 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -828,7 +828,7 @@ export default {
validityZero: row.validityZero,
validityOne: row.validityOne,
validityTwo:row.validityTwo,
giftCardDetail: "满"+ row.fullDeduction+"减 "+row.discountAmount+"元" , //券详情
giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情
giftCardTime: "", //券有效期
giftCardTotal: 1//券数量
}

6
fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
View File

@ -42,11 +42,11 @@
<div class="tj-num">{{tjdata.remaining_amount || 0}}</div>
<div class="tj-siez">剩余额度</div>
</el-card>
<el-card class="kar" style="cursor: pointer;height: 106px " >
<!-- <el-card class="kar" style="cursor: pointer;height: 106px " >
<div class="tj-num"> <el-tag v-if="tjdata.exchangeStatus == 0" @click="putStatus(1)">启用</el-tag> <el-tag type="info" v-if="tjdata.exchangeStatus == 1 " @click="putStatus(0)">禁用</el-tag> </div>
<div class="tj-siez">兑换功能状态</div>
</el-card>
</el-card>-->
</div>
<el-card style="margin-bottom: 20px">
@ -328,7 +328,7 @@
margin-bottom: 20px;
}
.kar{
width: 20%;
width: 25%;
margin-right: 10px;
}
.tj-num{

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

@ -75,7 +75,7 @@
this.couponList = response.data.records;
this.total = response.data.total
if( response.data.total == 0){
this.$message.error("未找到兑换券")
/* this.$message.error("未找到兑换券")*/
}else{
}

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java
View File

@ -69,7 +69,10 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl<ActiveConsumptionM
//新增消费有礼活动模板
ActiveConsumption activeConsumption = new ActiveConsumption();
if (ObjectUtils.isNotEmpty(activeConsumptionDTO)){
String participationConditionMoney = activeConsumptionDTO.getParticipationConditionMoney();
double v = Double.parseDouble(participationConditionMoney);
BeanUtils.copyProperties(activeConsumptionDTO,activeConsumption);
activeConsumption.setParticipationConditionMoney(v);
//适用油号
activeConsumption.setAdaptOil(arrayToString(activeConsumptionDTO.getAdaptOil()));
//活动奖品
@ -155,6 +158,7 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl<ActiveConsumptionM
if (CollectionUtils.isNotEmpty(activeConsumptionChildList)){
//封装VO返回
BeanUtils.copyProperties(consumption,activeConsumptionVO);
activeConsumptionVO.setParticipationConditionMoney(consumption.getParticipationConditionMoney().toString());
activeConsumptionVO.setDieselUserLevel(consumption.getDieselUserLevel().split(","));
activeConsumptionVO.setGasolineUserLevel(consumption.getGasolineUserLevel().split(","));
activeConsumptionVO.setNaturalUserLevel(consumption.getNaturalUserLevel().split(","));
@ -179,7 +183,10 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl<ActiveConsumptionM
boolean update = false;
//更新消费有礼
ActiveConsumption activeConsumption = new ActiveConsumption();
String participationConditionMoney = activeConsumptionDTO.getParticipationConditionMoney();
double participationConditionMoneys = Double.parseDouble(participationConditionMoney);
BeanUtils.copyProperties(activeConsumptionDTO,activeConsumption);
activeConsumption.setParticipationConditionMoney(participationConditionMoneys);
activeConsumption.setAdaptOil(arrayToString(activeConsumptionDTO.getAdaptOil()));
activeConsumption.setActiveGift(arrayToString(activeConsumptionDTO.getActiveGift()));
//柴油会员等级

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

@ -113,7 +113,9 @@ public class CardFuelDieselServiceImpl extends ServiceImpl<CardFuelDieselMapper,
Date startTime = record.getStartTime();
Date endTime = record.getEndTime();
Date date = new Date();
if(startTime.before(date) && endTime.after(date)){
if (record.getActiveTime().equals("1")){
cardFuelDiesels.add(record);
}else if (startTime.before(date) && endTime.after(date)){
cardFuelDiesels.add(record);
}
}

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

@ -110,7 +110,7 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
}
queryWrapper.orderByDesc(CardValue::getCreateTime);
IPage page1 = page(page, queryWrapper);
/*List<CardValue> records = page1.getRecords();
List<CardValue> records = page1.getRecords();
CardValueVOs cardValueVO = new CardValueVOs();
ArrayList<CardValueVOs> cardValueVOs = new ArrayList<>();
//返回储值卡活动进度状态
@ -135,9 +135,16 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
}
}
BeanUtils.copyProperties(record,cardValueVO);
cardValueVOs.add(cardValueVO);
Date startTime = cardValueVO.getStartTime();
Date endTime = cardValueVO.getEndTime();
Date date = new Date();
if(cardValueVO.getActiveTime().equals("1")){
cardValueVOs.add(cardValueVO);
}else if (cardValueVO.getActiveTime().equals("2") && startTime.before(date) && endTime.after(date)){
cardValueVOs.add(cardValueVO);
}
}
page1.setRecords(cardValueVOs);*/
page1.setRecords(cardValueVOs);
return page1;
}

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

@ -272,7 +272,22 @@
url: '/pagesRefuel/orderSuccess/index'
})
},
fail: function(err) {}
fail: function(err) {
request({
url: "/business/marketingActivity/activeExchange/cardValueOrders",
method: 'put',
data: {
"orderNo": res.data.data.orderNo,
"status": "payFail"
},
}).then((res) => {
uni.showToast({
title: "支付失败!",
icon: "error"
})
})
console.log('fail:', err);
}
});
}