fix:建店时候调用创建门店接口;流水接口新增收入支出字段;新增账户详情接口、交易详情接口

This commit is contained in:
wangff
2025-11-19 16:23:14 +08:00
parent 2335ecca4c
commit ff9be4e61b
12 changed files with 213 additions and 49 deletions

View File

@@ -20,4 +20,14 @@ public class BillPageDTO {
private List<BillDTO> pageData;
private WalletBasicPageInfo page;
/**
* 收入
*/
private Long getAmount;
/**
* 支出
*/
private Long useAmount;
}

View File

@@ -23,8 +23,6 @@ public class AccountBatchQueryRequest {
@ApiModelProperty(value = "门店id")
private String outStoreId;
private Integer walletType;
@ApiModelProperty(value = "分页信息",required = true)
private WalletBasicPageInfo page;

View File

@@ -0,0 +1,21 @@
package com.cool.store.request.wallet;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* <p>
* 账户查询Request
* </p>
*
* @author wangff
* @since 2025/11/19
*/
@Data
public class AccountQueryRequest extends StoreShopRequest {
@ApiModelProperty("钱包类型 1平安 2网商")
private Integer walletType;
@ApiModelProperty("账户编号")
private String accountNo;
}

View File

@@ -18,7 +18,4 @@ public class StoreShopRequest {
@ApiModelProperty("门店id两者取一")
private String storeId;
@ApiModelProperty("钱包类型 1平安 2网商")
private Integer walletType;
}

View File

@@ -0,0 +1,40 @@
package com.cool.store.vo.wallet;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Objects;
/**
* <p>
* 账户交易列表分页VO
* </p>
*
* @author wangff
* @since 2025/11/19
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class AccountBillPageVO {
@ApiModelProperty("分页数据")
PageInfo<AccountBillListVO> data;
@ApiModelProperty("收入")
private BigDecimal getAmount;
@ApiModelProperty("支出")
private BigDecimal useAmount;
public AccountBillPageVO(PageInfo<AccountBillListVO> data, Long getAmount, Long useAmount) {
this.data = data;
BigDecimal denominator = new BigDecimal(100);
this.getAmount = new BigDecimal(Objects.nonNull(getAmount) ? getAmount : 0).divide(denominator, 2, RoundingMode.HALF_UP);
this.useAmount = new BigDecimal(Objects.nonNull(useAmount) ? useAmount : 0).divide(denominator, 2, RoundingMode.HALF_UP);
}
}