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-05 15:44:43 +08:00
parent 4b1ee8a19f
commit 83b16a32e3
8 changed files with 44 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -490,6 +490,7 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.activeDiscountChildList = [ {amount:'',discount:''}, ]
this.open = true;
this.title = "添加折扣营销";
},
@ -500,6 +501,11 @@ export default {
getActiveDiscount(id).then(response => {
console.log( response.data)
this.form = response.data;
if (response.data.activeDiscountChildList && response.data.activeDiscountChildList.length>0){
this.activeDiscountChildList = response.data.activeDiscountChildList
}else {
this.activeDiscountChildList = [ {amount:'',discount:''}, ]
}
this.open = true;
this.title = "修改折扣营销";
});

7
fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue
View File

@ -456,6 +456,7 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.activeDiscountChildList = [ {amount:'',deductionAmount:''}, ]
this.open = true;
this.title = "添加满减营销";
},
@ -464,7 +465,13 @@ export default {
this.reset();
const id = row.id || this.ids
getActiveFullminus(id).then(response => {
console.log(response)
this.form = response.data;
if (response.data.activeDiscountChildList && response.data.activeDiscountChildList.length>0){
this.activeDiscountChildList = response.data.activeDiscountChildList
}else {
this.activeDiscountChildList = [ {amount:'',deductionAmount:''}, ]
}
this.open = true;
this.title = "修改满减营销";
});

2
fuintAdmin/src/views/integral/gift/index.vue
View File

@ -255,7 +255,7 @@
<el-option
v-for="option in cardFavorableList"
:key="option.id"
:label="(option.type==0?'油品卷-':option.type==1?'商品卷-':'优惠卷-')+ option.name"
:label="(option.type==0?'油品券-':option.type==1?'商品券-':'优惠券-')+ option.name"
:value="option.id"
></el-option>
</el-select>

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

@ -329,8 +329,8 @@
width="80">
<template slot-scope="scope">
<span v-if="scope.row.giftCardType == 0" >油品券</span>
<span v-if="scope.row.giftCardType == 1" >商品券</span>
<span v-if="scope.row.giftCardType == 2" >通用券</span>
<!-- <span v-if="scope.row.giftCardType == 1" >洗车券</span>-->
<!-- <span v-if="scope.row.giftCardType == 2" >通用券</span>-->
</template>
</el-table-column>
<el-table-column
@ -394,9 +394,9 @@
label="券类型"
width="80">
<template slot-scope="scope">
<span v-if="scope.row.giftCardType == 0" >油品券</span>
<span v-if="scope.row.giftCardType == 1" >商品券</span>
<span v-if="scope.row.giftCardType == 2" >通用券</span>
<span v-if="scope.row.giftCardType == 0" >商品兑换券</span>
<span v-if="scope.row.giftCardType == 1" >洗车券</span>
<!-- <span v-if="scope.row.giftCardType == 2" >通用券</span>-->
</template>
</el-table-column>
<el-table-column
@ -627,8 +627,8 @@
width="100">
<template slot-scope="scope">
<span v-if="scope.row.type == 0" >油品券</span>
<span v-if="scope.row.type == 1" >商品券</span>
<span v-if="scope.row.type == 2" >通用券</span>
<!-- <span v-if="scope.row.type == 1" >洗车券</span>-->
<!-- <span v-if="scope.row.type == 2" >通用券</span>-->
</template>
</el-table-column>
<el-table-column
@ -692,9 +692,9 @@
label="券类型"
width="100">
<template slot-scope="scope">
<span v-if="scope.row.type == 0" >油品券</span>
<span v-if="scope.row.type == 1" >商品券</span>
<span v-if="scope.row.type == 2" >通用券</span>
<span v-if="scope.row.type == 0" >商品兑换券</span>
<span v-if="scope.row.type == 1" >洗车券</span>
<!-- <span v-if="scope.row.type == 2" >通用券</span>-->
</template>
</el-table-column>
<el-table-column
@ -1231,6 +1231,8 @@ export default {
updateUserGrade(this.form).then(response => {
if (response.data==1) {
this.$modal.msgSuccess("修改成功");
this.tableDatas1 = []
this.tableDatas = []
this.open = false;
this.getList();
}else if (response.data==2) {
@ -1250,6 +1252,8 @@ export default {
if (res.data==1){
this.$modal.msgSuccess("新增成功");
this.open = false;
this.tableDatas1 = []
this.tableDatas = []
this.getList();
}else if (res.data==0){
this.$modal.msgError("新增失败，最多支持20个等级");

17
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/service/impl/ActiveDiscountServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.fuint.business.marketingActivity.activeDiscount.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@ -132,13 +133,17 @@ public class ActiveDiscountServiceImpl extends ServiceImpl<ActiveDiscountMapper,
List<ActiveDiscountChild> activeDiscountChildList = activeDiscountChildService.list(queryWrappers);
BeanUtils.copyProperties(s,activeDiscountVO);
activeDiscountVO.setAdaptOil(Arrays.stream(s.getAdaptOil().split(","))
.map(Integer::valueOf)
.toArray(Integer[]::new));
if (ObjectUtil.isNotEmpty(s.getAdaptOil())) {
activeDiscountVO.setAdaptOil(Arrays.stream(s.getAdaptOil().split(","))
.map(Integer::valueOf)
.toArray(Integer[]::new));
}
String oilName = "";
for (Integer integer : activeDiscountVO.getAdaptOil()) {
OilName oilNames = oilNameService.selectOilNameById(integer);
oilName += oilNames.getOilType() + "-"+oilNames.getOilName() + ",";
if (ObjectUtils.isNotEmpty(activeDiscountVO.getAdaptOil())) {
for (Integer integer : activeDiscountVO.getAdaptOil()) {
OilName oilNames = oilNameService.selectOilNameById(integer);
oilName += oilNames.getOilType() + "-" + oilNames.getOilName() + ",";
}
}
if (oilName.endsWith(",")) { // 判断字符串是否以逗号结尾

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

@ -251,7 +251,7 @@ public class LJUserGradeServiceImpl extends ServiceImpl<LJUserGradeMapper, LJUse
public int updateUserGrade(LJUserGrade userGrade) {
int row = 0;
boolean flag = false;
LJStore store = storeService.selectStoreByStoreId(userGrade.getStoreId());
LJStore store = storeService.selectStoreByStoreId(TokenUtil.getNowAccountInfo().getStoreId());
List<LJUserGrade> ljUserGrades = this.selectUserGradeByChainStoreId(store.getChainStoreId());
for (LJUserGrade ljUserGrade : ljUserGrades) {
if (ljUserGrade.getGrade().equals(userGrade.getGrade()) && !ljUserGrade.getId().equals(userGrade.getId())){

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

@ -68,8 +68,8 @@
<div style="width: 200px">{{ getName(oilNameList,item.oilName) }}_{{getName1(gunList,item.gunName)}}</div>
<div style="line-height: 20px;width:150px;font-size: 12px;text-align: right">
<div style="color: red">-￥{{ item.discount }}</div>
<div style="color: grey" v-if="item.type!=1">满减优惠</div>
<div style="color: grey" v-if="item.type!=2">折扣优惠</div>
<div style="color: grey" v-if="item.type!=2">满减优惠</div>
<div style="color: grey" v-if="item.type!=1">折扣优惠</div>
</div>
</div>
</el-checkbox>

4
gasStation-uni/pagesMy/details/details.vue
View File

@ -135,10 +135,10 @@
this.getOilNumber(res.data.storeId)
this.getCardFavorable(res.data.cardFavorableId)
if ( res.data.activeId && res.data.activeType){
if (res.data.activeType == "1"){
if (res.data.activeType == "2"){
this.getFullFavorable(res.data.activeId)
}
if (res.data.activeType == "2"){
if (res.data.activeType == "1"){
this.getDiscountFavorable(res.data.activeId)
}
}