浏览代码

盲票实时毛利、终极毛利后台展示

zhangkaikai 1 年之前
父节点
当前提交
2b8208517c
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/IndexMgrController.java

+ 1 - 1
mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/IndexMgrController.java

@@ -793,7 +793,7 @@ public class IndexMgrController extends BaseApiController {
 		List<UserCoinLog> userCoins = userCoinLogService.list(
 		List<UserCoinLog> userCoins = userCoinLogService.list(
 				new QueryWrapper<UserCoinLog>().between(null != queryParam.getStartTime() && null != queryParam.getEndTime(), "created_time", queryParam.getStartTime(), queryParam.getEndTime()));
 				new QueryWrapper<UserCoinLog>().between(null != queryParam.getStartTime() && null != queryParam.getEndTime(), "created_time", queryParam.getStartTime(), queryParam.getEndTime()));
 		int userCoinCost = userCoins.stream().filter(c -> c.getLogMoney() > 0 && c.getType().getValue().equals(CoinLogTypeEnum.PRIZE.getValue())).mapToInt(UserCoinLog::getLogMoney).sum() * 10;
 		int userCoinCost = userCoins.stream().filter(c -> c.getLogMoney() > 0 && c.getType().getValue().equals(CoinLogTypeEnum.PRIZE.getValue())).mapToInt(UserCoinLog::getLogMoney).sum() * 10;
-
+		userCoinCost +=  userCoins.stream().filter(c -> c.getLogMoney() > 0 && c.getType().getValue().equals(CoinLogTypeEnum.RECOVERY.getValue())).mapToInt(UserCoinLog::getLogMoney).sum() * 10;
 		return commAmt + allPrizeStorageGoodsCost + couponCost.get() + userCoinCost;
 		return commAmt + allPrizeStorageGoodsCost + couponCost.get() + userCoinCost;
 	}
 	}