BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master：档口首页商品销售数据统计和客户销售数据统计BUG修复；

pull/1121/head
liujiang 2025-10-08 19:39:27 +08:00
parent 74b7cc0a0d
commit 0179a450e3
6 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleCustomerMapper.xml
View File

@ -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

4
ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleProductMapper.xml
View File

@ -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

4
xkt/src/main/java/com/ruoyi/xkt/dto/dailySale/DailySaleCusDTO.java
View File

@ -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;
}

4
xkt/src/main/java/com/ruoyi/xkt/dto/dailySale/DailySaleProdDTO.java
View File

@ -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;
}

11
xkt/src/main/java/com/ruoyi/xkt/mapper/DailySaleCustomerMapper.java
View File

@ -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<DailySaleCustomer> {
/**
* 获取客户每日销售数据
*
* @param voucherDate 统计的日期
* @return List<DailySaleCusDTO>
*/
List<DailySaleCusDTO> selectDailySale(Date voucherDate);
/**
* 档口客户销售榜前10
*
* @param storeId storeId
* @param storeId storeId
* @param voucherDateStart 开始时间
* @param voucherDateEnd 结束时间
* @param voucherDateEnd 结束时间
* @return List<StoreIndexCustomerSaleTop10ResDTO>
*/
List<StoreIndexCusSaleTop10ResDTO> selectTop10SaleCustomerList(@Param("storeId") Long storeId,

5
xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java
View File

@ -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<ProductMatchDTO> results = StringUtils.isNotBlank(mainPic) ? pictureService.searchProductByPicKey(mainPic, 1000) : new ArrayList<>();
List<ProductMatchDTO> results = StringUtils.isNotBlank(mainPic)
? pictureService.searchProductByPicKey(mainPic, Constants.IMG_SEARCH_MAX_PAGE_NUM) : new ArrayList<>();
List<String> prodTagList = new ArrayList<String>() {{
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)