From 3536002b0441830fb655e1147a6ebd6a2bac118e Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Wed, 27 Aug 2025 21:56:24 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=A1=A3=E5=8F=A3=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E7=9A=84=20=E7=94=A8=E6=88=B7=E8=BA=AB=E4=BB=BD?=
 =?UTF-8?q?=E8=AF=81=20=E4=BF=A1=E6=81=AF=EF=BC=8C=E8=90=A5=E4=B8=9A?=
 =?UTF-8?q?=E6=89=A7=E7=85=A7=E4=BF=A1=E6=81=AF=E8=B0=83=E4=BC=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xkt/vo/storeProdColorSize/StoreSaleSnResVO.java          | 2 ++
 .../ruoyi/xkt/dto/storeProdColorSize/StoreSaleSnResDTO.java  | 4 ++--
 .../ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java  | 5 +++--
 xkt/src/main/resources/mapper/StoreSaleDetailMapper.xml      | 3 ++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreSaleSnResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreSaleSnResVO.java
index 46a162581..944a50f70 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreSaleSnResVO.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreSaleSnResVO.java
@@ -39,6 +39,8 @@ public class StoreSaleSnResVO {
     private BigDecimal overPrice;
     @ApiModelProperty(value = "标准尺码")
     private Integer standard;
+    @ApiModelProperty(value = "[退货扫码时才有]销售时间")
+    private String soldTime;
     @ApiModelProperty(value = "[退货扫码时才有]优惠后销售单价")
     private BigDecimal discountedPrice;
     @ApiModelProperty(value = "[退货扫码时才有]销售金额")
diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreSaleSnResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreSaleSnResDTO.java
index 569958dc7..3438aad54 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreSaleSnResDTO.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreSaleSnResDTO.java
@@ -1,12 +1,10 @@
 package com.ruoyi.xkt.dto.storeProdColorSize;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
-import java.util.List;
 
 /**
  * @author liujiang
@@ -39,6 +37,8 @@ public class StoreSaleSnResDTO {
     private BigDecimal overPrice;
     @ApiModelProperty(value = "标准尺码")
     private Integer standard;
+    @ApiModelProperty(value = "[退货扫码时才有]销售时间")
+    private String soldTime;
     @ApiModelProperty(value = "[退货扫码时才有]优惠后销售单价")
     private BigDecimal discountedPrice;
     @ApiModelProperty(value = "[退货扫码时才有]销售金额")
diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java
index 068806ab1..2e195b86a 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java
@@ -106,8 +106,9 @@ public class StoreCertificateServiceImpl implements IStoreCertificateService {
                 .in(SysFile::getId, Arrays.asList(storeCert.getIdCardFaceFileId(), storeCert.getIdCardEmblemFileId(), storeCert.getLicenseFileId()))
                 .eq(SysFile::getDelFlag, Constants.UNDELETED))).orElseThrow(() -> new ServiceException("文件不存在!", HttpStatus.ERROR));
         List<StoreCertResDTO.StoreCertFileDTO> fileDTOList = fileList.stream().map(x -> BeanUtil.toBean(x, StoreCertResDTO.StoreCertFileDTO.class)
-                .setFileType(Objects.equals(x.getId(), storeCert.getIdCardFaceFileId()) ? 4 :
-                        (Objects.equals(x.getId(), storeCert.getIdCardEmblemFileId()) ? 5 : 6))).collect(Collectors.toList());
+                        .setFileType(Objects.equals(x.getId(), storeCert.getIdCardFaceFileId()) ? FileType.ID_CARD_FACE.getValue() :
+                                (Objects.equals(x.getId(), storeCert.getIdCardEmblemFileId()) ? FileType.ID_CARD_EMBLEM.getValue() : FileType.BUSINESS_LICENSE.getValue())))
+                .collect(Collectors.toList());
         return BeanUtil.toBean(storeCert, StoreCertResDTO.class).setStoreCertId(storeCert.getId()).setFileList(fileDTOList);
     }
 
diff --git a/xkt/src/main/resources/mapper/StoreSaleDetailMapper.xml b/xkt/src/main/resources/mapper/StoreSaleDetailMapper.xml
index 393d18462..ad3f286f5 100644
--- a/xkt/src/main/resources/mapper/StoreSaleDetailMapper.xml
+++ b/xkt/src/main/resources/mapper/StoreSaleDetailMapper.xml
@@ -15,7 +15,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ssd.discounted_price,
             ssd.quantity,
             ssd.amount,
-            ssd.other_discount
+            ssd.other_discount,
+            DATE_FORMAT(ssd.create_time, '(%m.%e出)') AS soldTime,
         FROM
             store_sale_detail ssd
         WHERE