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-11 17:11:47 +08:00
parent 47c9ffc2d9
commit 80f87ca256
7 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -840,7 +840,8 @@ export default {
lookDetail(row){
this.opendetails = true
let data = {
id:row.id
id:row.id,
exchangeFrom:"消费有礼"
}
looklook(data).then(res=>{
if(res.data){

3
fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
View File

@ -840,7 +840,8 @@ export default {
lookDetail(row){
this.opendetails = true
let data = {
id:row.id
id:row.id,
exchangeFrom:"新人有礼"
}
looklook(data).then(res=>{
this.looklist = res.data

3
fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
View File

@ -1053,7 +1053,8 @@ export default {
lookDetail(row){
this.opendetails = true
let data = {
id:row.id
id:row.id,
exchangeFrom:"推荐有礼"
}
looklook(data).then(res=>{
this.looklist = res.data

11
fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue
View File

@ -123,7 +123,7 @@
</el-form-item>
<el-form-item label="不活跃用户" prop="days">
<div style="display: flex;align-items: center">
<el-input-number v-model="form.days" @blur="change(form.gradeIds)" :min="1" :max="999" label="描述文字"></el-input-number>
<el-input-number v-model="form.days" @blur="change(form.gradeIds)" @change="change(form.gradeIds)" :min="1" :max="999" label="描述文字"></el-input-number>
<div style="margin-left: 5px">天 <span style="color: red">(查找最近N天未进行消费的用户)</span> </div>
</div>
</el-form-item>
@ -623,12 +623,13 @@ export default {
this.listUserGrade()
},
methods: {
lookDetail(row){
async lookDetail(row){
this.opendetails = true
let data = {
id:row.id
id:row.id,
exchangeFrom:"店铺一键送券！"
}
looklook(data).then(res=>{
await looklook(data).then(res=>{
if(res.data){
this.looklist = res.data
}
@ -636,7 +637,7 @@ export default {
console.log('详情',res)
})
looklooklook(row.id).then(resp=>{
await looklooklook(row.id).then(resp=>{
if( resp.data){
this.statisticsyou = resp.data
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/entity/ActiveConsumption.java
View File

@ -3,6 +3,7 @@ package com.fuint.business.marketingActivity.activeConsumption.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
@ -78,5 +79,8 @@ public class ActiveConsumption extends Model<ActiveConsumption> {
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
//描述信息
@TableField(exist = false)
private String exchangeFrom;
}

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

@ -46,6 +46,7 @@ public class ActiveConsumptionChildServiceImpl extends ServiceImpl<ActiveConsump
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
LambdaQueryWrapper<CardFavorableRecord> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CardFavorableRecord::getActiveId, activeConsumption.getId());
queryWrapper.eq(CardFavorableRecord::getExchangeFrom, activeConsumption.getExchangeFrom());
queryWrapper.eq(CardFavorableRecord::getStoreId, nowAccountInfo.getStoreId());
if (ObjectUtils.isNotEmpty(activeConsumption.getActiveStartTime()) && ObjectUtils.isNotEmpty(activeConsumption.getActiveEndTime())){
queryWrapper.between(CardFavorableRecord::getCreateTime, activeConsumption.getActiveStartTime(), activeConsumption.getActiveEndTime());

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

@ -379,6 +379,7 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl<CardFavorableRec
if (CollectionUtils.isNotEmpty(ljUserVosList)){
for (LJUserVo ljUserVo : ljUserVosList) {
LJUser userInfo = userService.queryUserByUserId(ljUserVo.getId());
cardFavorableRecord.setActiveId(activeId);
cardFavorableRecord.setCardFavorableId(cardId);
cardFavorableRecord.setStoreId(nowAccountInfo.getStoreId());
cardFavorableRecord.setChainStorId(nowAccountInfo.getChainStoreId());
@ -409,6 +410,7 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl<CardFavorableRec
if (CollectionUtils.isNotEmpty(ljUserVosList)) {
for (LJUserVo ljUserVo : ljUserVosList) {
CardExchangeRecord cardExchangeRecord = new CardExchangeRecord();
cardExchangeRecord.setActiveId(activeId);
cardExchangeRecord.setCardExchangeId(exchangeCardId);
cardExchangeRecord.setStoreId(nowAccountInfo.getStoreId());
cardExchangeRecord.setMtUserId(ljUserVo.getId());