From 98233e7032c4e3fa1bfb85bd94a557deffb6ceb4 Mon Sep 17 00:00:00 2001 From: suzhuhong Date: Fri, 24 Apr 2026 18:03:34 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/response/SplitOrderResponse.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/SplitOrderResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/SplitOrderResponse.java index 28bb22995..25f5a6350 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/SplitOrderResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/SplitOrderResponse.java @@ -1,12 +1,13 @@ package com.cool.store.response; +import com.cool.store.enums.wallet.DocStatusEnum; +import com.cool.store.enums.wallet.SplitSourceEnum; +import com.cool.store.enums.wallet.SplitTypeEnum; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.cool.store.annotation.DictField; -import com.cool.store.enums.wallet.SplitSourceEnum; -import com.cool.store.enums.wallet.SplitTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -142,11 +143,6 @@ public class SplitOrderResponse implements Serializable { @ExcelIgnore private Integer source; - @ApiModelProperty("单据来源名称(1-手工新增/2-费用调整单/3-费用单)") - @ExcelProperty(value = "单据来源名称", order = 200) - @ColumnWidth(30) - private String sourceName; - public String getSplitTypeName() { SplitTypeEnum splitTypeEnum = SplitTypeEnum.fromStatus(this.splitType); return splitTypeEnum!=null?splitTypeEnum.getDesc():"-"; @@ -156,4 +152,9 @@ public class SplitOrderResponse implements Serializable { SplitSourceEnum splitSourceEnum = SplitSourceEnum.fromStatus(this.source); return splitSourceEnum!=null?splitSourceEnum.getDesc():"-"; } + + public String getStatusName() { + DocStatusEnum docStatusEnum = DocStatusEnum.fromStatus(this.status); + return docStatusEnum!=null?docStatusEnum.getDesc():"-"; + } }