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

分销修改

Browse Source
This commit is contained in:
张松
2025-10-28 13:42:24 +08:00
parent f83945f8f5
commit 4b8fc8a15c
8 changed files with 60 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionWithdrawFlowDTO.java
View File

@@ -29,4 +29,6 @@ public class MkDistributionWithdrawFlowDTO implements Serializable {
@NotNull(message = "提现金额不为空")
@DecimalMin(value = "30", message = "提现金额不能小于30")
private BigDecimal amount;
}

8
cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionWithdrawFlow.java
View File

@@ -44,7 +44,7 @@ public class MkDistributionWithdrawFlow implements Serializable {
/**
* 店铺用户id
*/
private Long shopUserId;
private Long userId;
/**
* 提现金额
@@ -83,4 +83,10 @@ public class MkDistributionWithdrawFlow implements Serializable {
*/
private String status;
@Column(ignore = true)
private String nickName;
@Column(ignore = true)
private String phone;
}

2
cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java
View File

@@ -116,5 +116,5 @@ public interface MkDistributionUserService extends IService<MkDistributionUser>
Boolean withdraw(long userId, MkDistributionWithdrawFlowDTO withdrawFlowDTO);
Map<String, Object> withdrawDetail(long userId, Long shopId, Long id);
Map<String, Object> withdrawDetail(long userId, Long id);
}

5
cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionWithdrawFlowService.java
View File

@@ -1,6 +1,5 @@
package com.czg.market.service;
import com.czg.market.dto.MkDistributionWithdrawFlowDTO;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.service.IService;
import com.czg.market.entity.MkDistributionWithdrawFlow;
@@ -15,7 +14,7 @@ import java.time.LocalDateTime;
*/
public interface MkDistributionWithdrawFlowService extends IService<MkDistributionWithdrawFlow> {
Page<MkDistributionWithdrawFlow> pageInfo(long userId, Long shopId);
Page<MkDistributionWithdrawFlow> pageInfo(long userId);
Page<MkDistributionWithdrawFlowDTO> withdrawPageInfo(Long shopId, Long shopUserId, LocalDateTime startTime, LocalDateTime endTime, String key);
Page<MkDistributionWithdrawFlow> withdrawPageInfo(Long shopId, Long userId, LocalDateTime startTime, LocalDateTime endTime, String key);
}