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

消费赠券领取详情

This commit is contained in:
wangw 2025-10-11 11:50:21 +08:00
parent b1e5427561
commit 1d36efdfe8
3 changed files with 49 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,6 +136,18 @@ public class ACouponController {
return CzgResult.success(data);
}
/**
* 消费赠券已领取详情
*/
@GetMapping("/consumerRecord")
public CzgResult<Page<MkShopCouponRecordDTO>> getConsumerRecord(
@RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime,
MkShopCouponRecordDTO param) {
Page<MkShopCouponRecordDTO> data = couponRecordService.getConsumerRecord(param, startTime, endTime);
return CzgResult.success(data);
}
/**
* 优惠券列表/已领取详情
*/

4
cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java
View File

@ -32,6 +32,10 @@ public interface MkShopCouponRecordService extends IService<MkShopCouponRecord>
* 优惠券列表/已领取详情
*/
Page<MkShopCouponRecordDTO> getRecord(MkShopCouponRecordDTO param, String startTime, String endTime);
/**
* 消费赠券已领取详情
*/
Page<MkShopCouponRecordDTO> getConsumerRecord(MkShopCouponRecordDTO param, String startTime, String endTime);
Page<MkShopCouponRecordDTO> getRecordByShopUser(MkShopCouponRecordDTO param, String startTime, String endTime);
/**

42
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java
View File

@ -82,7 +82,6 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
@Override
public Page<MkShopCouponRecordDTO> getRecord(MkShopCouponRecordDTO mkShopCouponRecordDTO, String startTime, String endTime) {
Map<Long, UserInfo> userInfoMap = new HashMap<>();
AssertUtil.isNull(mkShopCouponRecordDTO.getCouponId(), "优惠券Id不能为空");
ShopCoupon coupon = couponService.selectOneById(mkShopCouponRecordDTO.getCouponId());
AssertUtil.isNull(coupon, "优惠券不存在");
@ -112,13 +111,39 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
recordQueryWrapper.eq(MkShopCouponRecord::getUserId, mkShopCouponRecordDTO.getUserId());
}
Page<MkShopCouponRecordDTO> recordPage = pageAs(PageUtil.buildPage(), recordQueryWrapper, MkShopCouponRecordDTO.class);
if (CollUtil.isNotEmpty(userInfoMap)) {
for (MkShopCouponRecordDTO record : recordPage.getRecords()) {
UserInfo userInfo = userInfoMap.get(record.getUserId());
record.setHeadImg(userInfo.getHeadImg());
record.setNickName(userInfo.getNickName());
}
} else if (mkShopCouponRecordDTO.getUserId() != null) {
if (mkShopCouponRecordDTO.getUserId() != null) {
UserInfo userInfo = userInfoService.getById(mkShopCouponRecordDTO.getUserId());
for (MkShopCouponRecordDTO record : recordPage.getRecords()) {
record.setHeadImg(userInfo.getHeadImg());
record.setNickName(userInfo.getNickName());
}
} else {
for (MkShopCouponRecordDTO record : recordPage.getRecords()) {
UserInfo userInfo = userInfoService.getById(record.getUserId());
record.setHeadImg(userInfo.getHeadImg());
record.setNickName(userInfo.getNickName());
}
}
return recordPage;
}
@Override
public Page<MkShopCouponRecordDTO> getConsumerRecord(MkShopCouponRecordDTO mkShopCouponRecordDTO, String startTime, String endTime) {
QueryWrapper recordQueryWrapper = new QueryWrapper();
AssertUtil.isNull(mkShopCouponRecordDTO.getSourceId(), "消费赠券Id不能为空");
recordQueryWrapper.eq(MkShopCouponRecord::getShopId, mkShopCouponRecordDTO.getShopId())
.eq(MkShopCouponRecord::getIsDel, 0)
.eq(MkShopCouponRecord::getStatus, mkShopCouponRecordDTO.getStatus())
.eq(MkShopCouponRecord::getSource, "消费赠券")
.eq(MkShopCouponRecord::getSourceId, mkShopCouponRecordDTO.getSourceId())
.orderBy(MkShopCouponRecord::getCreateTime).desc();
if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)) {
recordQueryWrapper.between(MkShopCouponRecord::getCreateTime, startTime, endTime);
}
if (mkShopCouponRecordDTO.getUserId() != null) {
recordQueryWrapper.eq(MkShopCouponRecord::getUserId, mkShopCouponRecordDTO.getUserId());
}
Page<MkShopCouponRecordDTO> recordPage = pageAs(PageUtil.buildPage(), recordQueryWrapper, MkShopCouponRecordDTO.class);
if (mkShopCouponRecordDTO.getUserId() != null) {
UserInfo userInfo = userInfoService.getById(mkShopCouponRecordDTO.getUserId());
for (MkShopCouponRecordDTO record : recordPage.getRecords()) {
record.setHeadImg(userInfo.getHeadImg());
@ -133,7 +158,6 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
}
return recordPage;
}
@Override
public Page<MkShopCouponRecordDTO> getRecordByShopUser(MkShopCouponRecordDTO mkShopCouponRecordDTO, String startTime, String endTime) {