diff --git a/db/800pjcloudx_wallet.sql b/db/800pjcloudx_wallet.sql index 6e84d7e81..fe8f2a701 100644 --- a/db/800pjcloudx_wallet.sql +++ b/db/800pjcloudx_wallet.sql @@ -295,4 +295,57 @@ CREATE TABLE wallet_code_use tenant_id bigint DEFAULT NULL COMMENT '租户ID', PRIMARY KEY (id) ) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 COMMENT ='二维码使用表'; \ No newline at end of file + DEFAULT CHARSET = utf8mb4 COMMENT ='二维码使用表'; + +-- ---------------------------- +-- Table structure for wallet_recharge_package +-- ---------------------------- +DROP TABLE IF EXISTS wallet_recharge_package; +create table wallet_recharge_package +( + id bigint NOT NULL COMMENT '编号', + name varchar(64) NOT NULL COMMENT '套餐名', + pay_price int NOT NULL COMMENT '支付金额', + bonus_price int NOT NULL COMMENT '赠送金额', + status tinyint NOT NULL COMMENT '状态', + create_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + create_time datetime DEFAULT NULL COMMENT '创建时间', + update_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人', + update_time datetime DEFAULT NULL COMMENT '修改时间', + del_flag char(1) COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标记', + tenant_id bigint DEFAULT NULL COMMENT '租户ID', + PRIMARY KEY (id) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 COMMENT ='充值套餐表'; + +-- ---------------------------- +-- Table structure for wallet_recharge +-- ---------------------------- +DROP TABLE IF EXISTS wallet_recharge; +create table wallet_recharge +( + id bigint NOT NULL COMMENT '编号', + wallet_id bigint NOT NULL COMMENT '会员钱包 id', + total_price int NOT NULL COMMENT '用户实际到账余额，例如充 100 送 20，则该值是 120', + pay_price int NOT NULL COMMENT '实际支付金额', + bonus_price int NOT NULL COMMENT '钱包赠送金额', + package_id bigint NULL COMMENT '充值套餐编号', + pay_status bit default b'0' NOT NULL COMMENT '是否已支付：[0:未支付 1:已经支付过]', + pay_order_id bigint NULL COMMENT '支付订单编号', + pay_channel_code varchar(16) NULL COMMENT '支付成功的支付渠道', + pay_time datetime NULL COMMENT '订单支付时间', + pay_refund_id bigint NULL COMMENT '支付退款单编号', + refund_total_price int default 0 NOT NULL COMMENT '退款金额，包含赠送金额', + refund_pay_price int default 0 NOT NULL COMMENT '退款支付金额', + refund_bonus_price int default 0 NOT NULL COMMENT '退款钱包赠送金额', + refund_time datetime NULL COMMENT '退款时间', + refund_status int default 0 NOT NULL COMMENT '退款状态', + create_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + create_time datetime DEFAULT NULL COMMENT '创建时间', + update_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人', + update_time datetime DEFAULT NULL COMMENT '修改时间', + del_flag char(1) COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标记', + tenant_id bigint DEFAULT NULL COMMENT '租户ID', + PRIMARY KEY (id) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 COMMENT ='会员钱包充值'; \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletRechargeImportDto.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletRechargeImportDto.java deleted file mode 100644 index 324ce25d6..000000000 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletRechargeImportDto.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.bsd.pjcloud.wallet.api.dto; - -import com.bsd.pjcloud.wallet.api.entity.WalletRechargeImportEntity; -import lombok.Data; - -@Data -public class WalletRechargeImportDto extends WalletRechargeImportEntity { - -} diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletRechargeApplyDto.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/recharge/WalletRechargeApplyDto.java similarity index 54% rename from pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletRechargeApplyDto.java rename to pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/recharge/WalletRechargeApplyDto.java index 3a2c2d5c1..4915aa9a7 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletRechargeApplyDto.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/recharge/WalletRechargeApplyDto.java @@ -1,7 +1,6 @@ -package com.bsd.pjcloud.wallet.api.dto; +package com.bsd.pjcloud.wallet.api.dto.recharge; -import com.bsd.pjcloud.admin.api.vo.base.BaseUserInterface; -import com.bsd.pjcloud.wallet.api.entity.WalletRechargeApplyEntity; +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeApplyEntity; import lombok.Data; import java.util.List; diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/recharge/WalletRechargeDto.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/recharge/WalletRechargeDto.java new file mode 100644 index 000000000..d117c7c96 --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/recharge/WalletRechargeDto.java @@ -0,0 +1,14 @@ +package com.bsd.pjcloud.wallet.api.dto.recharge; + +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.bsd.pjcloud.common.core.util.TenantTable; +import java.time.LocalDateTime; + +@Data +public class WalletRechargeDto extends WalletRechargeEntity { +} \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/recharge/WalletRechargeImportDto.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/recharge/WalletRechargeImportDto.java new file mode 100644 index 000000000..d8b3a2e61 --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/recharge/WalletRechargeImportDto.java @@ -0,0 +1,9 @@ +package com.bsd.pjcloud.wallet.api.dto.recharge; + +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeImportEntity; +import lombok.Data; + +@Data +public class WalletRechargeImportDto extends WalletRechargeImportEntity { + +} diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/recharge/WalletRechargePackageDto.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/recharge/WalletRechargePackageDto.java new file mode 100644 index 000000000..892516317 --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/recharge/WalletRechargePackageDto.java @@ -0,0 +1,9 @@ +package com.bsd.pjcloud.wallet.api.dto.recharge; + +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargePackageEntity; +import lombok.Data; + +@Data +public class WalletRechargePackageDto extends WalletRechargePackageEntity { + +} diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletRechargeApplyEntity.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/recharge/WalletRechargeApplyEntity.java similarity index 95% rename from pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletRechargeApplyEntity.java rename to pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/recharge/WalletRechargeApplyEntity.java index 8b1a06095..75032aae3 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletRechargeApplyEntity.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/recharge/WalletRechargeApplyEntity.java @@ -1,4 +1,4 @@ -package com.bsd.pjcloud.wallet.api.entity; +package com.bsd.pjcloud.wallet.api.entity.recharge; import cn.hutool.core.date.DatePattern; import com.baomidou.mybatisplus.annotation.*; @@ -8,7 +8,6 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import com.bsd.pjcloud.common.core.util.TenantTable; -import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/recharge/WalletRechargeEntity.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/recharge/WalletRechargeEntity.java new file mode 100644 index 000000000..1b5da70ab --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/recharge/WalletRechargeEntity.java @@ -0,0 +1,158 @@ +package com.bsd.pjcloud.wallet.api.entity.recharge; + +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import com.bsd.pjcloud.common.core.util.TenantTable; + +import java.time.LocalDateTime; + +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Data +@TenantTable +@TableName("wallet_recharge") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "会员钱包充值") +public class WalletRechargeEntity extends Model { + /** + * 编号 + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description = "编号") + private Long id; + + /** + * 会员钱包 id + */ + @Schema(description = "会员钱包 id") + private Long walletId; + + /** + * 用户实际到账余额，例如充 100 送 20，则该值是 120 + */ + @Schema(description = "用户实际到账余额，例如充 100 送 20，则该值是 120") + private Integer totalPrice; + + /** + * 实际支付金额 + */ + @Schema(description = "实际支付金额") + private Integer payPrice; + + /** + * 钱包赠送金额 + */ + @Schema(description = "钱包赠送金额") + private Integer bonusPrice; + + /** + * 充值套餐编号 + */ + @Schema(description = "充值套餐编号") + private Long packageId; + + /** + * 是否已支付：[0:未支付 1:已经支付过] + */ + @Schema(description = "是否已支付：[0:未支付 1:已经支付过]") + private Boolean payStatus; + + /** + * 支付订单编号 + */ + @Schema(description = "支付订单编号") + private Long payOrderId; + + /** + * 支付成功的支付渠道 + */ + @Schema(description = "支付成功的支付渠道") + private String payChannelCode; + + /** + * 订单支付时间 + */ + @Schema(description = "订单支付时间") + private LocalDateTime payTime; + + /** + * 支付退款单编号 + */ + @Schema(description = "支付退款单编号") + private Long payRefundId; + + /** + * 退款金额，包含赠送金额 + */ + @Schema(description = "退款金额，包含赠送金额") + private Integer refundTotalPrice; + + /** + * 退款支付金额 + */ + @Schema(description = "退款支付金额") + private Integer refundPayPrice; + + /** + * 退款钱包赠送金额 + */ + @Schema(description = "退款钱包赠送金额") + private Integer refundBonusPrice; + + /** + * 退款时间 + */ + @Schema(description = "退款时间") + private LocalDateTime refundTime; + + /** + * 退款状态 + */ + @Schema(description = "退款状态") + private Integer refundStatus; + + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description = "创建人") + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description = "创建时间") + private LocalDateTime createTime; + + /** + * 修改人 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description = "修改人") + private String updateBy; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description = "修改时间") + private LocalDateTime updateTime; + + /** + * 删除标记 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + @Schema(description = "删除标记") + private String delFlag; + + /** + * 租户ID + */ + @Schema(description = "租户ID") + private Long tenantId; +} \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletRechargeImportEntity.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/recharge/WalletRechargeImportEntity.java similarity index 97% rename from pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletRechargeImportEntity.java rename to pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/recharge/WalletRechargeImportEntity.java index 3504b8449..2586091e4 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletRechargeImportEntity.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/recharge/WalletRechargeImportEntity.java @@ -1,4 +1,4 @@ -package com.bsd.pjcloud.wallet.api.entity; +package com.bsd.pjcloud.wallet.api.entity.recharge; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/recharge/WalletRechargePackageEntity.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/recharge/WalletRechargePackageEntity.java new file mode 100644 index 000000000..95c7a580d --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/recharge/WalletRechargePackageEntity.java @@ -0,0 +1,93 @@ +package com.bsd.pjcloud.wallet.api.entity.recharge; + +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import com.bsd.pjcloud.common.core.util.TenantTable; +import java.time.LocalDateTime; + +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Data +@TenantTable +@TableName("wallet_recharge_package") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "充值套餐表") +public class WalletRechargePackageEntity extends Model { + + + /** + * 编号 + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description="编号") + private Long id; + + /** + * 套餐名 + */ + @Schema(description="套餐名") + private String name; + + /** + * 支付金额 + */ + @Schema(description="支付金额") + private Integer payPrice; + + /** + * 赠送金额 + */ + @Schema(description="赠送金额") + private Integer bonusPrice; + + /** + * 状态 + */ + @Schema(description="状态") + private Integer status; + + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建人") + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建时间") + private LocalDateTime createTime; + + /** + * 修改人 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="修改人") + private String updateBy; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="修改时间") + private LocalDateTime updateTime; + + /** + * 删除标记 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + @Schema(description="删除标记") + private String delFlag; + + /** + * 租户ID + */ + @Schema(description="租户ID") + private Long tenantId; +} \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/WalletRechargeImportVo.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/WalletRechargeImportVo.java deleted file mode 100644 index a913f778b..000000000 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/WalletRechargeImportVo.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.bsd.pjcloud.wallet.api.vo; - -import com.bsd.pjcloud.wallet.api.entity.WalletRechargeImportEntity; -import lombok.Data; - -@Data -public class WalletRechargeImportVo extends WalletRechargeImportEntity { - -} diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/WalletRechargeApplyVo.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeApplyVo.java similarity index 81% rename from pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/WalletRechargeApplyVo.java rename to pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeApplyVo.java index f6f25f20e..9ef2e6d8e 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/WalletRechargeApplyVo.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeApplyVo.java @@ -1,8 +1,8 @@ -package com.bsd.pjcloud.wallet.api.vo; +package com.bsd.pjcloud.wallet.api.vo.recharge; import com.bsd.pjcloud.admin.api.vo.base.BaseDeptInterface; import com.bsd.pjcloud.admin.api.vo.base.BaseUserInterface; -import com.bsd.pjcloud.wallet.api.entity.WalletRechargeApplyEntity; +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeApplyEntity; import lombok.Data; @Data diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeImportVo.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeImportVo.java new file mode 100644 index 000000000..b026b6d46 --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeImportVo.java @@ -0,0 +1,9 @@ +package com.bsd.pjcloud.wallet.api.vo.recharge; + +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeImportEntity; +import lombok.Data; + +@Data +public class WalletRechargeImportVo extends WalletRechargeImportEntity { + +} diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargePackageVo.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargePackageVo.java new file mode 100644 index 000000000..5f8e339a2 --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargePackageVo.java @@ -0,0 +1,8 @@ +package com.bsd.pjcloud.wallet.api.vo.recharge; + +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargePackageEntity; +import lombok.Data; + +@Data +public class WalletRechargePackageVo extends WalletRechargePackageEntity { +} diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeVo.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeVo.java new file mode 100644 index 000000000..cfc94fa87 --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeVo.java @@ -0,0 +1,9 @@ +package com.bsd.pjcloud.wallet.api.vo.recharge; + +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeEntity; +import lombok.Data; + + +@Data +public class WalletRechargeVo extends WalletRechargeEntity { +} diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletRechargeApplyController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeApplyController.java similarity index 78% rename from pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletRechargeApplyController.java rename to pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeApplyController.java index 5bf339f26..fc6763c8a 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletRechargeApplyController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeApplyController.java @@ -1,4 +1,4 @@ -package com.bsd.pjcloud.wallet.controller; +package com.bsd.pjcloud.wallet.controller.recharge; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.collection.CollUtil; @@ -8,9 +8,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.excel.annotation.RequestExcel; import com.bsd.pjcloud.common.log.annotation.SysLog; -import com.bsd.pjcloud.wallet.api.dto.WalletRechargeApplyDto; +import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargeApplyDto; import com.bsd.pjcloud.wallet.api.dto.excel.WalletRechargeExcelDto; -import com.bsd.pjcloud.wallet.api.entity.WalletRechargeApplyEntity; +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeApplyEntity; import com.bsd.pjcloud.wallet.service.WalletRechargeApplyService; import org.springframework.security.access.prepost.PreAuthorize; import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; @@ -22,14 +22,9 @@ import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; + import java.util.List; -/** - * 充值/扣款申请 - * - * @author pjcloud - * @date 2024-12-31 14:23:57 - */ @RestController @RequiredArgsConstructor @RequestMapping("/wallet-recharge-apply") @@ -39,12 +34,6 @@ public class WalletRechargeApplyController { private final WalletRechargeApplyService walletRechargeApplyService; - - /** - * 提交申请 - * - * @return - */ @Operation(summary = "提交申请", description = "提交申请") @SysLog("提交申请") @PostMapping("/apply") @@ -54,11 +43,6 @@ public class WalletRechargeApplyController { return R.ok(true); } - /** - * 取消申请 - * - * @return - */ @Operation(summary = "取消申请", description = "取消申请") @SysLog("取消申请") @PostMapping("/cancel-apply") @@ -68,13 +52,6 @@ public class WalletRechargeApplyController { return R.ok(true); } - /** - * 分页查询 - * - * @param page 分页对象 - * @param walletRechargeApply 充值/扣款申请 - * @return - */ @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") @PreAuthorize("@pms.hasPermission('wallet_walletRechargeApply_view')") @@ -83,13 +60,6 @@ public class WalletRechargeApplyController { return R.ok(walletRechargeApplyService.page(page, wrapper)); } - /** - * 分页查询 - * - * @param page 分页对象 - * @param dto 充值/扣款申请 - * @return - */ @Operation(summary = "分页复杂查询", description = "分页复杂查询") @GetMapping("/page-join") @PreAuthorize("@pms.hasPermission('wallet_walletRechargeApply_view')") @@ -97,13 +67,6 @@ public class WalletRechargeApplyController { return R.ok(walletRechargeApplyService.pageJoin(page, dto)); } - - /** - * 通过id查询充值/扣款申请 - * - * @param id id - * @return R - */ @Operation(summary = "通过id查询", description = "通过id查询") @GetMapping("/{id}") @PreAuthorize("@pms.hasPermission('wallet_walletRechargeApply_view')") @@ -111,12 +74,6 @@ public class WalletRechargeApplyController { return R.ok(walletRechargeApplyService.getById(id)); } - /** - * 新增充值/扣款申请 - * - * @param dto 充值/扣款申请 - * @return R - */ @Operation(summary = "新增充值/扣款申请", description = "新增充值/扣款申请") @SysLog("新增充值/扣款申请") @PostMapping @@ -126,12 +83,6 @@ public class WalletRechargeApplyController { return R.ok(); } - /** - * 修改充值/扣款申请 - * - * @param walletRechargeApply 充值/扣款申请 - * @return R - */ @Operation(summary = "修改充值/扣款申请", description = "修改充值/扣款申请") @SysLog("修改充值/扣款申请") @PutMapping @@ -140,12 +91,6 @@ public class WalletRechargeApplyController { return R.ok(walletRechargeApplyService.updateById(walletRechargeApply)); } - /** - * 通过id删除充值/扣款申请 - * - * @param ids id列表 - * @return R - */ @Operation(summary = "通过id删除充值/扣款申请", description = "通过id删除充值/扣款申请") @SysLog("通过id删除充值/扣款申请") @DeleteMapping @@ -157,13 +102,6 @@ public class WalletRechargeApplyController { /* ************************************* start excel start ************************************* */ - /** - * 导出excel 表格 - * - * @param walletRechargeApply 查询条件 - * @param ids 导出指定ID - * @return excel 文件流 - */ @ResponseExcel @GetMapping("/export") @PreAuthorize("@pms.hasPermission('wallet_walletRechargeApply_export')") @@ -171,16 +109,10 @@ public class WalletRechargeApplyController { return walletRechargeApplyService.list(Wrappers.lambdaQuery(walletRechargeApply).in(ArrayUtil.isNotEmpty(ids), WalletRechargeApplyEntity::getId, ids)); } - /** - * 读取excel内容 - * @param excelVOList - * @param bindingResult - * @return - */ @PostMapping("/read-excel") public R readExcel(@RequestExcel List excelVOList, BindingResult bindingResult) { - return walletRechargeApplyService.readExcel(excelVOList, bindingResult); + return walletRechargeApplyService.readExcel(excelVOList, bindingResult); } - /* ************************************* start excel start ************************************* */ + /* ************************************* start excel start ************************************* */ } \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeController.java new file mode 100644 index 000000000..dd46be96b --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeController.java @@ -0,0 +1,92 @@ +package com.bsd.pjcloud.wallet.controller.recharge; + +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.common.log.annotation.SysLog; +import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargeDto; +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeEntity; +import com.bsd.pjcloud.wallet.service.WalletRechargeService; +import org.springframework.security.access.prepost.PreAuthorize; +import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import org.springdoc.core.annotations.ParameterObject; +import org.springframework.http.HttpHeaders; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 会员钱包充值 + * + * @author dzc + * @date 2025-01-03 18:36:02 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/wallet-recharge") +@Tag(description = "wallet-recharge", name = "会员钱包充值管理") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) +public class WalletRechargeController { + + private final WalletRechargeService walletRechargeService; + + @Operation(summary = "分页查询", description = "分页查询") + @GetMapping("/page") + @PreAuthorize("@pms.hasPermission('wallet_walletRecharge_view')") + public R getWalletRechargePage(@ParameterObject Page page, @ParameterObject WalletRechargeDto dto) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + return R.ok(walletRechargeService.page(page, wrapper)); + } + + @Operation(summary = "分页查询", description = "分页查询") + @GetMapping("/page-join") + @PreAuthorize("@pms.hasPermission('wallet_walletRecharge_view')") + public R pageJoin(@ParameterObject Page page, @ParameterObject WalletRechargeDto dto) { + return R.ok(walletRechargeService.pageJoin(page, dto)); + } + + @Operation(summary = "通过id查询", description = "通过id查询") + @GetMapping("/{id}") + @PreAuthorize("@pms.hasPermission('wallet_walletRecharge_view')") + public R getById(@PathVariable("id") Long id) { + return R.ok(walletRechargeService.getById(id)); + } + + @Operation(summary = "新增会员钱包充值", description = "新增会员钱包充值") + @SysLog("新增会员钱包充值") + @PostMapping + @PreAuthorize("@pms.hasPermission('wallet_walletRecharge_add')") + public R save(@RequestBody WalletRechargeEntity walletRecharge) { + return R.ok(walletRechargeService.save(walletRecharge)); + } + + @Operation(summary = "修改会员钱包充值", description = "修改会员钱包充值") + @SysLog("修改会员钱包充值") + @PutMapping + @PreAuthorize("@pms.hasPermission('wallet_walletRecharge_edit')") + public R updateById(@RequestBody WalletRechargeEntity walletRecharge) { + return R.ok(walletRechargeService.updateById(walletRecharge)); + } + + @Operation(summary = "通过id删除会员钱包充值", description = "通过id删除会员钱包充值") + @SysLog("通过id删除会员钱包充值") + @DeleteMapping + @PreAuthorize("@pms.hasPermission('wallet_walletRecharge_del')") + public R removeById(@RequestBody Long[] ids) { + return R.ok(walletRechargeService.removeBatchByIds(CollUtil.toList(ids))); + } + + @ResponseExcel + @GetMapping("/export") + @PreAuthorize("@pms.hasPermission('wallet_walletRecharge_export')") + public List export(WalletRechargeEntity walletRecharge, Long[] ids) { + return walletRechargeService.list(Wrappers.lambdaQuery(walletRecharge).in(ArrayUtil.isNotEmpty(ids), WalletRechargeEntity::getId, ids)); + } +} \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargePackageController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargePackageController.java new file mode 100644 index 000000000..e91d372c5 --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargePackageController.java @@ -0,0 +1,92 @@ +package com.bsd.pjcloud.wallet.controller.recharge; + +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.common.log.annotation.SysLog; +import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargePackageDto; +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargePackageEntity; +import com.bsd.pjcloud.wallet.service.WalletRechargePackageService; +import org.springframework.security.access.prepost.PreAuthorize; +import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import org.springdoc.core.annotations.ParameterObject; +import org.springframework.http.HttpHeaders; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 充值套餐表 + * + * @author dzc + * @date 2025-01-03 18:33:55 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/wallet-recharge-package") +@Tag(description = "walletRechargePackage", name = "充值套餐表管理") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) +public class WalletRechargePackageController { + + private final WalletRechargePackageService walletRechargePackageService; + + @Operation(summary = "分页查询", description = "分页查询") + @GetMapping("/page") + @PreAuthorize("@pms.hasPermission('wallet_walletRechargePackage_view')") + public R getWalletRechargePackagePage(@ParameterObject Page page, @ParameterObject WalletRechargePackageEntity walletRechargePackage) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + return R.ok(walletRechargePackageService.page(page, wrapper)); + } + + @Operation(summary = "分页复杂查询", description = "分页复杂查询") + @GetMapping("/page-join") + @PreAuthorize("@pms.hasPermission('wallet_walletRechargePackage_view')") + public R PageJoin(@ParameterObject Page page, @ParameterObject WalletRechargePackageDto dto) { + return R.ok(walletRechargePackageService.pageJoin(page, dto)); + } + + @Operation(summary = "通过id查询", description = "通过id查询") + @GetMapping("/{id}") + @PreAuthorize("@pms.hasPermission('wallet_walletRechargePackage_view')") + public R getById(@PathVariable("id") Long id) { + return R.ok(walletRechargePackageService.getById(id)); + } + + @Operation(summary = "新增充值套餐表", description = "新增充值套餐表") + @SysLog("新增充值套餐表") + @PostMapping + @PreAuthorize("@pms.hasPermission('wallet_walletRechargePackage_add')") + public R save(@RequestBody WalletRechargePackageEntity walletRechargePackage) { + return R.ok(walletRechargePackageService.save(walletRechargePackage)); + } + + @Operation(summary = "修改充值套餐表", description = "修改充值套餐表") + @SysLog("修改充值套餐表") + @PutMapping + @PreAuthorize("@pms.hasPermission('wallet_walletRechargePackage_edit')") + public R updateById(@RequestBody WalletRechargePackageEntity walletRechargePackage) { + return R.ok(walletRechargePackageService.updateById(walletRechargePackage)); + } + + @Operation(summary = "通过id删除充值套餐表", description = "通过id删除充值套餐表") + @SysLog("通过id删除充值套餐表") + @DeleteMapping + @PreAuthorize("@pms.hasPermission('wallet_walletRechargePackage_del')") + public R removeById(@RequestBody Long[] ids) { + return R.ok(walletRechargePackageService.removeBatchByIds(CollUtil.toList(ids))); + } + + @ResponseExcel + @GetMapping("/export") + @PreAuthorize("@pms.hasPermission('wallet_walletRechargePackage_export')") + public List export(WalletRechargePackageEntity walletRechargePackage, Long[] ids) { + return walletRechargePackageService.list(Wrappers.lambdaQuery(walletRechargePackage).in(ArrayUtil.isNotEmpty(ids), WalletRechargePackageEntity::getId, ids)); + } +} \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletRechargeApplyMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeApplyMapper.java similarity index 84% rename from pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletRechargeApplyMapper.java rename to pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeApplyMapper.java index 444059a74..eccfef879 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletRechargeApplyMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeApplyMapper.java @@ -1,13 +1,13 @@ -package com.bsd.pjcloud.wallet.mapper; +package com.bsd.pjcloud.wallet.mapper.recharge; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; -import com.bsd.pjcloud.wallet.api.dto.WalletRechargeApplyDto; +import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargeApplyDto; import com.bsd.pjcloud.wallet.api.entity.WalletManageEntity; -import com.bsd.pjcloud.wallet.api.entity.WalletRechargeApplyEntity; +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeApplyEntity; import com.bsd.pjcloud.wallet.api.entity.WalletTypeEntity; -import com.bsd.pjcloud.wallet.api.vo.WalletRechargeApplyVo; +import com.bsd.pjcloud.wallet.api.vo.recharge.WalletRechargeApplyVo; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Mapper; diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletRechargeImportMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeImportMapper.java similarity index 63% rename from pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletRechargeImportMapper.java rename to pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeImportMapper.java index 0c890d767..ce5fc933e 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletRechargeImportMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeImportMapper.java @@ -1,7 +1,7 @@ -package com.bsd.pjcloud.wallet.mapper; +package com.bsd.pjcloud.wallet.mapper.recharge; import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; -import com.bsd.pjcloud.wallet.api.entity.WalletRechargeImportEntity; +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeImportEntity; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeMapper.java new file mode 100644 index 000000000..e468eb650 --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeMapper.java @@ -0,0 +1,19 @@ +package com.bsd.pjcloud.wallet.mapper.recharge; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; +import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargeDto; +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeEntity; +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargePackageEntity; +import com.bsd.pjcloud.wallet.api.vo.recharge.WalletRechargeVo; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface WalletRechargeMapper extends PjcloudBaseMapper { + + default Page pageJoin(Page page, WalletRechargeDto dto) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + return selectJoinPage(page, WalletRechargeVo.class, wrapper); + } +} \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargePackageMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargePackageMapper.java new file mode 100644 index 000000000..90eda03c7 --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargePackageMapper.java @@ -0,0 +1,21 @@ +package com.bsd.pjcloud.wallet.mapper.recharge; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; +import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargePackageDto; +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeApplyEntity; +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargePackageEntity; +import com.bsd.pjcloud.wallet.api.vo.recharge.WalletRechargeApplyVo; +import com.bsd.pjcloud.wallet.api.vo.recharge.WalletRechargePackageVo; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface WalletRechargePackageMapper extends PjcloudBaseMapper { + + + default Page pageJoin(Page page, WalletRechargePackageDto dto) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + return selectJoinPage(page, WalletRechargePackageEntity.class, wrapper); + } +} \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargeApplyService.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargeApplyService.java index fe7424330..087ecde84 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargeApplyService.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargeApplyService.java @@ -3,10 +3,10 @@ package com.bsd.pjcloud.wallet.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.bsd.pjcloud.common.core.util.R; -import com.bsd.pjcloud.wallet.api.dto.WalletRechargeApplyDto; +import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargeApplyDto; import com.bsd.pjcloud.wallet.api.dto.excel.WalletRechargeExcelDto; -import com.bsd.pjcloud.wallet.api.entity.WalletRechargeApplyEntity; -import com.bsd.pjcloud.wallet.api.vo.WalletRechargeApplyVo; +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeApplyEntity; +import com.bsd.pjcloud.wallet.api.vo.recharge.WalletRechargeApplyVo; import org.springframework.validation.BindingResult; import java.util.List; diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargeImportService.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargeImportService.java index 4be9e2761..c54198c10 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargeImportService.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargeImportService.java @@ -1,7 +1,7 @@ package com.bsd.pjcloud.wallet.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.bsd.pjcloud.wallet.api.entity.WalletRechargeImportEntity; +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeImportEntity; public interface WalletRechargeImportService extends IService { diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargePackageService.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargePackageService.java new file mode 100644 index 000000000..4ba5a4c8f --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargePackageService.java @@ -0,0 +1,12 @@ +package com.bsd.pjcloud.wallet.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargePackageDto; +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargePackageEntity; +import com.bsd.pjcloud.wallet.api.vo.recharge.WalletRechargePackageVo; + +public interface WalletRechargePackageService extends IService { + + Page pageJoin(Page page, WalletRechargePackageDto dto); +} \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargeService.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargeService.java new file mode 100644 index 000000000..195b341ee --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargeService.java @@ -0,0 +1,13 @@ +package com.bsd.pjcloud.wallet.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargeDto; +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeEntity; +import com.bsd.pjcloud.wallet.api.vo.recharge.WalletRechargeVo; + +public interface WalletRechargeService extends IService { + + Page pageJoin(Page page, WalletRechargeDto dto); + +} \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletRechargeApplyServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeApplyServiceImpl.java similarity index 94% rename from pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletRechargeApplyServiceImpl.java rename to pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeApplyServiceImpl.java index 121fff60a..3aa777e02 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletRechargeApplyServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeApplyServiceImpl.java @@ -1,6 +1,5 @@ -package com.bsd.pjcloud.wallet.service.impl; +package com.bsd.pjcloud.wallet.service.impl.recharge; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Validator; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,12 +18,12 @@ import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.excel.vo.ErrorMessage; import com.bsd.pjcloud.common.security.service.PjcloudUser; import com.bsd.pjcloud.common.security.util.SecurityUtils; -import com.bsd.pjcloud.wallet.api.dto.WalletRechargeApplyDto; +import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargeApplyDto; import com.bsd.pjcloud.wallet.api.dto.excel.WalletRechargeExcelDto; -import com.bsd.pjcloud.wallet.api.entity.WalletRechargeApplyEntity; -import com.bsd.pjcloud.wallet.api.entity.WalletRechargeImportEntity; -import com.bsd.pjcloud.wallet.api.vo.WalletRechargeApplyVo; -import com.bsd.pjcloud.wallet.mapper.WalletRechargeApplyMapper; +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeApplyEntity; +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeImportEntity; +import com.bsd.pjcloud.wallet.api.vo.recharge.WalletRechargeApplyVo; +import com.bsd.pjcloud.wallet.mapper.recharge.WalletRechargeApplyMapper; import com.bsd.pjcloud.wallet.service.WalletManageService; import com.bsd.pjcloud.wallet.service.WalletRechargeApplyService; import lombok.RequiredArgsConstructor; @@ -36,7 +35,6 @@ import org.springframework.validation.annotation.Validated; import java.math.BigDecimal; import java.util.*; -import java.util.stream.Collectors; /** * 充值/扣款申请 diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletRechargeImportServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeImportServiceImpl.java similarity index 67% rename from pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletRechargeImportServiceImpl.java rename to pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeImportServiceImpl.java index 176aca4f5..fcf3a6764 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletRechargeImportServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeImportServiceImpl.java @@ -1,8 +1,8 @@ -package com.bsd.pjcloud.wallet.service.impl; +package com.bsd.pjcloud.wallet.service.impl.recharge; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.bsd.pjcloud.wallet.api.entity.WalletRechargeImportEntity; -import com.bsd.pjcloud.wallet.mapper.WalletRechargeImportMapper; +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeImportEntity; +import com.bsd.pjcloud.wallet.mapper.recharge.WalletRechargeImportMapper; import com.bsd.pjcloud.wallet.service.WalletRechargeImportService; import org.springframework.stereotype.Service; /** diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargePackageServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargePackageServiceImpl.java new file mode 100644 index 000000000..6b8c156cf --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargePackageServiceImpl.java @@ -0,0 +1,26 @@ +package com.bsd.pjcloud.wallet.service.impl.recharge; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargePackageDto; +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargePackageEntity; +import com.bsd.pjcloud.wallet.api.vo.recharge.WalletRechargePackageVo; +import com.bsd.pjcloud.wallet.mapper.recharge.WalletRechargePackageMapper; +import com.bsd.pjcloud.wallet.service.WalletRechargePackageService; +import org.springframework.stereotype.Service; + +/** + * 充值套餐表 + * + * @author dzc + * @date 2025-01-03 18:33:55 + */ +@Service +public class WalletRechargePackageServiceImpl extends ServiceImpl implements WalletRechargePackageService { + + @Override + public Page pageJoin(Page page, WalletRechargePackageDto dto) { + return baseMapper.pageJoin(page, dto); + } + +} \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeServiceImpl.java new file mode 100644 index 000000000..ebfa57373 --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeServiceImpl.java @@ -0,0 +1,27 @@ +package com.bsd.pjcloud.wallet.service.impl.recharge; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargeDto; +import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeEntity; +import com.bsd.pjcloud.wallet.api.vo.recharge.WalletRechargeVo; +import com.bsd.pjcloud.wallet.mapper.recharge.WalletRechargeMapper; +import com.bsd.pjcloud.wallet.service.WalletRechargeService; +import org.springframework.stereotype.Service; + +/** + * 会员钱包充值 + * + * @author dzc + * @date 2025-01-03 18:36:02 + */ +@Service +public class WalletRechargeServiceImpl extends ServiceImpl implements WalletRechargeService { + + @Override + public Page pageJoin(Page page, WalletRechargeDto dto) { + return baseMapper.pageJoin(page, dto); + } + + +} \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletRechargeApplyMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeApplyMapper.xml similarity index 86% rename from pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletRechargeApplyMapper.xml rename to pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeApplyMapper.xml index c9f5eff36..87afb2acf 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletRechargeApplyMapper.xml +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeApplyMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletRechargeImportMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeImportMapper.xml similarity index 84% rename from pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletRechargeImportMapper.xml rename to pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeImportMapper.xml index fcc777c0b..1778e5e38 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletRechargeImportMapper.xml +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeImportMapper.xml @@ -1,8 +1,8 @@ - - + + diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeMapper.xml new file mode 100644 index 000000000..050e3d0c2 --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargePackageMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargePackageMapper.xml new file mode 100644 index 000000000..2f8fcce10 --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargePackageMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file