From 72f1394437bb7dccf605853770d7372fa0e41753 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Mon, 20 Oct 2025 23:24:18 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=B3=BB=E7=BB=9Fbug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/quartz/DailySaleCustomerMapper.xml | 2 +- .../com/ruoyi/xkt/dto/userShoppingCart/ShopCartPageResDTO.java | 2 ++ .../main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java | 2 +- xkt/src/main/resources/mapper/ShoppingCartMapper.xml | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleCustomerMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleCustomerMapper.xml index 0a3716126..0226150ac 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleCustomerMapper.xml +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleCustomerMapper.xml @@ -15,7 +15,7 @@ FROM store_sale_detail ssd WHERE - ssd.del_flag = 0 AND ss.voucher_date = #{voucherDate} + ssd.del_flag = 0 AND ssd.voucher_date = #{voucherDate} GROUP BY ssd.store_id, ssd.store_cus_id diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartPageResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartPageResDTO.java index 534bcc7b9..f26713009 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartPageResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartPageResDTO.java @@ -34,6 +34,8 @@ public class ShopCartPageResDTO { private String prodStatus; @ApiModelProperty(value = "标注尺码") private String standardSize; + @ApiModelProperty(value = "发货时效") + private Integer deliveryTime; @ApiModelProperty(value = "进货车明细列表") List detailList; diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java index bff46e6b0..6dd177073 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java @@ -331,7 +331,7 @@ public class StoreServiceImpl implements IStoreService { return new StoreIndexOverviewResDTO().setSaleAmount(saleAmount).setRefundAmount(refundAmount).setSaleNum(saleNum).setRefundNum(refundNum) .setStorageNum(storageNum).setCustomerNum(customerNum).setStoreId(overviewDTO.getStoreId()) .setTopSaleCusName(ObjectUtils.isNotEmpty(maxSaleCus) ? maxSaleCus.getTopSaleCusName() : "") - .setTopSaleCusAmount(ObjectUtils.isNotEmpty(maxSaleCus) ? maxSaleCus.getTopSaleCusAmount() : null); + .setTopSaleCusAmount(ObjectUtils.isNotEmpty(maxSaleCus) ? maxSaleCus.getTopSaleCusAmount() : BigDecimal.ZERO); } /** diff --git a/xkt/src/main/resources/mapper/ShoppingCartMapper.xml b/xkt/src/main/resources/mapper/ShoppingCartMapper.xml index ce2793852..c49a47a95 100644 --- a/xkt/src/main/resources/mapper/ShoppingCartMapper.xml +++ b/xkt/src/main/resources/mapper/ShoppingCartMapper.xml @@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" s.store_name, sp.prod_art_num, sp.prod_title, + sp.delivery_time, CASE sp.prod_status WHEN 2 THEN