master：系统bug修复；

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

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<ShopCartPageDetailResDTO> detailList;
 

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);
     }
 
     /**

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