新增商品组合退款统计

admin-ui/src/views/order/statistics/bywash.vue

@@ -46,7 +46,7 @@
   
       <!-- 统计卡片 -->
       <el-row :gutter="20" class="mb8">
-        <el-col :span="6">
+        <el-col :span="8">
           <el-card shadow="hover">
             <div slot="header"><span>收衣订单数</span></div>
             <div class="card-body">
@@ -54,7 +54,7 @@
             </div>
           </el-card>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-card shadow="hover">
             <div slot="header"><span>收衣总件数</span></div>
             <div class="card-body">
@@ -62,7 +62,7 @@
             </div>
           </el-card>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-card shadow="hover">
             <div slot="header"><span>收衣订单总金额</span></div>
             <div class="card-body">
@@ -70,25 +70,11 @@
             </div>
           </el-card>
         </el-col>
-        <el-col :span="6">
-          <el-card shadow="hover">
-            <div slot="header"><span>收衣未支付订单数</span></div>
-            <div class="card-body">
-              <count-to :startVal="0" :endVal="totalStatistics.receiveUnpaidOrderCount || 0" :duration="2000"></count-to>
-            </div>
-          </el-card>
-        </el-col>
+        
       </el-row>
       <el-row :gutter="20" class="mb8">
-        <el-col :span="6">
-          <el-card shadow="hover">
-            <div slot="header"><span>收衣未支付订单金额</span></div>
-            <div class="card-body">
-              <count-to :startVal="0" :endVal="totalStatistics.receiveUnpaidAmount || 0" :duration="2000" :decimals="2" prefix="¥"></count-to>
-            </div>
-          </el-card>
-        </el-col>
-        <el-col :span="6">
+        
+        <el-col :span="8">
           <el-card shadow="hover">
             <div slot="header"><span>取衣订单数</span></div>
             <div class="card-body">
@@ -96,7 +82,7 @@
             </div>
           </el-card>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-card shadow="hover">
             <div slot="header"><span>取衣总件数</span></div>
             <div class="card-body">
@@ -104,7 +90,7 @@
             </div>
           </el-card>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-card shadow="hover">
             <div slot="header"><span>取衣订单总金额</span></div>
             <div class="card-body">
@@ -113,24 +99,7 @@
           </el-card>
         </el-col>
       </el-row>
-      <el-row :gutter="20" class="mb8">
-        <el-col :span="6">
-          <el-card shadow="hover">
-            <div slot="header"><span>取衣已支付订单数</span></div>
-            <div class="card-body">
-              <count-to :startVal="0" :endVal="totalStatistics.pickupPaidOrderCount || 0" :duration="2000"></count-to>
-            </div>
-          </el-card>
-        </el-col>
-        <el-col :span="6">
-          <el-card shadow="hover">
-            <div slot="header"><span>取衣已支付订单金额</span></div>
-            <div class="card-body">
-              <count-to :startVal="0" :endVal="totalStatistics.pickupPaidAmount || 0" :duration="2000" :decimals="2" prefix="¥"></count-to>
-            </div>
-          </el-card>
-        </el-col>
-      </el-row>
+      
       <!-- 数据表格 -->
       <el-table v-loading="loading" :data="statisticsList" border>
         <el-table-column label="门店名称" align="center" prop="storeName" />

yiqi-core/src/main/java/com/yiqi/core/service/impl/SettlementFactoryStatisticsServiceImpl.java

@@ -112,10 +112,13 @@ public class SettlementFactoryStatisticsServiceImpl implements ISettlementFactor
         // 1. 获取所有有效门店
         QueryWrapper<SysStore> storeWrapper = new QueryWrapper<>();
         storeWrapper.eq("del_flag", StatusType.OK.getCode());
+        storeWrapper.gt("id", 0);
         if (storeId != null) {
             storeWrapper.eq("id", storeId);
         }
-        storeWrapper.eq("factory_id", factoryId);
+        if (factoryId != null) {
+            storeWrapper.eq("factory_id", factoryId);
+        }
         List<SysStore> storeList = storeService.list(storeWrapper);
         if (CollUtil.isEmpty(storeList)) {
             return Collections.emptyList();
@@ -137,7 +140,7 @@ public class SettlementFactoryStatisticsServiceImpl implements ISettlementFactor
     public SettlementFactoryStatisticsDto generateTotalFactoryStatistics(Long factoryId, Long storeId, Date start, Date end) {
         // 1. 查询指定日期范围内的所有订单衣服记录
         QueryWrapper<OrderClothItem> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("factory_id", factoryId)
+        queryWrapper.eq(factoryId!=null,"factory_id", factoryId)
                 .eq(storeId != null, "org_id", storeId)
                 .ge("flow_status", 1)
                 .ge("in_factory_time", DateUtils.addDays(start, -2))