czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

最近7天

Browse Source
This commit is contained in:
wangw
2025-11-24 15:31:05 +08:00
parent e73f470791
commit 143c2a46ed
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopOrderStatisticMapper.java
View File

@@ -65,7 +65,8 @@ public interface ShopOrderStatisticMapper extends BaseMapper<ShopOrderStatistic>
" tb_shop_order_statistic " + " tb_shop_order_statistic " +
"WHERE " + "WHERE " +
" shop_id = #{shopId} " + " shop_id = #{shopId} " +
" AND statistic_date BETWEEN #{start} AND #{end} ") " AND statistic_date > #{start} " +
" AND statistic_date <= #{end} ")
ShopOrderStatistic countStatistic(Long shopId, LocalDate start, LocalDate end); ShopOrderStatistic countStatistic(Long shopId, LocalDate start, LocalDate end);
//---------------------------------------------金额统计--------------------------------------------------- //---------------------------------------------金额统计---------------------------------------------------
/** /**
@@ -97,7 +98,7 @@ public interface ShopOrderStatisticMapper extends BaseMapper<ShopOrderStatistic>
" tb_shop_order_statistic " + " tb_shop_order_statistic " +
" WHERE" + " WHERE" +
" shop_id = #{shopId} " + " shop_id = #{shopId} " +
"and statistic_date >= #{start} " + "and statistic_date > #{start} " +
"and statistic_date <= #{end} " + "and statistic_date <= #{end} " +
"GROUP BY tradeDay") "GROUP BY tradeDay")
List<TotalVo> getStatDateRange(Long shopId, LocalDate start, LocalDate end); List<TotalVo> getStatDateRange(Long shopId, LocalDate start, LocalDate end);
@@ -134,7 +135,7 @@ public interface ShopOrderStatisticMapper extends BaseMapper<ShopOrderStatistic>
" SUM(credit_pay_count) as creditPay " + " SUM(credit_pay_count) as creditPay " +
" FROM tb_shop_order_statistic " + " FROM tb_shop_order_statistic " +
" WHERE shop_id = #{shopId} " + " WHERE shop_id = #{shopId} " +
" AND statistic_date >= #{start} " + " AND statistic_date > #{start} " +
" AND statistic_date <= #{end} ") " AND statistic_date <= #{end} ")
Map<String, BigDecimal> getPayTypeDateRangeRaw(Long shopId, LocalDate start, LocalDate end); Map<String, BigDecimal> getPayTypeDateRangeRaw(Long shopId, LocalDate start, LocalDate end);

4
cash-service/order-service/src/main/resources/mapper/ShopProdStatisticMapper.xml
View File

@@ -58,7 +58,7 @@
LEFT JOIN tb_product prod ON tb_shop_prod_statistic.prod_id = prod.id LEFT JOIN tb_product prod ON tb_shop_prod_statistic.prod_id = prod.id
WHERE WHERE
tb_shop_prod_statistic.shop_id = #{shopId} tb_shop_prod_statistic.shop_id = #{shopId}
AND tb_shop_prod_statistic.create_day &gt;= #{start} AND tb_shop_prod_statistic.create_day &gt; #{start}
AND tb_shop_prod_statistic.create_day &lt;= #{end} AND tb_shop_prod_statistic.create_day &lt;= #{end}
<if test="productName != null and productName != ''"> <if test="productName != null and productName != ''">
AND prod.name LIKE CONCAT('%',#{productName},'%') AND prod.name LIKE CONCAT('%',#{productName},'%')
@@ -114,7 +114,7 @@
tb_shop_prod_statistic tb_shop_prod_statistic
WHERE WHERE
tb_shop_prod_statistic.shop_id = #{shopId} tb_shop_prod_statistic.shop_id = #{shopId}
AND tb_shop_prod_statistic.create_day &gt;= #{start} AND tb_shop_prod_statistic.create_day &gt; #{start}
AND tb_shop_prod_statistic.create_day &lt;= #{end} AND tb_shop_prod_statistic.create_day &lt;= #{end}
<if test="productName != null and productName != ''"> <if test="productName != null and productName != ''">
AND prod.name LIKE CONCAT('%',#{productName},'%') AND prod.name LIKE CONCAT('%',#{productName},'%')