Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2024-09-30 e18c4a8ac170fea6e079047a27f72032c80eee67

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java

@@ -22,44 +22,17 @@
 */

@Data
@JsonPropertyOrder({"cardNum", "cashierId", "villageId", "clientNum", "districtTitle", "clientName", "phone", "operateType", "tradeAmount", "waterCost", "cardCost", "gift", "refundAmount", "paymentName", "tradeTime"})
@JsonPropertyOrder({"orderNumber", "clientName", "cardNum", "idCard", "clientNum", "phone", "operateType", "tradeAmount", "waterCost", "cardCost", "gift", "refundAmount", "money", "paymentName", "tradeTime", "cashierId", "cashierName", "cardState", "districtTitle", "villageId"})
@HeadRowHeight(30)
@ContentRowHeight(20)
public class VoTradeDetails implements BaseEntity {
    private static final long serialVersionUID = 202402012040001L;

    /**
     * 水卡编号
     * 订单号
     */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    private Long cardNum;

    /**
     * 收银员ID
     */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    @ExcelIgnore
    private Long cashierId;

    /**
     * 村庄ID
     */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    @ExcelIgnore
    private Long villageId;

    /**
     * 农户编号
     */
    @ExcelIgnore
    private String clientNum;

    /**
     * 村庄名称
     */
    @ExcelProperty(value = {"${title}", "村庄名称"})
    @ColumnWidth(20)
    private String districtTitle;
    @ColumnWidth(25)
    private String orderNumber;

    /**
     * 农户姓名
@@ -67,6 +40,26 @@
    @ExcelProperty(value = {"${title}", "农户姓名"})
    @ColumnWidth(15)
    private String clientName;

    /**
     * 水卡编号
     */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    @ColumnWidth(15)
    private Long cardNum;

    /**
     * 身份证号
     */
    @ColumnWidth(15)
    private String idCard;

    /**
     * 农户编号
     */
    //@ExcelIgnore
    @ColumnWidth(15)
    private String clientNum;

    /**
     * 联系电话
@@ -118,6 +111,12 @@
    private Double refundAmount;

    /**
     * 余额
     */
    @ColumnWidth(15)
    private Double money;

    /**
     * 付款方式
     */
    @ExcelProperty(value = {"${title}", "付款方式"})
@@ -132,4 +131,36 @@
    @ColumnWidth(20)
    private Date tradeTime;

    /**
     * 收银员ID
     */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    @ExcelIgnore
    private Long cashierId;

    /**
     * 收银员姓名
     */
    @ColumnWidth(15)
    private String cashierName;

    /**
     * 卡片状态
     */
    @ColumnWidth(15)
    private String cardState;

    /**
     * 村庄名称
     */
    @ExcelProperty(value = {"${title}", "村庄名称"})
    @ColumnWidth(20)
    private String districtTitle;

    /**
     * 村庄ID
     */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    @ExcelIgnore
    private Long villageId;
}