czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

积分扣除提醒

Browse Source
This commit is contained in:
gong
2025-12-11 10:05:15 +08:00
parent 70fadc41ff
commit d4bef8ab02
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AcUserMsgServiceImpl.java
View File

@@ -10,9 +10,7 @@ import com.czg.utils.PageUtil;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.annotation.DubboService;
import org.springframework.stereotype.Service;
import java.util.List;

12
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java
View File

@@ -22,13 +22,13 @@ import com.czg.market.service.*;
import com.czg.market.vo.MkBirthdayGiftRecordSummaryVO;
import com.czg.market.vo.MkBirthdayGiftRecordVO;
import com.czg.market.vo.MkBirthdayGiftVO;
import com.czg.service.market.mapper.MkBirthdayGiftMapper;
import com.czg.utils.FunUtils;
import com.czg.utils.MyQueryWrapper;
import com.czg.utils.PageUtil;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.czg.service.market.mapper.MkBirthdayGiftMapper;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
@@ -41,7 +41,6 @@ import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAdjusters;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -105,8 +104,7 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
@Override
public Page<MkBirthdayGiftRecordVO> getRecord(Long shopId, String key, LocalDateTime dateTime) {
QueryWrapper queryWrapper = new MyQueryWrapper()
.selectAll(MkBirthdayGiftRecord.class)
QueryWrapper queryWrapper = new QueryWrapper().select()
.select(ShopUser::getNickName, ShopUser::getPhone)
.eq(MkBirthdayGiftRecord::getMainShopId, shopId)
.leftJoin(ShopUser.class).on(ShopUser::getId, MkBirthdayGiftRecord::getShopUserId);
@@ -266,13 +264,9 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
if (StrUtil.isNotBlank(shopUser.getBirthDay())) {
try {
boolean isInRange = false;
// 如果生日在范围内，返回优惠券列表
if ((thisYearBirthday.isEqual(startDate) || thisYearBirthday.isAfter(startDate))
&& (thisYearBirthday.isEqual(endDate) || thisYearBirthday.isBefore(endDate))) {
isInRange = true;
}
// 如果生日在范围内，返回优惠券列表
if (isInRange) {
shopUserService.updateById(new ShopUser().setId(shopUser.getId()).setBirthDayRemind(1));
return buildCouponList(config);
}

7
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsUserServiceImpl.java
View File

@@ -155,8 +155,11 @@ public class MkPointsUserServiceImpl extends ServiceImpl<MkPointsUserMapper, MkP
.setSourceType("order")
.setType("points")
.setReadStatus(0)
.setTitle("积分到账")
.setContent(StrUtil.format("积分到账提醒：{} 积分已成功存储你的账户，可用于兑换好物、抵扣消费，快来解锁权益！", points));
.setTitle(points > 0 ? "积分到账" : "积分扣除")
.setContent(StrUtil.format("{}提醒：{} 积分已成功{}，积分可用于兑换好物、抵扣消费，快来解锁权益！",
points > 0 ? "积分到账" : "积分扣除",
points,
points > 0 ? "存储你的账户" : "使用"));
acUserMsgService.addUserMsg(msg);
return record.getId();