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

16
cash-api/market-server/src/main/java/com/czg/controller/admin/BirthdayGiftController.java
View File

@@ -1,11 +1,8 @@
package com.czg.controller.admin;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.czg.annotation.SaAdminCheckPermission;
import com.czg.market.dto.MkBirthdayGiftDTO;
import com.czg.market.service.MkBirthdayGiftService;
import com.czg.market.vo.MkBirthdayGiftRecordSummaryVO;
import com.czg.market.vo.MkBirthdayGiftRecordVO;
import com.czg.market.vo.MkBirthdayGiftVO;
import com.czg.resp.CzgResult;
@@ -56,19 +53,6 @@ public class BirthdayGiftController {
@GetMapping("/record")
public CzgResult<Page<MkBirthdayGiftRecordVO>> record(@RequestParam(required = false) LocalDateTime dateTime, @RequestParam(required = false) String key) {
return CzgResult.success(service.getRecord(StpKit.USER.getMainShopId(), key, dateTime));
// return null;
}
/**
* 记录获取
* @return 是否成功
*/
@SaAdminCheckPermission(parentName = "生日有礼",value = "birthdayGift:summary", name = "生日有礼概述")
@GetMapping("/summary")
public CzgResult<MkBirthdayGiftRecordSummaryVO> summary(@RequestParam(required = false) String dateTime, @RequestParam(required = false) String key) {
return CzgResult.success(service.summary(StpKit.USER.getMainShopId(), key, StrUtil.isNotBlank(dateTime) ? DateUtil.parseLocalDateTime(dateTime) : null));
// return null;
}
}

7
cash-common/cash-common-service/src/main/java/com/czg/market/service/MkBirthdayGiftService.java
View File

@@ -1,17 +1,14 @@
package com.czg.market.service;
import com.czg.market.dto.MkBirthdayGiftDTO;
import com.czg.market.entity.ShopCoupon;
import com.czg.market.vo.MkBirthdayGiftRecordSummaryVO;
import com.czg.market.entity.MkBirthdayGift;
import com.czg.market.vo.MkBirthdayGiftRecordVO;
import com.czg.market.vo.MkBirthdayGiftVO;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.service.IService;
import com.czg.market.entity.MkBirthdayGift;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
@@ -28,8 +25,6 @@ public interface MkBirthdayGiftService extends IService<MkBirthdayGift> {
Page<MkBirthdayGiftRecordVO> getRecord(Long shopId, String key, LocalDateTime dateTime);
MkBirthdayGiftRecordSummaryVO summary(Long shopId, String key, LocalDateTime dateTime);
void deliver();
ArrayList<Map<String, Object>> getInfo(long userId, Integer shopId);

8
cash-common/cash-common-service/src/main/java/com/czg/market/vo/MkBirthdayGiftRecordVO.java
View File

@@ -40,10 +40,10 @@ public class MkBirthdayGiftRecordVO implements Serializable {
*/
private List<MkBirthdayGiftRecordCoupon> couponList;
/**
* 已经使用的优惠券
*/
private List<MkBirthdayGiftRecordCoupon> usedCouponList;
// /**
// * 已经使用的优惠券
// */
// private List<MkBirthdayGiftRecordCoupon> usedCouponList;
/**
* 创建时间

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();