diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue index 528b626ff..449a09161 100644 --- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue @@ -1116,13 +1116,12 @@ export default { const id = row.id || this.ids getActiveConsumption(id).then(response => { 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.tableData1 = response.data.activeConsumptionChildList.filter(item => item.activeGift == '1') this.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '2') this.form.shiwudata = response.data.activeConsumptionChildList.filter(item => item.activeGift == '4') } - this.open = true; this.title = "修改消费有礼活动"; }); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java index 4ecd88a1e..a8459f200 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java @@ -131,12 +131,12 @@ public class ActiveOneCouponServiceImpl extends ServiceImpl records = page1.getRecords(); ArrayList activeOneCouponVOArrayList = new ArrayList<>(); - ArrayList userList = new ArrayList<>(); for (ActiveOneCoupon record : records) { ActiveOneCouponVO activeOneCouponVO = new ActiveOneCouponVO(); BeanUtils.copyProperties(record, activeOneCouponVO); String gradeIds = record.getGradeId(); //会员存量 + ArrayList userList = new ArrayList<>(); String[] gradeId = gradeIds.split(","); for (String s : gradeId) { LJUserVos ljUserVos = new LJUserVos(); @@ -151,7 +151,7 @@ public class ActiveOneCouponServiceImpl extends ServiceImpl userListss = userService.getUserLists(ljUserVo); ljUserVos.setCount(userListss.size()); 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); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java index b7d98f98b..757cb3e0f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java @@ -454,7 +454,7 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl