计算收益

cif-service/src/main/java/com/txz/cif/web/AccountApiController.java

@@ -93,7 +93,13 @@ public class AccountApiController extends AbstractApiController {
 			mTDEamings = BigDecimal.ZERO;
 		}
 		bo.setTDEamings(mTDEamings);
-
+		BigDecimal settleAmount = redEnvelopeService.sumWithDay(null,userId,2);
+		if (settleAmount == null){
+			settleAmount = BigDecimal.ZERO;
+		}
+		bo.setSettledAmount(settleAmount);
+		BigDecimal totalEarnings = settleAmount.add(pendingAmount);
+		bo.setTotalEarnings(totalEarnings);
 		return ResultGenerator.genSuccessResult(bo);
 	}
 
@@ -116,7 +122,7 @@ public class AccountApiController extends AbstractApiController {
 	}
 
 
-		@PostMapping("/accountFlowList")
+	@PostMapping("/accountFlowList")
 	@ApiOperation(value = "出入流水",httpMethod = "POST")
 	public Result<AccountFlowBO> accountFlowList(@RequestBody AccountFlowParam param,HttpServletRequest request) {
 		Long userId = authService.getTokenUserId(request);