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-05 17:23:56 +08:00
parent d19c85799c
commit fe6e21cde9
3 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,8 +2,8 @@ package com.czg.controller.admin;
import com.czg.annotation.SaAdminCheckPermission;
import com.czg.market.dto.ChatCouponDTO;
import com.czg.market.dto.MkShopCouponRecordDTO;
import com.czg.market.entity.ChatCoupon;
import com.czg.market.entity.MkShopCouponRecord;
import com.czg.market.service.ChatCouponService;
import com.czg.market.vo.ChatCouponVO;
import com.czg.resp.CzgResult;
@@ -65,7 +65,7 @@ public class AChatCouponController {
*/
@GetMapping("/record")
@SaAdminCheckPermission(value = "chat:coupon:record", name = "群聊优惠券活动-发放记录")
public CzgResult<Page<MkShopCouponRecord>> grantChatCouponRecord(@RequestParam Long id,
public CzgResult<Page<MkShopCouponRecordDTO>> grantChatCouponRecord(@RequestParam Long id,
@RequestParam(required = false) Integer status,
@RequestParam(required = false, defaultValue = "1") Integer page,
@RequestParam(required = false, defaultValue = "10") Integer size) {

6
cash-common/cash-common-service/src/main/java/com/czg/market/service/ChatCouponService.java
View File

@@ -1,11 +1,11 @@
package com.czg.market.service;
import com.czg.market.dto.ChatCouponDTO;
import com.czg.market.entity.MkShopCouponRecord;
import com.czg.market.dto.MkShopCouponRecordDTO;
import com.czg.market.entity.ChatCoupon;
import com.czg.market.vo.ChatCouponVO;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.service.IService;
import com.czg.market.entity.ChatCoupon;
/**
* 服务层。
@@ -38,5 +38,5 @@ public interface ChatCouponService extends IService<ChatCoupon> {
/**
* 分页查询优惠券发放记录
*/
Page<MkShopCouponRecord> grantChatCouponRecord(Long id, Integer status, Integer page, Integer size);
Page<MkShopCouponRecordDTO> grantChatCouponRecord(Long id, Integer status, Integer page, Integer size);
}

21
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java
View File

@@ -6,17 +6,18 @@ import com.czg.account.service.ShopUserService;
import com.czg.exception.CzgException;
import com.czg.market.dto.ChatCouponDTO;
import com.czg.market.dto.MkShopCouponGiftDTO;
import com.czg.market.dto.MkShopCouponRecordDTO;
import com.czg.market.entity.ChatCoupon;
import com.czg.market.entity.MkShopCouponRecord;
import com.czg.market.entity.ShopCoupon;
import com.czg.market.service.ChatCouponService;
import com.czg.market.service.MkShopCouponRecordService;
import com.czg.market.service.ShopCouponService;
import com.czg.market.vo.ChatCouponVO;
import com.czg.service.market.mapper.ChatCouponMapper;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.czg.market.entity.ChatCoupon;
import com.czg.market.service.ChatCouponService;
import com.czg.service.market.mapper.ChatCouponMapper;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
@@ -38,6 +39,8 @@ public class ChatCouponServiceImpl extends ServiceImpl<ChatCouponMapper, ChatCou
private MkShopCouponRecordService recordService;
@DubboReference
private ShopUserService shopUserService;
// @DubboReference
// private UserInfoService userInfoService;
@Override
@@ -147,12 +150,18 @@ public class ChatCouponServiceImpl extends ServiceImpl<ChatCouponMapper, ChatCou
}
@Override
public Page<MkShopCouponRecord> grantChatCouponRecord(Long id, Integer status, Integer page, Integer size) {
return recordService.pageAs(Page.of(page, size),
public Page<MkShopCouponRecordDTO> grantChatCouponRecord(Long id, Integer status, Integer page, Integer size) {
Page<MkShopCouponRecordDTO> recordPage = recordService.pageAs(Page.of(page, size),
QueryWrapper.create()
.eq(MkShopCouponRecord::getSourceId, id)
.eq(MkShopCouponRecord::getStatus, status)
.orderBy(MkShopCouponRecord::getId).desc(),
MkShopCouponRecord.class);
MkShopCouponRecordDTO.class);
for (MkShopCouponRecordDTO record : recordPage.getRecords()) {
ShopUser userInfo = shopUserService.getById(record.getShopUserId());
record.setHeadImg(userInfo.getHeadImg());
record.setNickName(userInfo.getNickName());
}
return recordPage;
}
}