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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangw
2025-02-15 17:38:24 +08:00
parent 33d8baeace 3315bfbb28
commit 21ccd3e2e8
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java
View File

@@ -34,7 +34,6 @@ public class MyStpLogic extends StpLogic {
* @param isAdmin 是否为管理员账号
*/
public void login(Long id, Long shopId, boolean isManager, boolean isAdmin) {
super.login(id);
login(id);
if (isManager && shopId == null) {
throw new ApiNotPrintException("管理端登录必须传递店铺id");

4
cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserVipCardDTO.java
View File

@@ -21,5 +21,9 @@ public class ShopUserVipCardDTO {
* 用户余额
*/
private BigDecimal amount;
/**
* 店铺id
*/
private Long shopId;
}

7
cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java
View File

@@ -1,9 +1,6 @@
package com.czg.account.service;
import com.czg.account.dto.shopuser.ShopUserAddDTO;
import com.czg.account.dto.shopuser.ShopUserEditDTO;
import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO;
import com.czg.account.dto.shopuser.ShopUserSummaryDTO;
import com.czg.account.dto.shopuser.*;
import com.czg.account.entity.ShopUser;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.service.IService;
@@ -31,6 +28,6 @@ public interface ShopUserService extends IService<ShopUser> {
/**
* 获取小程序登录用户所有店铺会员信息
*/
Page<ShopUser> vipCard(long userInfoId);
Page<ShopUserVipCardDTO> vipCard(long userInfoId);
}