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

生日有礼 已使用

Browse Source
This commit is contained in:
wangw
2025-12-12 16:06:24 +08:00
parent 19cf560476
commit 03f7452c41
4 changed files with 7 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,6 @@ import com.czg.market.dto.MkRewardCouponDTO;
import com.czg.market.dto.ShopCouponDTO;
import com.czg.market.entity.*;
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;
@@ -122,38 +121,12 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
Page<MkBirthdayGiftRecordVO> recordVOPage = birthdayGiftRecordService.pageAs(PageUtil.buildPage(), queryWrapper, MkBirthdayGiftRecordVO.class);
recordVOPage.getRecords().forEach(item -> {
item.setCouponList(new ArrayList<>());
item.setUsedCouponList(new ArrayList<>());
birthdayGiftRecordCouponService.list(new QueryWrapper().eq(MkBirthdayGiftRecordCoupon::getRecordId, item.getId())).forEach(info -> {
if ("give".equals(info.getType())) {
item.getCouponList().add(info);
} else {
item.getUsedCouponList().add(info);
}
});
List<MkBirthdayGiftRecordCoupon> list = birthdayGiftRecordCouponService.list(new QueryWrapper().eq(MkBirthdayGiftRecordCoupon::getRecordId, item.getId()));
item.setCouponList(list);
});
return recordVOPage;
}
@Override
public MkBirthdayGiftRecordSummaryVO summary(Long shopId, String key, LocalDateTime dateTime) {
QueryWrapper queryWrapper = new MyQueryWrapper()
.leftJoin(MkBirthdayGiftRecord.class).on(MkBirthdayGiftRecord::getId, MkBirthdayGiftRecordCoupon::getRecordId)
.select("sum( IF(type = 'give', num, 0)) as totalNum", "sum( IF(type = 'consume', num, 0)) as usedNum")
.eq(MkBirthdayGiftRecord::getMainShopId, shopId)
.leftJoin(ShopUser.class).on(ShopUser::getId, MkBirthdayGiftRecord::getShopUserId);
if (StrUtil.isNotBlank(key)) {
queryWrapper.and(and -> {
and.or(or -> {
or.like(ShopUser::getNickName, key);
}).or(or -> {
or.like(ShopUser::getPhone, key);
});
});
}
return birthdayGiftRecordCouponService.getOneAsOpt(queryWrapper, MkBirthdayGiftRecordSummaryVO.class).orElseGet(MkBirthdayGiftRecordSummaryVO::new);
}
@Override
public void deliver() {
DateTime now = DateUtil.date();