Merge remote-tracking branch 'origin/master'

This commit is contained in:
Tankaikai
2025-03-17 13:49:08 +08:00
11 changed files with 72 additions and 40 deletions

View File

@@ -0,0 +1,14 @@
package com.czg.account.dto.shopuser;
import com.czg.account.entity.ShopUser;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* @author Administrator
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class ShopUserDTO extends ShopUser {
private Long couponNum;
}

View File

@@ -14,7 +14,7 @@ import com.mybatisflex.core.service.IService;
*/
public interface ShopUserService extends IService<ShopUser> {
Page<ShopUser> getPage(String key, Integer isVip);
Page<ShopUserDTO> getPage(String key, Integer isVip);
Boolean updateInfo(Long shopId, ShopUserEditDTO shopUserEditDTO);
@@ -39,4 +39,6 @@ public interface ShopUserService extends IService<ShopUser> {
boolean join(Long shopId, Long userId, ShopUserAddDTO shopUserAddDTO);
ShopUserDetailDTO getInfo(Long shopId, long userId);
ShopUser getDetail(Integer id, Integer userId);
}