diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleCustomerMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleCustomerMapper.xml index b870a167b..8bb5a2c4e 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleCustomerMapper.xml +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleCustomerMapper.xml @@ -9,9 +9,9 @@ ss.store_id, ss.store_cus_id, COALESCE ( SUM( CASE WHEN ssd.sale_type = 1 THEN ssd.amount ELSE 0 END ), 0 ) AS saleAmount, - COALESCE ( SUM( CASE WHEN ssd.sale_type = 2 THEN ssd.amount ELSE 0 END ), 0 ) AS returnAmount, + COALESCE ( SUM( CASE WHEN ssd.sale_type = 2 THEN ssd.amount ELSE 0 END ), 0 ) AS refundAmount, COALESCE ( SUM( CASE WHEN ssd.sale_type = 1 THEN ssd.quantity ELSE 0 END ), 0 ) AS saleNum, - COALESCE ( SUM( CASE WHEN ssd.sale_type = 2 THEN ssd.quantity ELSE 0 END ), 0 ) AS returnNum + COALESCE ( SUM( CASE WHEN ssd.sale_type = 2 THEN ssd.quantity ELSE 0 END ), 0 ) AS refundNum FROM store_sale ss LEFT JOIN store_sale_detail ssd ON ss.id = ssd.store_sale_id diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleProductMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleProductMapper.xml index 5e2989abc..ecdb4eca0 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleProductMapper.xml +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleProductMapper.xml @@ -10,9 +10,9 @@ sp.id AS store_prod_id, sp.prod_art_num, COALESCE ( SUM( CASE WHEN ssd.sale_type = 1 THEN ssd.amount ELSE 0 END ), 0 ) AS saleAmount, - COALESCE ( SUM( CASE WHEN ssd.sale_type = 2 THEN ssd.amount ELSE 0 END ), 0 ) AS returnAmount, + COALESCE ( SUM( CASE WHEN ssd.sale_type = 2 THEN ssd.amount ELSE 0 END ), 0 ) AS refundAmount, COALESCE ( SUM( CASE WHEN ssd.sale_type = 1 THEN ssd.quantity ELSE 0 END ), 0 ) AS saleNum, - COALESCE ( SUM( CASE WHEN ssd.sale_type = 2 THEN ssd.quantity ELSE 0 END ), 0 ) AS returnNum + COALESCE ( SUM( CASE WHEN ssd.sale_type = 2 THEN ssd.quantity ELSE 0 END ), 0 ) AS refundNum FROM store_sale_detail ssd LEFT JOIN store_product sp ON ssd.store_prod_id = sp.id diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/dailySale/DailySaleCusDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/dailySale/DailySaleCusDTO.java index f8f03d64b..074ac7279 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/dailySale/DailySaleCusDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/dailySale/DailySaleCusDTO.java @@ -27,7 +27,7 @@ public class DailySaleCusDTO { /** * 退货金额 */ - private BigDecimal returnAmount; + private BigDecimal refundAmount; /** * 销售数量 */ @@ -35,6 +35,6 @@ public class DailySaleCusDTO { /** * 退货数量 */ - private Integer returnNum; + private Integer refundNum; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/dailySale/DailySaleProdDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/dailySale/DailySaleProdDTO.java index 1ccce8392..601531447 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/dailySale/DailySaleProdDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/dailySale/DailySaleProdDTO.java @@ -31,7 +31,7 @@ public class DailySaleProdDTO { /** * 退货金额 */ - private BigDecimal returnAmount; + private BigDecimal refundAmount; /** * 销售数量 */ @@ -39,6 +39,6 @@ public class DailySaleProdDTO { /** * 退货数量 */ - private Integer returnNum; + private Integer refundNum; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/DailySaleCustomerMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/DailySaleCustomerMapper.java index d48b07c29..3af615a6f 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/DailySaleCustomerMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/DailySaleCustomerMapper.java @@ -5,7 +5,6 @@ import com.ruoyi.xkt.domain.DailySaleCustomer; import com.ruoyi.xkt.dto.dailySale.DailySaleCusDTO; import com.ruoyi.xkt.dto.store.StoreIndexCusSaleTop10ResDTO; import com.ruoyi.xkt.dto.store.StoreIndexOverviewResDTO; -import com.ruoyi.xkt.dto.store.StoreSaleCustomerTop10DTO; import org.apache.ibatis.annotations.Param; import java.util.Date; @@ -18,14 +17,20 @@ import java.util.List; */ public interface DailySaleCustomerMapper extends BaseMapper { + /** + * 获取客户每日销售数据 + * + * @param voucherDate 统计的日期 + * @return List + */ List selectDailySale(Date voucherDate); /** * 档口客户销售榜前10 * - * @param storeId storeId + * @param storeId storeId * @param voucherDateStart 开始时间 - * @param voucherDateEnd 结束时间 + * @param voucherDateEnd 结束时间 * @return List */ List selectTop10SaleCustomerList(@Param("storeId") Long storeId, diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java index bb3c791fc..7dfb83709 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java @@ -1586,14 +1586,15 @@ public class WebsitePCServiceImpl implements IWebsitePCService { final Long storeProdId = Long.valueOf(advertRound.getProdIdStr()); StoreProdViewDTO viewDTO = viewMap.get(storeProdId); String mainPic = ObjectUtils.isNotEmpty(viewDTO) ? viewDTO.getMainPicUrl() : ""; - List results = StringUtils.isNotBlank(mainPic) ? pictureService.searchProductByPicKey(mainPic, 1000) : new ArrayList<>(); + List results = StringUtils.isNotBlank(mainPic) + ? pictureService.searchProductByPicKey(mainPic, Constants.IMG_SEARCH_MAX_PAGE_NUM) : new ArrayList<>(); List prodTagList = new ArrayList() {{ add("同类热卖"); }}; CollectionUtils.addAll(prodTagList, ObjectUtils.isNotEmpty(viewDTO) && StringUtils.isNotBlank(viewDTO.getTagStr()) ? StrUtil.split(viewDTO.getTagStr(), ",") : new ArrayList<>()); return new PicSearchAdvertDTO() - .setImgSearchCount(prodStatsMap.containsKey(storeProdId) ? prodStatsMap.get(storeProdId) : null) + .setImgSearchCount(prodStatsMap.getOrDefault(storeProdId, 1L)) .setSameProdCount(results.size()).setStoreProdId(storeProdId).setStoreId(advertRound.getStoreId()).setTags(prodTagList) .setStoreName(ObjectUtils.isNotEmpty(viewDTO) ? viewDTO.getStoreName() : "") .setPrice(ObjectUtils.isNotEmpty(viewDTO) ? viewDTO.getPrice() : null)