From 3f17034c768ba4fc330e01f014b4f880e6a1569c Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期二, 12 三月 2024 16:03:30 +0800 Subject: [PATCH] 2024-03-12 朱宝民 增加已挂失,未补卡接口 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoOperate.java | 65 +++++++++++++------------------- 1 files changed, 27 insertions(+), 38 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoOperate.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoOperate.java index 711ea95..8977940 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoOperate.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoOperate.java @@ -1,6 +1,5 @@ package com.dy.pipIrrGlobal.voSe; -import com.dy.common.po.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,57 +9,47 @@ /** * @author ZhuBaoMin - * @date 2023-12-26 20:44 - * @LastEditTime 2023-12-26 20:44 + * @date 2024-02-05 11:23 + * @LastEditTime 2024-02-05 11:23 * @Description */ @Data -@Schema(title = "鎿嶄綔璁板綍瑙嗗浘瀵硅薄") -public class VoOperate implements BaseEntity { - private static final long serialVersionUID = 1L; +@Schema(title = "閫氱敤鎿嶄綔璁板綍瑙嗗浘瀵硅薄") +public class VoOperate { + private static final long serialVersionUID = 202402051126001L; - @Schema(title = "鏉慖D") - private Long villageId; - - @Schema(title = "鍖哄垝鍚嶇О涓�") - private String districtTitle; + @Schema(title = "鍐滄埛濮撳悕") + private String clientName; @Schema(title = "鍐滄埛缂栧彿") private String clientNum; - @Schema(title = "鍐滄埛濮撳悕") - private String name; - @Schema(title = "姘村崱缂栧彿") - private Long cardNum; + private String cardNum; - @Schema(title = "韬唤璇佸彿") - private String idCard; + @Schema(title = "鎿嶄綔浜�") + private String operator; - @Schema(title = "鎵嬫満鍙�") - private String phone; - - @Schema(title = "鍏呭�奸噾棰�") - private Float money; - - @Schema(title = "璐崱閲戦") - private Integer cardCost; - - @Schema(title = "鏀粯鏂瑰紡缂栧彿") - private Long paymentId; - - @Schema(title = "鏀粯鏂瑰紡鍚嶇О") - private String paymentMethod; - - @Schema(title = "涓氬姟绫诲瀷") - private String operateType; - - @Schema(title = "浜ゆ槗鏃堕棿") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @Schema(title = "鎿嶄綔鏃堕棿") private Date operateDt; - @Schema(title = "鎿嶄綔鍛�") - private String operatorName; + //娉ㄩ攢鏌ヨ2涓繑鍥炲�� + @Schema(title = "閫�鍥為噾棰�") + private Float refund; + + @Schema(title = "閫�娆炬柟寮忓悕绉�") + private String refundTypeName; + + //鎸傚け1涓繑鍥炲�� + @Schema(title = "鍗$墖浣欓鍙婂啿姝e悗浣欓") + private Double money; + + //鍐叉2涓繑鍥炲�硷紝鍐叉鍚庝綑棰濅笌鎸傚け鍏辩敤 + @Schema(title = "鍐叉鍓嶄綑棰�") + private Double systemBalance; + + //瑙i攣1涓繑鍥炲�硷紝涓庢寕澶卞叡鐢� } -- Gitblit v1.8.0