suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:新增小程序账户列表及流水接口

Browse Source
This commit is contained in:
wangff
2025-11-17 18:01:01 +08:00
parent f2a18f7893
commit f5283b783c
10 changed files with 300 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BillDTO.java Normal file
View File

@@ -0,0 +1,84 @@
package com.cool.store.dto.wallet;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2025/11/14 10:31
* @Version 1.0
*/
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class BillDTO {
/**
* 业务系统付款单号(如 CRM 单号)
*/
private String reqNo;
/**
* 交易Id（营帐通）
*/
private Long tradeId;
/**
* 交易编号（扫呗）
*/
private String outTradeNo;
/**
* 费用科目
*/
private Integer feeItemId;
/**
* 费用科目名称
*/
private String feeItemName;
/**
* 门店账户编号
*/
private String storeAccountNo;
/**
* 公司编号
*/
private String companyCode;
/**
* 公司账户编号
*/
private String companyAccountNo;
/**
* 提现银行卡
*/
private String withdrawalBankCradNo;
/**
* 提现银行卡户名
*/
private String withdrawalBankCradName;
/**
* 金额(元)
*/
private String amount;
/**
* 交易状态 1.成功 2.失败 3.处理中
*/
private Integer tradeStatus;
/**
* 交易类型 1.转账 2.提现
*/
private Integer tradeType;
/**
* 交易发起时间
*/
private String createTime;
}

75
coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BillPageDTO.java
View File

@@ -1,76 +1,23 @@
package com.cool.store.dto.wallet;
import com.cool.store.request.wallet.WalletBasicPageInfo;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2025/11/14 10:31
* @Version 1.0
* <p>
* 交易列表DTO
* </p>
*
* @author wangff
* @since 2025/11/17
*/
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class BillPageDTO {
private List<BillDTO> data;
/**
* 业务系统付款单号(如 CRM 单号)
*/
private String reqNo;
/**
* 交易Id（营帐通）
*/
private Long tradeId;
/**
* 交易编号（扫呗）
*/
private String outTradeNo;
/**
* 交易科目
*/
private Integer feeItemId;
/**
* 门店账户编号
*/
private String storeAccountNo;
/**
* 公司编号
*/
private String companyCode;
/**
* 公司账户编号
*/
private String companyAccountNo;
/**
* 提现银行卡
*/
private String withdrawalBankCradNo;
/**
* 提现银行卡户名
*/
private String withdrawalBankCradName;
/**
* 金额(元)
*/
private String amount;
/**
* 交易状态 1.成功 2.失败 3.处理中
*/
private Integer tradeStatus;
/**
* 交易类型 1.转账 2.提现
*/
private Integer tradeType;
private WalletBasicPageInfo page;
}

36
coolstore-partner-model/src/main/java/com/cool/store/request/wallet/AccountBillQueryRequest.java Normal file
View File

@@ -0,0 +1,36 @@
package com.cool.store.request.wallet;
import com.cool.store.common.PageBasicInfo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* <p>
* 交易流水查询Request
* </p>
*
* @author wangff
* @since 2025/11/17
*/
@Data
public class AccountBillQueryRequest extends PageBasicInfo {
@ApiModelProperty("门店id")
private Long shopId;
@ApiModelProperty("交易开始时间，不传查当月")
private Date beginDate;
@ApiModelProperty("交易结束时间")
private Date endDate;
@ApiModelProperty(value = "是否签约人账户 0 否 1 是")
private Integer isLegal;
@ApiModelProperty(value = "交易类型: 0.全部,1.支出 2.收入")
private Integer recordType;
@ApiModelProperty(value = "费用类型ID", required = true)
private Long feeItemId;
}

6
coolstore-partner-model/src/main/java/com/cool/store/request/wallet/BillPageRequest.java
View File

@@ -1,7 +1,10 @@
package com.cool.store.request.wallet;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author suzhuhong
@@ -9,6 +12,9 @@ import lombok.Data;
* @Version 1.0
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class BillPageRequest {
@ApiModelProperty(value = "门店ID", required = true)

40
coolstore-partner-model/src/main/java/com/cool/store/vo/wallet/AccountBillListVO.java Normal file
View File

@@ -0,0 +1,40 @@
package com.cool.store.vo.wallet;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* <p>
* 账户交易列表VO
* </p>
*
* @author wangff
* @since 2025/11/17
*/
@Data
public class AccountBillListVO {
@ApiModelProperty("交易Id（营帐通）")
private Long tradeId;
@ApiModelProperty("交易编号（扫呗）")
private String outTradeNo;
@ApiModelProperty("费用科目")
private Integer feeItemId;
@ApiModelProperty("费用科目名称")
private String feeItemName;
@ApiModelProperty("金额(元)")
private String amount;
@ApiModelProperty("交易发起时间")
private String createTime;
@ApiModelProperty("交易状态 1.成功 2.失败 3.处理中")
private Integer tradeStatus;
@ApiModelProperty("交易类型 1.转账 2.提现")
private Integer tradeType;
}

36
coolstore-partner-model/src/main/java/com/cool/store/vo/wallet/AccountInfoVO.java Normal file
View File

@@ -0,0 +1,36 @@
package com.cool.store.vo.wallet;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* <p>
* 账户信息VO
* </p>
*
* @author wangff
* @since 2025/11/17
*/
@Data
public class AccountInfoVO {
@ApiModelProperty(value = "账户状态 1:待提交 2:待鉴权 3:鉴权中 4:开通")
private Integer accountStatus;
@ApiModelProperty(value = "是否签约人账户 0 否 1 是")
private Integer isLegal;
@ApiModelProperty(value = "账户编号")
private String accountNo;
@ApiModelProperty(value = "账户名称")
private String accountName;
@ApiModelProperty(value = "结算银行卡号")
private String accountCardNo;
@ApiModelProperty(value = "开户支行名称")
private String bankName;
@ApiModelProperty(value = "账户余额")
private String totalAmount;
}