后台加个接口可查询供应商所有进货（总金额）商品总款数、总件数、采购退货（总金额）商品总款数、总件数；查询客户进货（总金额）商品总款数、总件数、退货（总金额）商品总款数、总件数

1 year ago · dd757a5ac9
24 changed files with 141 additions and 54 deletions
--- a/hiver-admin/src/main/resources/application.yml
+++ b/hiver-admin/src/main/resources/application.yml
@ -345,6 +345,8 @@ ignored:
    - /hiver/app/purchaseReturn/getPurchaseReturnById
    - /hiver/app/purchase/getPurchaseAllData
    - /hiver/app/dealingRecord/getDealingsRecordList
+    - /hiver/app/customer/getCustomerData
+    - /hiver/app/supplier/getSupplierData

    # 临时增加
    - /hiver/app/logisticsOrder/addLogisticsOrder
--- a/hiver-admin/test-output/test-report.html
+++ b/hiver-admin/test-output/test-report.html
@ -5,7 +5,7 @@
 <head>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-<title>Hiver���Ա���</title>
+<title>Hiver测试报告</title>
 <link rel="apple-touch-icon" href="spark/logo.png">
 <link rel="shortcut icon" href="spark/logo.png">
 <link rel="stylesheet" href="spark/spark-style.css">
@ -35,7 +35,7 @@
 <a href="#"><span class="badge badge-primary">Hiver</span></a>
 </li>
 <li class="m-r-10">
-<a href="#"><span class="badge badge-primary">ʮ�� 24, 2024 20:09:59</span></a>
+<a href="#"><span class="badge badge-primary">十月 26, 2024 01:12:03</span></a>
 </li>
 </ul>
 </div>
@ -84,7 +84,7 @@
          <div class="test-detail">
            <span class="meta text-white badge badge-sm"></span>
            <p class="name">passTest</p>
-            <p class="text-sm"><span>20:10:00 ����</span> / <span>0.017 secs</span></p>
+            <p class="text-sm"><span>01:12:03 上午</span> / <span>0.015 secs</span></p>
          </div>
          <div class="test-contents d-none">
 <div class="detail-head">
@ -92,9 +92,9 @@
 <div class="info">
 <div class='float-right'><span class='badge badge-default'>#test-id=1</span></div>
 <h5 class="test-status text-pass">passTest</h5>
-<span class='badge badge-success'>10.24.2024 20:10:00</span>
-<span class='badge badge-danger'>10.24.2024 20:10:00</span>
-<span class='badge badge-default'>0.017 secs</span>
+<span class='badge badge-success'>10.26.2024 01:12:03</span>
+<span class='badge badge-danger'>10.26.2024 01:12:03</span>
+<span class='badge badge-default'>0.015 secs</span>
 </div>
 <div class="m-t-10 m-l-5"></div>
 </div>
@ -104,7 +104,7 @@
  <tbody>
      <tr class="event-row">
        <td><span class="badge log pass-bg">Pass</span></td>
-        <td>20:10:00</td>
+        <td>1:12:03</td>
        <td>
          Test passed
        </td>
@ -128,13 +128,13 @@
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Started</p>
-<h3>ʮ�� 24, 2024 20:09:59</h3>
+<h3>十月 26, 2024 01:12:03</h3>
 </div></div>
 </div>
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Ended</p>
-<h3>ʮ�� 24, 2024 20:10:00</h3>
+<h3>十月 26, 2024 01:12:03</h3>
 </div></div>
 </div>
 <div class="col-md-3">
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CustomerController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CustomerController.java
@ -18,6 +18,7 @@ import cc.hiver.mall.pojo.dto.DebtCustomer;
 import cc.hiver.mall.pojo.query.CustomerPageQuery;
 import cc.hiver.mall.pojo.vo.CustomerDataVo;
 import cc.hiver.mall.service.mybatis.CustomerService;
+import cc.hiver.mall.utils.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
@ -289,6 +290,9 @@ public class CustomerController {
        if (StringUtils.isEmpty(customerPageQuery.getCustomerId())) {
            return ResultUtil.error("客户id不能为空");
        }
+        if(StringUtils.isNotEmpty(customerPageQuery.getEndDate())){
+            customerPageQuery.setEndDate(DateUtil.addDay(customerPageQuery.getEndDate(),1));
+        }
        final CustomerDataVo customerData = customerService.getCustomerData(customerPageQuery);
        return new ResultUtil<CustomerDataVo>().setData(customerData);
    }
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/SupplierControlller.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/SupplierControlller.java
@ -18,6 +18,7 @@ import cc.hiver.mall.pojo.query.PurchasePageQuery;
 import cc.hiver.mall.pojo.vo.SupplierDataVo;
 import cc.hiver.mall.service.SupplierService;
 import cc.hiver.mall.service.mybatis.DealingsRecordService;
+import cc.hiver.mall.utils.DateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@ -194,6 +195,9 @@ public class SupplierControlller {
        if (StringUtils.isEmpty(purchasePageQuery.getSupplierId())) {
            return ResultUtil.error("供应商id不能为空");
        }
+        if(StringUtils.isNotEmpty(purchasePageQuery.getEndDate())){
+            purchasePageQuery.setEndDate(DateUtil.addDay(purchasePageQuery.getEndDate(),1));
+        }
        final SupplierDataVo suppliers = supplierService.getSupplierData(purchasePageQuery);
        return new ResultUtil<SupplierDataVo>().setData(suppliers);
    }
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/PurchaseMapper.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/PurchaseMapper.java
@ -6,6 +6,7 @@ import cc.hiver.mall.entity.Purchase;
 import cc.hiver.mall.entity.PurchaseExample;
 import cc.hiver.mall.pojo.dto.DebtSupplier;
 import cc.hiver.mall.pojo.query.PurchasePageQuery;
+import cc.hiver.mall.pojo.vo.ProductDataVo;
 import cc.hiver.mall.pojo.vo.PurchasingCostDetailVo;
 import cc.hiver.mall.pojo.vo.SupplierDataVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -79,5 +80,5 @@ public interface PurchaseMapper extends BaseMapper<Purchase> {
     * @date 2024/10/24
     * @param purchasePageQuery
     */
-    SupplierDataVo getPurchaseCount(@Param("purchasePageQuery") PurchasePageQuery purchasePageQuery);
+    List<ProductDataVo> getPurchaseCount(@Param("purchasePageQuery") PurchasePageQuery purchasePageQuery);
 }
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ReturnSaleMapper.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ReturnSaleMapper.java
@ -6,10 +6,7 @@ import cc.hiver.mall.entity.ReturnSale;
 import cc.hiver.mall.entity.ReturnSaleExample;
 import cc.hiver.mall.pojo.query.CustomerPageQuery;
 import cc.hiver.mall.pojo.query.ReturnSalePageQuery;
-import cc.hiver.mall.pojo.vo.CustomerDataVo;
-import cc.hiver.mall.pojo.vo.ReturnSaleVo;
-import cc.hiver.mall.pojo.vo.ReturnTotalAmountDetailVo;
-import cc.hiver.mall.pojo.vo.SaleAllVO;
+import cc.hiver.mall.pojo.vo.*;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
@ -98,5 +95,5 @@ public interface ReturnSaleMapper extends BaseMapper<ReturnSale> {

    CustomerDataVo getSaleReturnPrice(@Param("customerPageQuery") CustomerPageQuery customerPageQuery);

-    CustomerDataVo getSaleReturnCount(@Param("customerPageQuery") CustomerPageQuery customerPageQuery);
+    List<ProductDataVo> getSaleReturnCount(@Param("customerPageQuery") CustomerPageQuery customerPageQuery);
 }
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleMapper.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleMapper.java
@ -146,5 +146,5 @@ public interface SaleMapper extends BaseMapper<Sale> {

    CustomerDataVo getSalePrice(@Param("customerPageQuery")CustomerPageQuery customerPageQuery);

-    CustomerDataVo getSaleCount(@Param("customerPageQuery")CustomerPageQuery customerPageQuery);
+    List<ProductDataVo> getSaleCount(@Param("customerPageQuery")CustomerPageQuery customerPageQuery);
 }
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/vo/CustomerDataVo.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/vo/CustomerDataVo.java
@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+import java.util.List;
+
 /**
 * 供应商（总金额）商品总款数、总件数、采购退货（总金额）商品总款数、总件数Vo
 * @author 王富康
@ -16,12 +18,18 @@ public class CustomerDataVo {
    @ApiModelProperty(value = "供应商（总金额）商品总款数")
    private String salePrice;

-    @ApiModelProperty(value = "总件数")
+    @ApiModelProperty(value = "总款数")
    private Integer saleCount;

+    @ApiModelProperty(value = "总件数")
+    private List<ProductDataVo> productDataVos;
+
    @ApiModelProperty(value = "采购退货（总金额）商品总款数")
    private String saleReturnPrice;

-    @ApiModelProperty(value = "采购退货总件数")
+    @ApiModelProperty(value = "采购退货总款数")
    private Integer saleReturnCount;
+
+    @ApiModelProperty(value = "退货总件数")
+    private List<ProductDataVo> returnProductDataVos;
 }
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/vo/ProductDataVo.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/vo/ProductDataVo.java
@ -0,0 +1,21 @@
+package cc.hiver.mall.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 供应商（总金额）商品总款数、总件数、采购退货（总金额）商品总款数、总件数Vo
+ * @author 王富康
+ * @date 2024/10/24
+ */
+@Data
+@ApiModel(value = "供应商（总金额）商品总款数、总件数、采购退货（总金额）商品总款数、总件数")
+public class ProductDataVo {
+
+    @ApiModelProperty(value = "商品id")
+    private String productId;
+
+    @ApiModelProperty(value = "件数")
+    private Integer productCount;
+}
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/vo/SupplierDataVo.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/vo/SupplierDataVo.java
@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+import java.util.List;
+
 /**
 * 供应商（总金额）商品总款数、总件数、采购退货（总金额）商品总款数、总件数Vo
 * @author 王富康
@ -19,9 +21,15 @@ public class SupplierDataVo {
    @ApiModelProperty(value = "总件数")
    private Integer purchaseCount;

+    @ApiModelProperty(value = "总件数")
+    private List<ProductDataVo> productDataVos;
+
    @ApiModelProperty(value = "采购退货（总金额）商品总款数")
    private String purchaseReturnPrice;

    @ApiModelProperty(value = "采购退货总件数")
    private Integer purchaseReturnCount;
+
+    @ApiModelProperty(value = "总件数")
+    private List<ProductDataVo> returnProductDataVos;
 }
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/purchasereturn/mapper/PurchaseReturnMapper.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/purchasereturn/mapper/PurchaseReturnMapper.java
@ -1,6 +1,7 @@
 package cc.hiver.mall.purchasereturn.mapper;

 import cc.hiver.mall.pojo.query.PurchasePageQuery;
+import cc.hiver.mall.pojo.vo.ProductDataVo;
 import cc.hiver.mall.pojo.vo.SupplierDataVo;
 import cc.hiver.mall.purchasereturn.entity.PurchaseReturn;
 import cc.hiver.mall.purchasereturn.vo.PurchaseReturnQueryVo;
@ -9,6 +10,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;

+import java.util.List;
+
 /**
 * 采购退货Mapper
 *
@ -45,5 +48,5 @@ public interface PurchaseReturnMapper extends BaseMapper<PurchaseReturn> {
     * @param purchasePageQuery
     * @return SupplierDataVo
     */
-    SupplierDataVo getPurchaseReturnCount(@Param("purchasePageQuery") PurchasePageQuery purchasePageQuery);
+    List<ProductDataVo> getPurchaseReturnCount(@Param("purchasePageQuery") PurchasePageQuery purchasePageQuery);
 }
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/purchasereturn/service/impl/PurchaseReturnServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/purchasereturn/service/impl/PurchaseReturnServiceImpl.java
@ -9,6 +9,7 @@ import cc.hiver.mall.entity.Stock;
 import cc.hiver.mall.entity.StockLog;
 import cc.hiver.mall.entity.Supplier;
 import cc.hiver.mall.pojo.query.PurchasePageQuery;
+import cc.hiver.mall.pojo.vo.ProductDataVo;
 import cc.hiver.mall.pojo.vo.SupplierDataVo;
 import cc.hiver.mall.purchasereturn.constant.PurchaseReturnConstant;
 import cc.hiver.mall.purchasereturn.entity.PurchaseReturn;
@ -245,9 +246,19 @@ public class PurchaseReturnServiceImpl extends ServiceImpl<PurchaseReturnMapper,
    public SupplierDataVo getSupplierReturnPurchaseInfo(PurchasePageQuery purchasePageQuery) {
        final SupplierDataVo supplierDataVo = new SupplierDataVo();
        final SupplierDataVo purchaseReturnPrice = purchaseReturnMapper.getPurchaseReturnPrice(purchasePageQuery);
-        final SupplierDataVo purchaseReturnCount = purchaseReturnMapper.getPurchaseReturnCount(purchasePageQuery);
+        if(purchaseReturnPrice != null){
            supplierDataVo.setPurchaseReturnPrice(purchaseReturnPrice.getPurchaseReturnPrice());
-        supplierDataVo.setPurchaseReturnCount(purchaseReturnCount.getPurchaseReturnCount());
+        }else{
+            supplierDataVo.setPurchaseReturnPrice("0.00");
+        }
+
+
+        List<ProductDataVo> purchaseReturnCount = purchaseReturnMapper.getPurchaseReturnCount(purchasePageQuery);
+        if(purchaseReturnCount == null){
+            purchaseReturnCount = new ArrayList<>();
+        }
+        supplierDataVo.setPurchaseReturnCount(purchaseReturnCount.size());
+        supplierDataVo.setReturnProductDataVos(purchaseReturnCount);
        return supplierDataVo;
    }
 }
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesCalculateServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesCalculateServiceImpl.java
@ -102,10 +102,7 @@ public class SalesCalculateServiceImpl implements SalesCalculateService {
        // 查询日期范围内数据
        returnSaleExample.createCriteria()
                .andCreateTimeBetween(startDate, endDate)
-                .andStatusNotEqualTo(SaleConstant.SALE_STATUS[2])
-                .andStatusNotEqualTo(SaleConstant.SALE_STATUS[8])
-                .andStatusNotEqualTo(SaleConstant.SALE_STATUS[11])
-                .andStatusNotEqualTo(SaleConstant.SALE_STATUS[12])
+                .andStatusEqualTo(SaleConstant.SALE_STATUS[4])
                .andDelFlagEqualTo(CommonConstant.DEL_FLAG_FALSE)
                .andShopIdEqualTo(shopId);
        final SaleAllVO returnAllVO1 = returnSaleMapper.saleSumAndCount(returnSaleExample);
@ -156,7 +153,8 @@ public class SalesCalculateServiceImpl implements SalesCalculateService {
        }*/
        // 利润
        BigDecimal totalPurchasePrice = saleDetailService.getTotalProfit(shopId,startTime,endTime);
-        saleAllVO.setTotalProfit(totalPurchasePrice);
+        // 销售总成本-进货成本 =利润
+        saleAllVO.setTotalProfit(saleAllVO.getTotalAmount().subtract(totalPurchasePrice));

        //获取当日门店下单客户数
        final QueryWrapper<Sale> querySaleWrapper = new QueryWrapper<>();
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SupplierServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SupplierServiceImpl.java
@ -197,10 +197,12 @@ public class SupplierServiceImpl implements SupplierService {
        final SupplierDataVo supplierPurchaseInfo = purchaseService.getSupplierPurchaseInfo(purchasePageQuery);
        returnSupplierDataVo.setPurchasePrice(supplierPurchaseInfo.getPurchasePrice());
        returnSupplierDataVo.setPurchaseCount(supplierPurchaseInfo.getPurchaseCount());
+        returnSupplierDataVo.setProductDataVos(supplierPurchaseInfo.getProductDataVos());
        // 查询供应商 采购退货（总金额）商品总款数、总件数
        final SupplierDataVo supplierReturnPurchaseInfo = purchaseReturnService.getSupplierReturnPurchaseInfo(purchasePageQuery);
        returnSupplierDataVo.setPurchaseReturnPrice(supplierReturnPurchaseInfo.getPurchaseReturnPrice());
        returnSupplierDataVo.setPurchaseReturnCount(supplierReturnPurchaseInfo.getPurchaseReturnCount());
+        returnSupplierDataVo.setReturnProductDataVos(supplierReturnPurchaseInfo.getReturnProductDataVos());
        return returnSupplierDataVo;
    }
 }
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/CustomerServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/CustomerServiceImpl.java
@ -253,10 +253,12 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
        final CustomerDataVo saleDataVo = saleService.getCustomerSaleInfo(customerPageQuery);
        customerDataVo.setSalePrice(saleDataVo.getSalePrice());
        customerDataVo.setSaleCount(saleDataVo.getSaleCount());
+        customerDataVo.setProductDataVos(saleDataVo.getProductDataVos());
        // 查询客户 退货（总金额）商品总款数、总件数
        final CustomerDataVo returnSaleInfo = returnSaleService.getCustomerSaleReturnInfo(customerPageQuery);
        customerDataVo.setSaleReturnPrice(returnSaleInfo.getSaleReturnPrice());
        customerDataVo.setSaleReturnCount(returnSaleInfo.getSaleReturnCount());
+        customerDataVo.setReturnProductDataVos(returnSaleInfo.getReturnProductDataVos());
        return customerDataVo;
    }
 }
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/PurchaseServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/PurchaseServiceImpl.java
@ -12,10 +12,7 @@ import cc.hiver.mall.debt.service.DebtService;
 import cc.hiver.mall.entity.*;
 import cc.hiver.mall.pojo.dto.DebtSupplier;
 import cc.hiver.mall.pojo.query.PurchasePageQuery;
-import cc.hiver.mall.pojo.vo.ProductCategoryVo;
-import cc.hiver.mall.pojo.vo.PurchaseVo;
-import cc.hiver.mall.pojo.vo.PurchasingCostDetailVo;
-import cc.hiver.mall.pojo.vo.SupplierDataVo;
+import cc.hiver.mall.pojo.vo.*;
 import cc.hiver.mall.purchaseocr.entity.PurchaseOcrPicture;
 import cc.hiver.mall.purchaseocr.service.PurchaseOcrPictureService;
 import cc.hiver.mall.purchaseocr.vo.PurchaseOcrCountVo;
@ -775,9 +772,19 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase> i
    public SupplierDataVo getSupplierPurchaseInfo(PurchasePageQuery purchasePageQuery) {
        final SupplierDataVo supplierDataVo = new SupplierDataVo();
        final SupplierDataVo purchasePrice = purchaseMapper.getPurchasePrice(purchasePageQuery);
-        final SupplierDataVo purchaseCount = purchaseMapper.getPurchaseCount(purchasePageQuery);
+        if(purchasePrice != null){
            supplierDataVo.setPurchasePrice(purchasePrice.getPurchasePrice());
-        supplierDataVo.setPurchaseCount(purchaseCount.getPurchaseCount());
+        }else{
+            supplierDataVo.setPurchasePrice("0.00");
+        }
+
+
+        List<ProductDataVo> purchaseCount = purchaseMapper.getPurchaseCount(purchasePageQuery);
+        if(purchaseCount == null){
+            purchaseCount = new ArrayList<>();
+        }
+        supplierDataVo.setPurchaseCount(purchaseCount.size());
+        supplierDataVo.setProductDataVos(purchaseCount);
        return supplierDataVo;
    }
 }
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ReturnSaleServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ReturnSaleServiceImpl.java
@ -12,6 +12,7 @@ import cc.hiver.mall.pojo.dto.SaleDetailQueryDTO;
 import cc.hiver.mall.pojo.query.CustomerPageQuery;
 import cc.hiver.mall.pojo.query.ReturnSalePageQuery;
 import cc.hiver.mall.pojo.vo.CustomerDataVo;
+import cc.hiver.mall.pojo.vo.ProductDataVo;
 import cc.hiver.mall.pojo.vo.ReturnSaleVo;
 import cc.hiver.mall.pojo.vo.ReturnTotalAmountDetailVo;
 import cc.hiver.mall.service.mybatis.ProductService;
@ -302,11 +303,20 @@ public class ReturnSaleServiceImpl extends ServiceImpl<ReturnSaleMapper, ReturnS
        final CustomerDataVo customerDataVo = new CustomerDataVo();
        // 查询客户 退货（总金额）商品总款数
        final CustomerDataVo salePrice = returnSaleMapper.getSaleReturnPrice(customerPageQuery);
+        if(salePrice != null){
+            customerDataVo.setSaleReturnPrice(salePrice.getSaleReturnPrice());
+        }else{
+            customerDataVo.setSaleReturnPrice("0.00");
+        }
+

        // 查询客户 退货 总件数
-        final CustomerDataVo saleCount = returnSaleMapper.getSaleReturnCount(customerPageQuery);
-        customerDataVo.setSaleReturnPrice(salePrice.getSaleReturnPrice());
-        customerDataVo.setSaleReturnCount(saleCount.getSaleReturnCount());
+        List<ProductDataVo> saleCount = returnSaleMapper.getSaleReturnCount(customerPageQuery);
+        if(saleCount == null ){
+            saleCount = new ArrayList<>();
+        }
+        customerDataVo.setSaleReturnCount(saleCount.size());
+        customerDataVo.setReturnProductDataVos(saleCount);
        return customerDataVo;
    }
 }
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/SaleServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/SaleServiceImpl.java
@ -1330,11 +1330,20 @@ public class SaleServiceImpl extends ServiceImpl<SaleMapper, Sale> implements Sa
        final CustomerDataVo customerDataVo = new CustomerDataVo();
        // 查询客户 拿货（总金额）商品总款数
        final CustomerDataVo salePrice = saleMapper.getSalePrice(customerPageQuery);
+        if(salePrice != null){
+            customerDataVo.setSalePrice(salePrice.getSalePrice());
+        }else{
+            customerDataVo.setSalePrice("0.00");
+        }
+

        // 查询客户 总件数
-        final CustomerDataVo saleCount = saleMapper.getSaleCount(customerPageQuery);
-        customerDataVo.setSalePrice(salePrice.getSalePrice());
-        customerDataVo.setSaleCount(saleCount.getSaleCount());
+        List<ProductDataVo> saleCount = saleMapper.getSaleCount(customerPageQuery);
+        if(saleCount == null ){
+            saleCount = new ArrayList<>();
+        }
+        customerDataVo.setSaleCount(saleCount.size());
+        customerDataVo.setProductDataVos(saleCount);
        return customerDataVo;
    }

--- a/hiver-modules/hiver-mall/src/main/resources/mapper/PurchaseMapper.xml
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/PurchaseMapper.xml
@ -583,7 +583,7 @@
  </select>

  <!--查询供应商（总金额）商品总款数-->
-  <select id="getSupplierPurchaseInfo" resultType="cc.hiver.mall.pojo.vo.SupplierDataVo">
+  <select id="getPurchasePrice" resultType="cc.hiver.mall.pojo.vo.SupplierDataVo">
    select sum(should_pay) as purchase_price
    from t_purchase
    where supplier_id = #{purchasePageQuery.supplierId}
@ -595,9 +595,9 @@
  </select>

  <!--查询供应商总件数-->
-  <select id="getSupplierPurchaseInfo" resultType="cc.hiver.mall.pojo.vo.SupplierDataVo">
+  <select id="getPurchaseCount" resultType="cc.hiver.mall.pojo.vo.ProductDataVo">
    SELECT
-    sum( dd.product_count ) as purchase_count,
+    sum( dd.product_count ) as product_count,
    dd.product_id
    FROM
    t_purchase_detail dd
--- a/hiver-modules/hiver-mall/src/main/resources/mapper/PurchaseReturnMapper.xml
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/PurchaseReturnMapper.xml
@ -83,9 +83,9 @@
    </if>
  </select>

-  <select id="getPurchaseReturnCount" resultType="cc.hiver.mall.pojo.vo.SupplierDataVo">
+  <select id="getPurchaseReturnCount" resultType="cc.hiver.mall.pojo.vo.ProductDataVo">
    SELECT
-    sum( dd.product_count ) as purchase_return_count,
+    sum( dd.product_count ) as product_count,
    dd.product_id
    FROM
    t_purchase_return_detail dd
--- a/hiver-modules/hiver-mall/src/main/resources/mapper/ReturnDetailMapper.xml
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/ReturnDetailMapper.xml
@ -561,6 +561,6 @@
    and trd.shop_id = #{shopId}
    and trd.create_time BETWEEN #{startTime} AND #{endTime}
    and trd.return_sale_id in
-    (select id from t_return_sale where shop_id = #{shopId} and del_flag='0' and status != '02')
+    (select id from t_return_sale where shop_id = #{shopId} and del_flag='0' and status = '4')
  </select>
 </mapper>
--- a/hiver-modules/hiver-mall/src/main/resources/mapper/ReturnSaleMapper.xml
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/ReturnSaleMapper.xml
@ -602,8 +602,8 @@
    ts.del_flag = '0'
    and ts.user_id = #{customerBillQueryVo.customerId}
    and ts.shop_id = #{customerBillQueryVo.shopId}
-    <!--订单状态不为:02：退货已作废-->
-    and ts.status not in ( '02' )
+    <!--订单状态不为:为 已完成-->
+    and ts.status = '4'
    <if test='customerBillQueryVo.startDate !=null and customerBillQueryVo.endDate !=null'>
      and ts.create_time BETWEEN #{customerBillQueryVo.startDate} AND #{customerBillQueryVo.endDate}
    </if>
@ -711,7 +711,7 @@

  <select id="getSaleReturnPrice" resultType="cc.hiver.mall.pojo.vo.CustomerDataVo">
    SELECT
-    sum( tt.real_amount ) as sale_return_price
+    sum( tt.total_amount ) as sale_return_price
    FROM
    t_return_sale tt
    JOIN t_sale ss ON ss.id = tt.sale_id
@ -725,9 +725,9 @@
  </select>


-  <select id="getSaleReturnCount" resultType="cc.hiver.mall.pojo.vo.CustomerDataVo">
+  <select id="getSaleReturnCount" resultType="cc.hiver.mall.pojo.vo.ProductDataVo">
    SELECT
-    sum( tt.product_count ) as sale_return_count,
+    sum( tt.product_count ) as product_count,
    tt.product_id
    FROM
    t_return_detail tt
--- a/hiver-modules/hiver-mall/src/main/resources/mapper/SaleDetailMapper.xml
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/SaleDetailMapper.xml
@ -556,7 +556,7 @@
  </select>

  <select id="getTotalProfit" resultType="java.math.BigDecimal">
-    SELECT IFNULL(SUM(( sd.discount_amount - COALESCE(pd.purchase_price, 0) ) * sd.product_count),0.00) AS profit
+    SELECT IFNULL(SUM( COALESCE(pd.purchase_price, 0) * sd.product_count),0.00) AS profit
    FROM
    t_sale_detail sd
    JOIN t_product pd ON sd.product_id = pd.id
--- a/hiver-modules/hiver-mall/src/main/resources/mapper/SaleMapper.xml
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/SaleMapper.xml
@ -1409,9 +1409,9 @@ GROUP BY
    </if>
  </select>

-  <select id="getSaleCount" resultType="cc.hiver.mall.pojo.vo.CustomerDataVo">
+  <select id="getSaleCount" resultType="cc.hiver.mall.pojo.vo.ProductDataVo">
    SELECT
-    sum( dd.product_count ) as sale_count,
+    sum( dd.product_count ) as product_count,
    dd.product_id
    FROM
    t_sale_detail dd