+ * 订单表 前端控制器 + *
+ * + * @author yyb + * @since 2025-07-23 + */ +@Api(tags = "v2版本--订单控制器") +@RestController +@RequestMapping("/v2/order/info") +public class LeaseOrderInfoV2Controller { + + + @Resource + private LeaseOrderInfoService leaseOrderInfoService; + + @ApiOperation("算法币种选择框：购物车结算获取选中矿机支持的算法和币种列表") + @PostMapping("/getMachineSupportCoinAndAlgorithm") + public Result+ * 商品表对应的物品机器表 前端控制器 + *
+ * + * @author yyb + * @since 2025-07-23 + */ +@Api(tags = "v2版本--矿机控制器类") +@RestController +@RequestMapping("/v2/product/machine") +public class LeaseProductMachineV2Controller { + + + @Resource + private LeaseMachineService leaseMachineService; + + @ApiOperation("商城首页---店铺列表") + @PostMapping("/getShopList") + public PageResult+ * 店铺表 前端控制器 + *
+ * + * @author yyb + * @since 2025-08-05 + */ +@Api(tags = "v2版本--店铺控制器") +@RestController +@RequestMapping("/v2/shop") +public class LeaseShopV2Controller { + + @Resource + private LeaseShopService leaseShopService; + + /** + * 根据店铺id 查询配置信息列表 + * @param baseVo + * @return 操作结果 + */ + @ApiOperation("钱包配置----根据店铺id查询收款钱包绑定信息列表") + @PostMapping("/getShopConfigV2") + public Result+ * 购物车表 前端控制器 + *
+ * + * @author yyb + * @since 2025-07-23 + */ +@Api(tags = "v2版本---购物车表控制器") +@RestController +@RequestMapping("/v2/shopping/cart") +public class LeaseShoppingCartV2Controller { + + @Resource + private LeaseShoppingCartService leaseShoppingCartService; + + @ApiOperation("添加商品到购物车(批量+单个)") + @PostMapping("/addGoodsV2") + public Result* 店铺表 @@ -54,4 +56,8 @@ public class ShopDto { */ @ApiModelProperty(value = "逻辑删除字段") private Boolean del; + + + @ApiModelProperty(value = "店铺手续费比例 范围0.01-0.1",example = "0.01") + private BigDecimal feeRate; } diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/dto/TableHeadersDto.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/dto/TableHeadersDto.java new file mode 100644 index 0000000..9409807 --- /dev/null +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/dto/TableHeadersDto.java @@ -0,0 +1,66 @@ +package com.m2pool.lease.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description 表头信息 + * @Date 2025/11/28 13:31 + * @Author yyb + */ +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(description = "表头信息",value = "TableHeadersDto" ) +public class TableHeadersDto { + + /** + * 动态列第几列 + */ + @ApiModelProperty(value = "动态列第几列") + private String key; + + /** + * 列名 + */ + @ApiModelProperty(value = "列名") + private String label; + + /** + * 类型 text/amount/hashrate/days + */ + @ApiModelProperty(value = "类型 text/amount/hashrate/days") + private String type; + + /** + * 固定列 left/right/不传 + */ + @ApiModelProperty(value = "固定列 left/right/不传") + private String fixed; + + @ApiModelProperty(value = "价格单位") + private String currency; + + @ApiModelProperty(value = "时间间隔") + private String period; + + /** + * 算力单位 + */ + @ApiModelProperty(value = "算力单位") + private String unit; + + @ApiModelProperty(value = "图标") + private String icon; + + /** + * 宽度 + */ + @ApiModelProperty(value = "宽度") + private Integer width; +} diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/dto/v2/AlgorithmShopIdMapDto.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/dto/v2/AlgorithmShopIdMapDto.java new file mode 100644 index 0000000..8f134c6 --- /dev/null +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/dto/v2/AlgorithmShopIdMapDto.java @@ -0,0 +1,30 @@ +package com.m2pool.lease.dto.v2; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + *
+ * 商品列表分页请求对象 + *
+ * + * @author yyb + * @since 2025-07-23 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(description = "商品对应算法",value = "AlgorithmShopIdMapDto" ) +public class AlgorithmShopIdMapDto { + + + @ApiModelProperty(value = "店铺id",example = "1") + private Long shopId; + + @ApiModelProperty(value = "算法") + private String algorithm; + +} diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/dto/v2/AsicCoinAndAlgoDto.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/dto/v2/AsicCoinAndAlgoDto.java new file mode 100644 index 0000000..2204246 --- /dev/null +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/dto/v2/AsicCoinAndAlgoDto.java @@ -0,0 +1,44 @@ +package com.m2pool.lease.dto.v2; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + *+ * 机器参数请求对象 + *
+ * + * @author yyb + * @since 2025-07-23 + */ +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(description = "asic 矿机新增 算力,币种返回对象",value = "AsicCoinAndAlgoDto" ) +public class AsicCoinAndAlgoDto { + + @ApiModelProperty(value = "币种算力配置id") + private Long coinAndPowerId; + + @ApiModelProperty(value = "矿机id（忽略）") + private Long productMachineId; + + @ApiModelProperty(value = "币种（多个逗号隔开）") + private String coin; + + @ApiModelProperty(value = "算法（多个逗号隔开）") + private String algorithm; + + @ApiModelProperty(value = "理论算力）",example = "0.01") + private BigDecimal theoryPower; + + @ApiModelProperty(value = "商品机器单机算力单位",example = "TH/S") + private String unit; +} diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/dto/v2/CartMachineInfoDto.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/dto/v2/CartMachineInfoDto.java new file mode 100644 index 0000000..3b7d1f2 --- /dev/null +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/dto/v2/CartMachineInfoDto.java @@ -0,0 +1,108 @@ +package com.m2pool.lease.dto.v2; + +import com.m2pool.lease.dto.MachinePayTypeDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.util.List; + +/** + *+ * 商品对应实际商品返回对象 + *
+ * + * @author yyb + * @since 2025-07-23 + */ +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(description = "购物车列表返回对象",value = "CartMachineInfoDto" ) +public class CartMachineInfoDto{ + + @ApiModelProperty(value = "矿机ID") + private Long id; + + @ApiModelProperty(value = "购物车详情id") + private Long cartInfoId; + + @ApiModelProperty(value = "店铺id") + private Long shopId; + + @ApiModelProperty(value = " gpu名称型号 或asic 名称型号") + private String name; + + @ApiModelProperty(value = "矿工账号 (gpu)") + private String user; + + @ApiModelProperty(value = "矿机型号 0 ASIC 1 GPU") + private Integer type; + + @ApiModelProperty(value = "矿机编号(gpu)") + private String miner; + + + @ApiModelProperty(value = "上下架状态，0 上架，1 下架") + private Integer state; + + @ApiModelProperty(value = "售出状态 0未售出 1已售出") + private Integer saleState; + + + @ApiModelProperty(value = "最大可租借天数(默认七天)",example = "7") + private Integer maxLeaseDays; + + @ApiModelProperty(value = "是否删除 0否 1是") + private Integer del; + + + @ApiModelProperty(value = "最大月收益 usdt") + private BigDecimal monthIncome; + + @ApiModelProperty(value = "最大收益币种功耗 单位kw/h",example = "10") + private BigDecimal powerDissipation; + + @ApiModelProperty(value = "理论算力（卖方手动填写）") + private BigDecimal theoryPower; + + @ApiModelProperty(value = "最大收益币种算力单位") + private String unit; + + @ApiModelProperty(value = "最大收益币种算法") + private String algorithm; + + @ApiModelProperty(value = "售价") + private BigDecimal price; + + @ApiModelProperty(value = "最大收益对应币种") + private String coin; + + @ApiModelProperty(value = "租赁天数") + private Integer leaseTime; + + private Long configId; + + @ApiModelProperty(value = "支付币种") + private String payCoin; + + @ApiModelProperty(value = "asic 租赁数量") + private Integer numbers; + + @ApiModelProperty(value = "矿机客户端在离线情况 0 离线 1 在线") + private Boolean onlineStatus; + + @ApiModelProperty(value = "可售数量") + private Integer canSaleNumbers; + + @ApiModelProperty(value = "gpu和asic对应币种算力和月收益信息") + private List+ * 商品对应实际商品返回对象 + *
+ * + * @author yyb + * @since 2025-07-23 + */ +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(description = "gpu公共配置返回对象",value = "GpuConfigDto" ) +public class GpuConfigDto { + + + + @ApiModelProperty(value = "gpu名称/型号") + private String name; + + @ApiModelProperty(value = "gpu品牌") + private String brand; + + private Integer memory; + +} diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/dto/v2/MachineInfoDto.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/dto/v2/MachineInfoDto.java new file mode 100644 index 0000000..1391d5f --- /dev/null +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/dto/v2/MachineInfoDto.java @@ -0,0 +1,101 @@ +package com.m2pool.lease.dto.v2; + +import com.m2pool.lease.dto.MachinePayTypeDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +import java.math.BigDecimal; +import java.util.List; + +/** + *+ * 商品对应实际商品返回对象 + *
+ * + * @author yyb + * @since 2025-07-23 + */ +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(description = "矿机返回对象",value = "MachineInfoDto" ) +public class MachineInfoDto { + + + private Integer type; + + private BigDecimal theoryPower; + + + @ApiModelProperty(value = "矿机ID") + private Long id; + + @ApiModelProperty(value = "gpu名称 或asic 名称") + private String model; + + @ApiModelProperty(value = "矿机mac地址") + private String hostMac; + + @ApiModelProperty(value = "上下架状态，0 上架，1 下架") + private Integer state; + + @ApiModelProperty(value = "售出状态 0未售出 1已售出") + private Integer saleState; + + + @ApiModelProperty(value = "最大可租借天数(默认七天)",example = "7") + private Integer maxLeaseDays; + + @ApiModelProperty(value = "最大月收益 usdt") + private BigDecimal monthIncome; + + + @ApiModelProperty(value = "最大收益币种算法") + private String algorithm; + + @ApiModelProperty(value = "售价") + private BigDecimal price; + + @ApiModelProperty(value = "最大收益对应币种") + private String coin; + + @ApiModelProperty(value = "矿机客户端在离线情况 0 离线 1 在线") + private Boolean onlineStatus; + + @ApiModelProperty(value = "可出售机器数量") + private Integer saleNumbers; + + @ApiModelProperty(value = "已售出数量") + private Integer saleOutNumbers; + + //动态列名(方便前端显示) + private BigDecimal c1; + + private BigDecimal c2; + + private BigDecimal c3; + + private BigDecimal c4; + + private BigDecimal c5; + + private BigDecimal c6; + + private BigDecimal c7; + + private BigDecimal c8; + + private BigDecimal c9; + + private BigDecimal c10; + + + + //@ApiModelProperty(value = "币种动态列集合") + //private List+ * 余额提现返回对象 + *
+ * + * @author yyb + * @since 2025-09-10 + */ +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(description = "店铺钱包提现记录返回信息",value = "PayWithdrawSellerRecordDto" ) +public class PayWithdrawSellerRecordDto { + + private Long id; + + + + @ApiModelProperty(value = "用户充值地址") + private String fromAddress; + + @ApiModelProperty(value = "提现地址(用户自定义)") + private String toAddress; + + + @ApiModelProperty(value = "提现金额") + private BigDecimal amount; + + /** + * 币种 + */ + @ApiModelProperty(value = "币种") + private String symbol; + + /** + * 链名称 + */ + @ApiModelProperty(value = "链名称") + private String chain; + + /** + * 充值时间 + */ + @ApiModelProperty(value = "提现时间") + private LocalDateTime createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(value = "提现完成时间") + private LocalDateTime updateTime; + + /** + * 0 支付失败 1 支付成功 2 支付中 + */ + @ApiModelProperty(value = "记录状态 提现业务： 0 提现失败 1 提现成功 2 提现中 3 校验失败") + private Integer status; + + /** + * 交易hash + */ + @ApiModelProperty(value = "交易hash") + private String txHash; +} diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/dto/v2/PowerIncomeInfoDto.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/dto/v2/PowerIncomeInfoDto.java new file mode 100644 index 0000000..d7758fb --- /dev/null +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/dto/v2/PowerIncomeInfoDto.java @@ -0,0 +1,50 @@ +package com.m2pool.lease.dto.v2; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + *+ * 商品对应实际商品返回对象 + *
+ * + * @author yyb + * @since 2025-07-23 + */ +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(description = "gpu配置信息返回对象",value = "PowerIncomeInfoDto" ) +public class PowerIncomeInfoDto { + + @ApiModelProperty(value = "币种") + private String coin; + + //@ApiModelProperty(value = "算法") + //private String algorithm; + + @ApiModelProperty(value = "算力") + private BigDecimal power; + + @ApiModelProperty(value = "月收益") + private BigDecimal monthIncome; + + //@ApiModelProperty(value = "功耗") + //private BigDecimal powerDissipation; + + private Long machineId; + + @ApiModelProperty(value = "算力单位") + private String unit; + + @ApiModelProperty(value = "图标") + private String icon; + +} diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/dto/v2/SellerMachineInfoDto.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/dto/v2/SellerMachineInfoDto.java new file mode 100644 index 0000000..c875879 --- /dev/null +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/dto/v2/SellerMachineInfoDto.java @@ -0,0 +1,96 @@ +package com.m2pool.lease.dto.v2; + +import com.m2pool.lease.dto.MachinePayTypeDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +import java.math.BigDecimal; +import java.util.List; + +/** + *+ * 商品对应实际商品返回对象 + *
+ * + * @author yyb + * @since 2025-07-23 + */ +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(description = "卖家矿机列表返回对象",value = "SellerMachineInfoDto" ) +public class SellerMachineInfoDto { + + @ApiModelProperty(value = "矿机ID") + private Long id; + + @ApiModelProperty(value = "店铺id") + private Long shopId; + + @ApiModelProperty(value = "gpu名称 或asic 名称") + private String name; + + @ApiModelProperty(value = "矿机型号 0 ASIC 1 GPU") + private Integer type; + + @ApiModelProperty(value = "矿工账号 (gpu)") + private String user; + + @ApiModelProperty(value = "矿机编号(gpu)") + private String miner; + + @ApiModelProperty(value = "上下架状态，0 上架，1 下架") + private Integer state; + + @ApiModelProperty(value = "售出状态 0未售出 1已售出") + private Integer saleState; + + + @ApiModelProperty(value = "最大可租借天数(默认七天)",example = "7") + private Integer maxLeaseDays; + + @ApiModelProperty(value = "是否删除 0否 1是") + private Integer del; + + + @ApiModelProperty(value = "最大月收益 usdt") + private BigDecimal monthIncome; + + @ApiModelProperty(value = "最大收益币种功耗 单位kw/h",example = "10") + private BigDecimal powerDissipation; + + @ApiModelProperty(value = "最大收益币种算力(单机理论算力)") + private BigDecimal theoryPower; + + @ApiModelProperty(value = "最大收益币种算力单位") + private String unit; + + @ApiModelProperty(value = "最大收益币种算法") + private String algorithm; + + @ApiModelProperty(value = "售价") + private BigDecimal price; + + @ApiModelProperty(value = "最大收益对应币种") + private String coin; + + @ApiModelProperty(value = "可出售机器数量") + private Integer saleNumbers; + + @ApiModelProperty(value = "已售出数量") + private Integer saleOutNumbers; + + @ApiModelProperty(value = "矿机客户端在离线情况 0 离线 1 在线") + private Boolean onlineStatus; + + //@ApiModelProperty(value = "gpu和asic对应币种算力和月收益信息") + //private List+ * 购物车一层列表 + *
+ * + * @author yyb + * @since 2025-08-05 + */ +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(description = "购物车一层商铺列表返回对象V2",value = "ShopCartV2Dto") +public class ShopCartV2Dto { + + @ApiModelProperty(value = "店铺id") + private Long id; + @ApiModelProperty(value = "店铺名称") + private String name; + @ApiModelProperty(value = "店铺下机器总价") + private BigDecimal totalPrice; + @ApiModelProperty(value = "店铺下机器总数") + private Integer totalMachine; + + @ApiModelProperty(value = "总价集合") + private List+ * 商品对应实际商品返回对象 + *
+ * + * @author yyb + * @since 2025-07-23 + */ +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(description = "商城首页矿机返回对象",value = "ShopInfoDto" ) +public class ShopInfoDto { + + @ApiModelProperty(value = "店铺id") + private Long shopId; + + @ApiModelProperty(value = "店铺名称") + private String shopName; + + + @ApiModelProperty(value = "店铺图片") + private String image; + + @ApiModelProperty(value = "店铺描述") + private String description; + + @ApiModelProperty(value = "已售矿机数") + private Integer saleNumber; + + + @ApiModelProperty(value = "店铺售出矿机包含的类型 多个以逗号隔开",example = "gpu,asci") + private String type; + + @ApiModelProperty(value = "支持的挖矿币种",example = "NEXA,RXD") + private String coin; + + @ApiModelProperty(value = "算法 (多个算法已逗号隔开)",example = "sha256,sha512") + private String algorithm; + + @ApiModelProperty(value = "店铺支持的支付方式") + private List+ * 店铺钱包配置返回对象 + *
+ * + * @author yyb + * @since 2025-08-05 + */ +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(description = "店铺钱包配置返回对象",value = "ShopWalletInfoDto") +public class ShopWalletInfoDto extends BaseVo { + + + @ApiModelProperty(value = "商铺ID") + private Long shopId; + + @ApiModelProperty(value = "卖方对应收款钱包") + private String payAddress; + + @ApiModelProperty(value = "链") + private String chain; + + @ApiModelProperty(value = "商品支付方式及价格单位 取值 虚拟币( nexa rxd dgbo dgbq dgbs alph enx grs mona) 稳定币（usdt usdc busd）") + private String payCoin; + + @ApiModelProperty(value = "币种图片") + private String image; + + @ApiModelProperty(value = "余额") + private BigDecimal balance; + + @ApiModelProperty(value = "手续费") + private BigDecimal serviceCharge; +} diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseGpuConfig.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseGpuConfig.java new file mode 100644 index 0000000..40988f0 --- /dev/null +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseGpuConfig.java @@ -0,0 +1,64 @@ +package com.m2pool.lease.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.*; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *+ * GPU对应币种挖矿算力(只要gpu类型相同那么就使用这个配置) + *
+ * + * @author yyb + * @since 2025-11-27 + */ +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class LeaseGpuConfig implements Serializable { + + private static final long serialVersionUID=1L; + + /** + * id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * gpu品牌 + */ + private String brand; + + /** + * gpu 名称/型号 + */ + private String name; + + /** + * 0 禁用 1 启用 + */ + private Boolean status; + + /** + * 内存单位M + */ + private Integer memory; + + /** + * 功耗 单位kw/h + */ + private BigDecimal powerDissipation; + + /** + * 逻辑删除字段 + */ + private Boolean del; + + +} diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseMachine.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseMachine.java new file mode 100644 index 0000000..76ac1e9 --- /dev/null +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseMachine.java @@ -0,0 +1,120 @@ +package com.m2pool.lease.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.*; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + *+ * gpu类型出售矿机表 + *
+ * + * @author yyb + * @since 2025-11-21 + */ +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class LeaseMachine implements Serializable { + + private static final long serialVersionUID=1L; + + /** + * 主键ID + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 商铺ID + */ + private Long shopId; + + /** + * gpu 挖矿主机mac矿机编号 + */ + private String hostMac; + + /** + * 0 ASIC 1 GPU + */ + private Boolean type; + + + + /** + * 矿机最大租售天数 + */ + private Integer maxLeaseDays; + + + + /** + * 售出状态 0未售出 1已售出 + */ + private Boolean saleState; + + /** + * 上下架状态，0 上架，1 下架 + */ + private Boolean state; + + /** + * 逻辑删除字段 + */ + private Boolean del; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 更新时间 + */ + private LocalDateTime updateTime; + + /** + * 矿机客户端在离线情况 0 离线 1 在线 + */ + private Boolean onlineStatus; + + /** + * 挖矿机器 对应的矿工账号(mac地址代替) + */ + private String user; + + /** + * 挖矿机器编号(gpu编号) + */ + private String miner; + + /** + * asci 类型矿机租售的台数 + */ + private Integer saleNumbers; + + /** + * asci 类型矿机已租售的台数 + */ + private Integer saleOutNumbers; + + /** + * asci 类型矿机可租售的台数 + */ + private Integer canSaleNumbers; + + /** + * asci 类型矿机已锁定的台数 乐观锁 + */ + @TableField(exist = false) + private Integer lockNumbers; + +} diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseMachineConfig.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseMachineConfig.java new file mode 100644 index 0000000..099db1b --- /dev/null +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseMachineConfig.java @@ -0,0 +1,99 @@ +package com.m2pool.lease.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.*; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *+ * GPU对应币种挖矿算力(只要gpu类型相同那么就使用这个配置) + *
+ * + * @author yyb + * @since 2025-11-27 + */ +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class LeaseMachineConfig implements Serializable { + + private static final long serialVersionUID=1L; + + /** + * id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 机器id + */ + private Long machineId; + + /** + * gpu/asic品牌 + */ + private String brand; + + /** + * gpu 名称/型号 + */ + private String name; + + /** + * 内存单位M + */ + private Integer memory; + + /** + * 0 禁用 1 启用 + */ + private Boolean status; + + /** + * 支持的币种 + */ + private String coin; + + /** + * 算力 + */ + private BigDecimal hashrate; + + /** + * 算法 + */ + private String algorithm; + + /** + * 币种图片 + */ + private String icon; + + /** + * 算力单位 GH/s TH/s PH/s等 + */ + private String unit; + + /** + * 月收益usdt + */ + private BigDecimal monthIncome; + + /** + * 功耗 单位kw/h + */ + private BigDecimal powerDissipation; + + /** + * 逻辑删除字段 + */ + private Boolean del; + + +} diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseMachinePrice.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseMachinePrice.java new file mode 100644 index 0000000..9df1eb8 --- /dev/null +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseMachinePrice.java @@ -0,0 +1,59 @@ +package com.m2pool.lease.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.*; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *+ * 商品表对应的物品机器表 + *
+ * + * @author yyb + * @since 2025-11-25 + */ +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class LeaseMachinePrice implements Serializable { + + private static final long serialVersionUID=1L; + + /** + * 主键ID + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 矿机id + */ + private Long machineId; + + /** + * 实际单价 + */ + private BigDecimal price; + + /** + * 价值单位 + */ + private String coin; + + /** + * 链 + */ + private String chain; + + /** + * 逻辑删除字段 + */ + private Boolean del; + + +} diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseMiningSoftwareConfig.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseMiningSoftwareConfig.java new file mode 100644 index 0000000..1a0642f --- /dev/null +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseMiningSoftwareConfig.java @@ -0,0 +1,58 @@ +package com.m2pool.lease.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.*; + +import java.io.Serializable; + +/** + *+ * 挖矿软件公共配置表 + *
+ * + * @author yyb + * @since 2025-11-27 + */ +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class LeaseMiningSoftwareConfig implements Serializable { + + private static final long serialVersionUID=1L; + + /** + * id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 挖矿软件名 + */ + private String name; + + /** + * 挖矿软件支持的币种 + */ + private String coin; + + /** + * 算法 + */ + private String algorithm; + + /** + * 币种图片 + */ + private String icon; + + /** + * 逻辑删除字段 + */ + private Boolean del; + + +} diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseOrderItem.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseOrderItem.java index e157616..2a97d25 100644 --- a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseOrderItem.java +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseOrderItem.java @@ -168,6 +168,8 @@ public class LeaseOrderItem implements Serializable { */ private BigDecimal settlePayRealAmount; + private Integer numbers; + /** * 商品类型 0 矿机 1 算力 */ diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseOrderMining.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseOrderMining.java new file mode 100644 index 0000000..c37f6cf --- /dev/null +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseOrderMining.java @@ -0,0 +1,94 @@ +package com.m2pool.lease.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.*; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *+ * 挖矿中订单 + *
+ * + * @author yyb + * @since 2025-12-02 + */ +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class LeaseOrderMining implements Serializable { + + private static final long serialVersionUID=1L; + + /** + * id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 订单 ID + */ + private Long orderId; + + /** + * 币种 + */ + private String coin; + + /** + * 算法 + */ + private String algorithm; + + /** + * 矿池 + */ + private String pool; + + /** + * 挖矿地址 + */ + private String poolUrl; + + /** + * 矿工号 + */ + private String workerId; + + /** + * 收款钱包 + */ + private String walletAddress; + + /** + * 挖矿信息页面 + */ + private String watchUrl; + + /** + * 0 租约已到期 1挖矿中 2等待卖家矿机启动中 + */ + private Boolean status; + + /** + * 挖矿开始时间 + */ + private LocalDateTime startTime; + + /** + * 挖矿结束时间 + */ + private LocalDateTime endTime; + + /** + * 逻辑删除字段 + */ + private Boolean del; + + +} diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeasePayWithdrawMessage.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeasePayWithdrawMessage.java index 17cae9f..9f848b3 100644 --- a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeasePayWithdrawMessage.java +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeasePayWithdrawMessage.java @@ -31,6 +31,11 @@ public class LeasePayWithdrawMessage implements Serializable { @TableId(value = "id", type = IdType.AUTO) private Long id; + /** + * 店铺ID + */ + private Long shopId; + /** * 消息ID */ diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseProduct.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseProduct.java index aa90cee..36a0c16 100644 --- a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseProduct.java +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseProduct.java @@ -52,12 +52,6 @@ public class LeaseProduct implements Serializable { */ private Integer type; - /** - * 商品矿池类型 0 自营矿池 1 非自营矿池 - */ - private Integer poolType; - - /** * 上下架状态，0 上架，1 下架 */ diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseProductMachinePrice.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseProductMachinePrice.java index 77bee0e..ce17305 100644 --- a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseProductMachinePrice.java +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseProductMachinePrice.java @@ -33,6 +33,11 @@ public class LeaseProductMachinePrice implements Serializable { private Long productMachineId; + /** + * 0 自营矿池 1 非自营矿池(gpu 和asic) + */ + private Boolean type; + private BigDecimal price; private String coin; diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseShop.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseShop.java index ae53b46..304a4e6 100644 --- a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseShop.java +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseShop.java @@ -2,9 +2,11 @@ package com.m2pool.lease.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModelProperty; import lombok.*; import java.io.Serializable; +import java.math.BigDecimal; import java.time.LocalDateTime; /** @@ -30,6 +32,11 @@ public class LeaseShop implements Serializable { @TableId(value = "id", type = IdType.AUTO) private Long id; + /** + * 店铺唯一标识码 + */ + private String identityCode; + /** * 店铺拥有者邮箱 */ @@ -70,5 +77,11 @@ public class LeaseShop implements Serializable { */ private Boolean del; + private BigDecimal feeRate; + + /** + * 售出矿机数 + */ + private Integer saleNumber; } diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseShopConfig.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseShopConfig.java index eaa6d95..e7964d6 100644 --- a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseShopConfig.java +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseShopConfig.java @@ -72,6 +72,11 @@ public class LeaseShopConfig implements Serializable { */ private String qrcode; + /** + * 余额(这个余额是租赁系统的收款余额，而不是卖家钱包真实余额,该余额只能用于提现) + */ + private BigDecimal balance; + /** * 创建时间 */ diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseShoppingCartInfo.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseShoppingCartInfo.java index 94d7c72..0a51d10 100644 --- a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseShoppingCartInfo.java +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/entity/LeaseShoppingCartInfo.java @@ -30,11 +30,15 @@ public class LeaseShoppingCartInfo implements Serializable { @TableId(value = "id", type = IdType.AUTO) private Long id; + /** + * 用户ID + */ + private String userId; /** - * 购物车ID + * 商店ID */ - private Long cartId; + private Long shopId; /** * 商品 ID @@ -51,6 +55,11 @@ public class LeaseShoppingCartInfo implements Serializable { */ private Integer leaseTime; + /** + * ASIC 租售台数 + */ + private Integer numbers; + /** * 创建时间 */ @@ -61,5 +70,10 @@ public class LeaseShoppingCartInfo implements Serializable { */ private LocalDateTime updateTime; + /** + * 版本 0 旧版本 1 新版本 + */ + private Integer version; + } diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/exception/GlobalExceptionHandler.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/exception/GlobalExceptionHandler.java index c0d046f..8519630 100644 --- a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/exception/GlobalExceptionHandler.java +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/exception/GlobalExceptionHandler.java @@ -21,6 +21,11 @@ public class GlobalExceptionHandler { return Result.fail(e.getMessage()); } + @ExceptionHandler(MachineException.class) + public Result+ * GPU对应币种挖矿算力(只要gpu类型相同那么就使用这个配置) Mapper 接口 + *
+ * + * @author yyb + * @since 2025-11-27 + */ +@Mapper +public interface LeaseGpuConfigMapper extends BaseMapper+ * GPU对应币种挖矿算力(只要gpu类型相同那么就使用这个配置) Mapper 接口 + *
+ * + * @author yyb + * @since 2025-11-27 + */ +@Mapper +public interface LeaseMachineConfigMapper extends BaseMapper+ * gpu类型出售矿机表 Mapper 接口 + *
+ * + * @author yyb + * @since 2025-11-21 + */ +public interface LeaseMachineMapper extends BaseMapper+ * 商品表对应的物品机器表 Mapper 接口 + *
+ * + * @author yyb + * @since 2025-11-25 + */ +@Mapper +public interface LeaseMachinePriceMapper extends BaseMapper+ * 挖矿软件公共配置表 Mapper 接口 + *
+ * + * @author yyb + * @since 2025-11-27 + */ +public interface LeaseMiningSoftwareConfigMapper extends BaseMapper+ * 挖矿中订单 Mapper 接口 + *
+ * + * @author yyb + * @since 2025-12-02 + */ +public interface LeaseOrderMiningMapper extends BaseMapper