From 10f1422bc8f401b06b1e55ee63b23016d74abce8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 28 二月 2024 11:34:09 +0800
Subject: [PATCH] 优化商户发券逻辑
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java
index a504cac..f2c2a80 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java
@@ -86,7 +86,7 @@
}
// 获取查询结果
BirthdayCard birthdayCardOld = this.getOne(queryWrapper,false);
- // 如果查询结果不为空，则进行更新操作
+ // 如果查询结果不为空，则进行更新为历史记录
if (birthdayCardOld!=null) {
// 设置删除标志为1
birthdayCardOld.setDelFlag(1);
@@ -424,14 +424,14 @@
birthdayCard.setCreateTime(new Date());
birthdayCard.setCreateUserId(merBirthdayEditDto.getUserId());
}
- birthdayCard.setCardStatus(merBirthdayEditDto.getCardStatus());
- this.saveOrUpdate(birthdayCard);
List<BirthdayGift> birthdayGiftList = birthdayGiftService.listByCardId(birthdayCard.getCardId());
if(merBirthdayEditDto.getCardStatus()==1){
if(birthdayGiftList==null||birthdayGiftList.isEmpty()){
throw new ServiceException(AppErrorConstant.BIRTHDAYCARD_NO_GIFT);
}
}
+ birthdayCard.setCardStatus(merBirthdayEditDto.getCardStatus());
+ this.saveOrUpdate(birthdayCard);
}
/**
--
Gitblit v1.7.1