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-07 14:53:54 +08:00
parent 63eaf1e825
commit 46ec7907a3
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1116,13 +1116,13 @@ export default {
const id = row.id || this.ids const id = row.id || this.ids
getActiveConsumption(id).then(response => { getActiveConsumption(id).then(response => {
this.form = response.data; this.form = response.data;
if(response.data.activeConsumptionChildList&&response.data.activeConsumptionChildList.length >1){ if(response.data.activeConsumptionChildList && response.data.activeConsumptionChildList.length >0){
this.form.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '1') this.form.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '1')
this.tableData1 = response.data.activeConsumptionChildList.filter(item => item.activeGift == '1') this.tableData1 = response.data.activeConsumptionChildList.filter(item => item.activeGift == '1')
this.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '2') this.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '2')
this.form.shiwudata = response.data.activeConsumptionChildList.filter(item => item.activeGift == '4') this.form.shiwudata = response.data.activeConsumptionChildList.filter(item => item.activeGift == '4')
} }
console.log(this.tableData1,1241)
this.open = true; this.open = true;
this.title = "修改消费有礼活动"; this.title = "修改消费有礼活动";
}); });

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

@ -131,12 +131,12 @@ public class ActiveOneCouponServiceImpl extends ServiceImpl<ActiveOneCouponMappe
IPage page1 = page(page, queryWrapper); IPage page1 = page(page, queryWrapper);
List<ActiveOneCoupon> records = page1.getRecords(); List<ActiveOneCoupon> records = page1.getRecords();
ArrayList<ActiveOneCouponVO> activeOneCouponVOArrayList = new ArrayList<>(); ArrayList<ActiveOneCouponVO> activeOneCouponVOArrayList = new ArrayList<>();
ArrayList<LJUserVos> userList = new ArrayList<>();
for (ActiveOneCoupon record : records) { for (ActiveOneCoupon record : records) {
ActiveOneCouponVO activeOneCouponVO = new ActiveOneCouponVO(); ActiveOneCouponVO activeOneCouponVO = new ActiveOneCouponVO();
BeanUtils.copyProperties(record, activeOneCouponVO); BeanUtils.copyProperties(record, activeOneCouponVO);
String gradeIds = record.getGradeId(); String gradeIds = record.getGradeId();
//会员存量 //会员存量
ArrayList<LJUserVos> userList = new ArrayList<>();
String[] gradeId = gradeIds.split(","); String[] gradeId = gradeIds.split(",");
for (String s : gradeId) { for (String s : gradeId) {
LJUserVos ljUserVos = new LJUserVos(); LJUserVos ljUserVos = new LJUserVos();
@ -151,7 +151,7 @@ public class ActiveOneCouponServiceImpl extends ServiceImpl<ActiveOneCouponMappe
List<LJUserVo> userListss = userService.getUserLists(ljUserVo); List<LJUserVo> userListss = userService.getUserLists(ljUserVo);
ljUserVos.setCount(userListss.size()); ljUserVos.setCount(userListss.size());
if (ObjectUtils.isNotEmpty(ljUserVos.getCountAll()) && ObjectUtils.isNotEmpty(ljUserVos.getCount()) && ljUserVos.getCountAll()!=0){ if (ObjectUtils.isNotEmpty(ljUserVos.getCountAll()) && ObjectUtils.isNotEmpty(ljUserVos.getCount()) && ljUserVos.getCountAll()!=0){
ljUserVos.setRate(ljUserVos.getCount()/ljUserVos.getCountAll() + "%"); ljUserVos.setRate((ljUserVos.getCount()/ljUserVos.getCountAll())*100 + "%");
} }
userList.add(ljUserVos); userList.add(ljUserVos);
} }

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

@ -454,7 +454,7 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl<CardFavorableRec
ljUserVos.setCount(userListss.size()); ljUserVos.setCount(userListss.size());
if (ObjectUtils.isNotEmpty(ljUserVos.getCountAll()) && ObjectUtils.isNotEmpty(ljUserVos.getCount()) && ljUserVos.getCountAll()!=0){ if (ObjectUtils.isNotEmpty(ljUserVos.getCountAll()) && ObjectUtils.isNotEmpty(ljUserVos.getCount()) && ljUserVos.getCountAll()!=0){
ljUserVos.setRate(ljUserVos.getCount()/ljUserVos.getCountAll() + "%"); ljUserVos.setRate((ljUserVos.getCount()/ljUserVos.getCountAll())*100 + "%");
} }
ljUserVosList.add(ljUserVos); ljUserVosList.add(ljUserVos);
} }