feat:更改页面

2026-09-08 15:25:23 +08:00
1 parent 4e804a17cd
commit 8995bf89d6
@@ -34,4 +34,9 @@ public class WalletActiveDto extends WalletActiveEntity {
     * 是否硬件激活
     */
    private Boolean isMchActive;
+
+    /**
+     * 卡号长度
+     */
+    private Integer carNumberLength;
 }
@@ -0,0 +1,19 @@
+package com.bsd.pjcloud.wallet.api.dto;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Data
+public class WalletRemoteOpenCardCountDto {
+
+    /**
+     * 商户id
+     */
+    @NotNull(message = "商户id不能为空")
+    private Long mchId;
+
+    /**
+     * 卡号长度
+     */
+    private Integer carNumberLength;
+}
@@ -0,0 +1,33 @@
+package com.bsd.pjcloud.wallet.api.dto;
+
+import lombok.Data;
+
+@Data
+public class WalletRemoteOpenCardListDto {
+
+    /**
+     * 当前页
+     */
+    private Long current;
+
+    /**
+     * 分页
+     */
+    private Long pageSize;
+
+    /**
+     * 父部门id
+     */
+    private Long parentDeptId;
+
+    /**
+     * 商户id
+     */
+    private Long mchId;
+
+    /**
+     * 卡号长度
+     */
+    private Integer carNumberLength;
+
+}
@@ -41,6 +41,11 @@ public class WalletTransactionDto extends WalletTransactionEntity implements Bas

    private List<String> bizTypes;

+    /**
+     * 财务统计标签筛选值；传入多个字典值时匹配包含任一标签的流水。
+     */
+    private List<String> tagList;
+
    private LocalDate[] createTimeList;

    /**
@@ -0,0 +1,28 @@
+package com.bsd.pjcloud.wallet.api.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+/**
+ * 钱包流水备注修改参数，只允许后台修改备注，不承载金额、余额和业务关联等不可变流水信息。
+ */
+@Data
+@Schema(description = "钱包流水备注修改参数")
+public class WalletTransactionRemarkDto {
+
+    /**
+     * 需要修改备注的钱包流水编号，由钱包流水列表返回。
+     */
+    @NotNull(message = "钱包流水编号不能为空")
+    @Schema(description = "钱包流水编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long id;
+
+    /**
+     * 流水业务备注；允许传空以清除原备注，非空内容最多 256 个字符。
+     */
+    @Size(max = 256, message = "流水备注不能超过256个字符")
+    @Schema(description = "流水备注，最多256个字符")
+    private String remark;
+}
@@ -0,0 +1,37 @@
+package com.bsd.pjcloud.wallet.api.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 钱包流水信息修改参数，仅允许后台修正流水触发事件的归属部门和创建时间，
+ * 不承载金额、余额、业务关联等不可变流水信息。
+ */
+@Data
+@Schema(description = "钱包流水信息修改参数")
+public class WalletTransactionUpdateInfoDto {
+
+    /**
+     * 需要修改信息的钱包流水编号，由钱包流水列表返回。
+     */
+    @NotNull(message = "钱包流水编号不能为空")
+    @Schema(description = "钱包流水编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long id;
+
+    /**
+     * 流水触发事件归属的新部门编号；必须是当前租户有效部门，用于更正部门归属统计口径。
+     */
+    @NotNull(message = "流水归属部门不能为空")
+    @Schema(description = "流水归属部门编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long deptId;
+
+    /**
+     * 流水新的创建时间，用于更正流水归属的统计周期；时间格式为 yyyy-MM-dd HH:mm:ss。
+     */
+    @NotNull(message = "流水创建时间不能为空")
+    @Schema(description = "流水创建时间，格式为 yyyy-MM-dd HH:mm:ss", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime createTime;
+}
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.bsd.pjcloud.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

@@ -78,6 +79,19 @@ public class WalletTransactionEntity extends Model<WalletTransactionEntity> {
    @Schema(description = "余额, 单位分")
    private Integer balance;

+    /**
+     * 财务统计标签，保存 {@code wallet_transaction_tag} 字典值；多个值使用英文逗号分隔，历史流水可为空。
+     */
+    @Schema(description = "财务统计标签，多个字典值使用英文逗号分隔")
+    private String tags;
+
+    /**
+     * 流水备注，由后台操作人员补充业务说明；历史流水和未填写场景允许为空，数据库最多保存 256 个字符。
+     */
+    @Size(max = 256, message = "流水备注不能超过256个字符")
+    @Schema(description = "流水备注，最多256个字符")
+    private String remark;
+
    /**
     * 乐观锁
     */
@@ -22,6 +22,10 @@ public interface RemoteCodeUseService {
    @GetMapping("/wallet-code-use/get-by-biz-id")
    R<WalletCodeUseEntity> getByBizId(@RequestParam Long id);

+    @NoToken
+    @GetMapping("/wallet-code-use/info-by-short-code")
+    R<WalletCodeUseEntity> getInfoByShortCode(@RequestParam String shortCode);
+

    /**
     * 核销二维码
@@ -1,14 +1,20 @@
 package com.bsd.pjcloud.wallet.api.feign;

+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.feign.annotation.NoToken;
 import com.bsd.pjcloud.wallet.api.constant.WalletCodeBizEnum;
 import com.bsd.pjcloud.wallet.api.constant.WalletTypeEnum;
+import com.bsd.pjcloud.wallet.api.dto.WalletRemoteOpenCardCountDto;
+import com.bsd.pjcloud.wallet.api.dto.WalletRemoteOpenCardListDto;
+import com.bsd.pjcloud.wallet.api.entity.WalletActiveEntity;
 import com.bsd.pjcloud.wallet.api.entity.WalletManageEntity;
 import com.bsd.pjcloud.wallet.api.vo.WalletManageVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;

 import java.util.List;
@@ -64,4 +70,12 @@ public interface RemoteWalletService {

    @GetMapping("/wallet-manage/inner/is-use-door")
    R<String> innserIsUseDoor(@RequestParam Long userId);
+
+    @NoToken
+    @PostMapping("/wallet-active/remote/open-card-list")
+    R<Page<WalletActiveEntity>> remoteOpenCardList(@RequestBody WalletRemoteOpenCardListDto body);
+
+    @NoToken
+    @PostMapping("/wallet-active/remote/open-card-count")
+    R<Integer> remoteOpenCardCount(@RequestBody WalletRemoteOpenCardCountDto dto);
 }