From 1f3e9dc85399290910cde7149806323305544e0d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期六, 20 七月 2024 19:17:23 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponServiceImpl.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponServiceImpl.java
index 96880f7..4e80ed1 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponServiceImpl.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponServiceImpl.java
@@ -37,6 +37,7 @@
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
/**
* <p>
@@ -76,6 +77,7 @@
query.getCouponType())
.eq(StringUtils.isNotNull(query.getDistributionMethod()),
Coupon::getDistributionMethod, query.getDistributionMethod())
+ .orderByDesc(Coupon::getCreateTime)
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
if (StringUtils.isEmpty(page.getRecords())) {
return PageDTO.empty(page);
@@ -150,6 +152,7 @@
* @param dto 管理后台-优惠券数据传输对象
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public void updateCoupon(MgtCouponDTO dto) {
Coupon coupon = this.getById(dto.getId());
if (StringUtils.isNull(coupon)) {
@@ -158,6 +161,8 @@
coupon.setCouponName(dto.getCouponName());
coupon.setDescription(dto.getDescription());
this.updateById(coupon);
+ couponMemberService.lambdaUpdate().set(CouponMember::getDescription, dto.getDescription())
+ .eq(CouponMember::getCouponId, dto.getId()).update();
}
/**
@@ -182,6 +187,10 @@
public PageDTO<CouponReceiveDetailVO> getReceiveDetail(MgtCouponReceiveQuery query) {
MemberDTO memberDTO = getMemberQueryParam(query);
Set<Long> memberIdSet = getMemberIdSet(memberDTO);
+ if ((StringUtils.isNotBlank(query.getNickname()) || StringUtils.isNotBlank(
+ query.getPhone())) && CollUtils.isEmpty(memberIdSet)) {
+ return PageDTO.empty(0L, 0L);
+ }
Page<CouponMember> page = couponMemberService.lambdaQuery()
.eq(StringUtils.isNotNull(query.getCouponStatus()),
CouponMember::getCouponStatus, query.getCouponStatus())
--
Gitblit v1.7.1