diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java
index 57c7181d..97e8a356 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java
@@ -41,7 +41,7 @@ public interface TbOrderInfoRepository extends JpaRepository<TbOrderInfo, Intege
     List<TbOrderPayCountVo> queryTbOrderPayCount(@Param("shopId")String shopId);
 
     @Query(value = "SELECT COUNT(1) ,pay_type AS payType FROM tb_order_info Where shop_id = :shopId AND  " +
-                    " created_at BETWEEN :startTime AND :endTime AND status='closed' GROUP BY pay_type" ,nativeQuery = true)
+                    " created_at BETWEEN :startTime AND :endTime AND status='closed'AND order_type <>'return' GROUP BY pay_type" ,nativeQuery = true)
     List<Object[]> countByShopId(@Param("shopId") String shopId, @Param("startTime") Long startTime, @Param("endTime") Long endTime);
 
     @Query("SELECT count(1) FROM TbOrderInfo WHERE source = :source AND shopId=:shopId")
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductVo.java b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductVo.java
index 7794020a..034a5610 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductVo.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductVo.java
@@ -46,7 +46,7 @@ public class TbProductVo {
     private String coverImg;
 
     @NotNull(message ="缺少商品类信息")
-    private Integer categoryId;
+    private String categoryId;
 
 
     private Integer specId;