修改统计

ldt-core/src/main/java/org/springblade/gateway/web_gateway/controller/CensusController.java

@@ -80,7 +80,7 @@ public class CensusController {
 		Map<String, Object> map = billsService.getMap(new QueryWrapper<Bills>().select("ifnull(sum(price),0) as price").lambda()
 			.eq(Bills::getType, OrderType.MALL_RECHARGE)
 			.and(wq -> {
-				wq.eq(Bills::getPayStatus, AppConstant.BillPayStatus.已完结).or().eq(Bills::getPayStatus, AppConstant.BillPayStatus.付款成功);
+				wq.eq(Bills::getPayStatus, AppConstant.BillPayStatus.已完结.name()).or().eq(Bills::getPayStatus, AppConstant.BillPayStatus.付款成功.name());
 			}));
 		return R.data(new TenantCensusVo()
 			.setUserCount(loginUserService.count())
@@ -102,7 +102,7 @@ public class CensusController {
 			.lambda()
 			.eq(Bills::getType, OrderType.MALL_RECHARGE)
 			.and(wq -> {
-				wq.eq(Bills::getPayStatus, AppConstant.BillPayStatus.已完结).or().eq(Bills::getPayStatus, AppConstant.BillPayStatus.付款成功);
+				wq.eq(Bills::getPayStatus, AppConstant.BillPayStatus.已完结.name()).or().eq(Bills::getPayStatus, AppConstant.BillPayStatus.付款成功.name());
 			}));
 		return R.data(new TenantCensusVo()
 			.setUserCount(loginUserService.count(new QueryWrapper<LoginUser>().eq("date_format(create_time,'%Y-%m-%d')", date)))

ldt-core/src/main/java/org/springblade/ldt/agent/controller/AgentBillsController.java

@@ -100,7 +100,7 @@ public class AgentBillsController extends BladeController {
 	@ApiOperation(value = "统计金额", notes = "统计金额")
 	public R<List<Map<String, Object>>> censusPrice() {
 		return R.data(agentBillsService.listMaps(new QueryWrapper<AgentBills>()
-			.select("sum(price) as total_price,type as type")
+			.select("sum(price) as fee,type as type")
 			.lambda().groupBy(AgentBills::getType)));
 	}
 

ldt-core/src/main/java/org/springblade/ldt/bills/controller/BalanceBillsController.java

@@ -105,7 +105,7 @@ public class BalanceBillsController extends BladeController {
 			.select("sum(total_price) as total_price,type as type")
 			.lambda()
 			.and(wq -> {
-				wq.eq(BalanceBills::getPayStatus, AppConstant.BillPayStatus.已完结).or().eq(BalanceBills::getPayStatus, AppConstant.BillPayStatus.付款成功);
+				wq.eq(BalanceBills::getPayStatus, AppConstant.BillPayStatus.已完结.name()).or().eq(BalanceBills::getPayStatus, AppConstant.BillPayStatus.付款成功.name());
 			})
 			.groupBy(BalanceBills::getType)));
 	}

ldt-core/src/main/java/org/springblade/ldt/bills/controller/BillsController.java

@@ -104,7 +104,7 @@ public class BillsController extends BladeController {
 			.select("sum(price) as total_price,type as type")
 			.lambda()
 			.and(wq -> {
-				wq.eq(Bills::getPayStatus, AppConstant.BillPayStatus.已完结).or().eq(Bills::getPayStatus, AppConstant.BillPayStatus.付款成功);
+				wq.eq(Bills::getPayStatus, AppConstant.BillPayStatus.已完结.name()).or().eq(Bills::getPayStatus, AppConstant.BillPayStatus.付款成功.name());
 			})
 			.groupBy(Bills::getType)));
 	}