统计优化

snowy-admin-web/src/views/biz/statisty/total.vue

@@ -53,7 +53,7 @@
 	<a-row>
 		<a-col :span="8" style="margin-bottom: 10px;">
 			<a-card style="height: 180px">
-				<a-statistic title="消费金额" :value="consumerCount"/>
+				<a-statistic title="消费糕点或积分" :value="consumerCount"/>
 				<a-statistic title="订单数" :value="consumerOrderCount"/>
 			</a-card>
 		</a-col>
@@ -65,8 +65,8 @@
 		</a-col>
 		<a-col :span="7" style="margin-bottom: 10px; margin-left: 20px;">
 			<a-card style="height: 180px">
-				<a-statistic title="账户余额" :value="accountBalance"/>
-				<a-statistic title="代金券余额" :value="voucherBalance"/>
+				<a-statistic title="账户糕点" :value="accountBalance"/>
+				<a-statistic title="账户积分" :value="voucherBalance"/>
 			</a-card>
 		</a-col>
 	</a-row>
@@ -306,12 +306,12 @@
 			align: 'center'
 		},
 		{
-			title: '账户余额',
+			title: '账户糕点',
 			dataIndex: 'newAccountBalance',
 			align: 'center'
 		},
 		{
-			title: '代金券余额',
+			title: '账户积分',
 			dataIndex: 'newVoucherBalance',
 			align: 'center'
 		},
@@ -393,12 +393,12 @@
 			align: 'center',
 		},
 		{
-			title: '账户余额',
+			title: '账户糕点',
 			dataIndex: 'accountBalance',
 			align: 'center',
 		},
 		{
-			title: '代金券余额',
+			title: '账户积分',
 			dataIndex: 'voucherBalance',
 			align: 'center',
 		},
@@ -435,12 +435,12 @@
 					align: 'center',
 				},
 				{
-					title: '账户消费金额',
+					title: '账户消费糕点',
 					dataIndex: 'accountMoney',
 					align: 'center',
 				},
 				{
-					title: '代金券消费金额',
+					title: '账户消费积分',
 					dataIndex: 'voucherMoney',
 					align: 'center',
 				},
@@ -539,7 +539,7 @@
 
 			let series = [
 				{
-					name: '消费金额',
+					name: '消费糕点或积分',
 					type: 'line',
 					//stack: '总量',
 					showSymbol: false,

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/consumptionrecord/service/impl/ConsumptionRecordServiceImpl.java

@@ -418,6 +418,15 @@ public class ConsumptionRecordServiceImpl extends ServiceImpl<ConsumptionRecordM
 
     @Override
     public UserBalanceResult queryBalanceTotal(ConsumptionRecordPageParam consumptionRecordPageParam) {
+        QueryWrapper<ConsumptionRecord> queryWrapper = getAccountQueryWrapper(consumptionRecordPageParam);
+        UserBalanceResult userBalanceResult = this.getBaseMapper().queryBalanceTotal(queryWrapper);
+        QueryWrapper<ConsumptionRecord> customQueryWrapper = getCustomQueryWrapper(consumptionRecordPageParam);
+        UserBalanceResult result = this.getBaseMapper().queryBalanceTotal(customQueryWrapper);
+        userBalanceResult.setUserCount(result.getUserCount());
+        return userBalanceResult;
+    }
+
+    public QueryWrapper<ConsumptionRecord> getAccountQueryWrapper(ConsumptionRecordPageParam consumptionRecordPageParam){
         QueryWrapper<ConsumptionRecord> queryWrapper = new QueryWrapper<>();
         if(ObjectUtil.isNotEmpty(consumptionRecordPageParam.getOrgId())){
             queryWrapper.eq("su.ORG_ID",consumptionRecordPageParam.getOrgId());
@@ -427,9 +436,21 @@ public class ConsumptionRecordServiceImpl extends ServiceImpl<ConsumptionRecordM
         }
         queryWrapper.in("su.USER_TYPE","2","3");
         queryWrapper.eq("su.DELETE_FLAG","NOT_DELETE");
-        return this.getBaseMapper().queryBalanceTotal(queryWrapper);
+        return queryWrapper;
+    }
+
+    public QueryWrapper<ConsumptionRecord> getCustomQueryWrapper(ConsumptionRecordPageParam consumptionRecordPageParam){
+        QueryWrapper<ConsumptionRecord> queryWrapper = new QueryWrapper<>();
+        if(ObjectUtil.isNotEmpty(consumptionRecordPageParam.getConsumptionTimeBegin()) && ObjectUtil.isNotEmpty(consumptionRecordPageParam.getConsumptionTimeEnd())){
+            queryWrapper.between("su.CREATE_TIME",consumptionRecordPageParam.getConsumptionTimeBegin()+" 00:00:00",consumptionRecordPageParam.getConsumptionTimeEnd()+" 23:59:59");
+        }
+        queryWrapper.in("su.USER_TYPE","2","3");
+        queryWrapper.eq("su.DELETE_FLAG","NOT_DELETE");
+        return queryWrapper;
     }
 
+
+
     @Override
     public Map<String,Object> queryConsumptionChart(ConsumptionRecordPageParam consumptionRecordPageParam) {
         List<String> timeList = Lists.newArrayList();