diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue index b2449058a..6bf07e664 100644 --- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue @@ -10,12 +10,12 @@ @keyup.enter.native="handleQuery" /> - - - - - - + + + + + + @@ -241,8 +241,8 @@ @@ -568,7 +568,7 @@ export default { activeFullminusList: [], // 表单参数 form: { - id:1, + id:"", tableDatas:[], courtesyReward:[], activeNewlywedsChildList:[], @@ -880,7 +880,8 @@ export default { this.form.activeNewlywedsChildList = this.form.tableDatas.concat(this.tableDatas); this.$refs["form"].validate(valid => { if (valid) { - if (this.form.id != null) { + console.log(this.form) + if (this.form.id) { updateActiveNewlyweds(this.form).then(response => { this.$modal.msgSuccess("修改成功"); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java index 9bd39092a..87961fe1d 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java @@ -671,6 +671,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); cardFuelRecord.setStoreId(nowAccountInfo.getStoreId()); List cardFuelRecordCounts = cardFuelRecordMapper.selectFuelRecordCount(cardFuelRecord); + int r =1; return cardFuelRecordCounts; } }