优化

cif-service/src/main/java/com/txz/cif/dao/RedEnvelopeMapper.java

@@ -11,7 +11,7 @@ import java.util.HashMap;
 import java.util.List;
 
 public interface RedEnvelopeMapper extends Mapper<RedEnvelope> {
-    BigDecimal sumWithDay(Date day, Long userId,Integer type);
+    BigDecimal sumWithDay(String day, Long userId,Integer type);
 
 
     List<UserTopBo> top(HashMap<String, Object> map);

cif-service/src/main/java/com/txz/cif/service/RedEnvelopeService.java

@@ -25,7 +25,7 @@ public interface RedEnvelopeService extends Service<RedEnvelope> {
      * @param type 1待结算 2已结算 3不限制
      * @return
      */
-    BigDecimal sumWithDay(Integer day, Long userId,Integer type);
+    BigDecimal sumWithDay(String day, Long userId,Integer type);
 
     List<UserTopBo> top(Integer type, Integer page, Integer size);
 

cif-service/src/main/java/com/txz/cif/service/impl/RedEnvelopeServiceImpl.java

@@ -89,11 +89,11 @@ public class RedEnvelopeServiceImpl extends AbstractService<RedEnvelope> impleme
     }
 
     @Override
-    public BigDecimal sumWithDay(Integer day, Long userId,Integer type) {
+    public BigDecimal sumWithDay(String day, Long userId,Integer type) {
         if (day == null){
             return cRedEnvelopeMapper.sumWithDay(null,userId,type);
         } else {
-            return cRedEnvelopeMapper.sumWithDay(DateUtil.offsetDay(DateUtil.date(),-day),userId,type);
+            return cRedEnvelopeMapper.sumWithDay(day,userId,type);
         }
           }
 

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

@@ -61,11 +61,12 @@ public class AccountApiController extends AbstractApiController {
 	public Result<AccountInfoBO> getAccountInfo(HttpServletRequest request) {
 		Long userId = authService.getTokenUserId(request);
 		if (userId == null ){
-			ResultGenerator.genFailResult(ResultCode.OAUTH_INVALID_ACCESS_TOKEN);
+			return ResultGenerator.genFailResult(ResultCode.OAUTH_INVALID_ACCESS_TOKEN);
 		}
 		User user = userService.findById(userId);
 		if (user == null ){
-			ResultGenerator.genFailResult(ResultCode.USER_IS_NULL);
+			return ResultGenerator.genFailResult(ResultCode.USER_IS_NULL);
+
 		}
 		Account earnings = accountService.getAccount(userId, 2);
 		AccountInfoBO bo = new AccountInfoBO();
@@ -77,22 +78,21 @@ public class AccountApiController extends AbstractApiController {
 		}
 		bo.setPendingAmount(pendingAmount);
 
-		BigDecimal tDEamings = redEnvelopeService.sumWithDay(1,userId,null);
+		BigDecimal tDEamings = redEnvelopeService.sumWithDay(DateUtil.today(),userId,null);
 		if (tDEamings == null){
 			tDEamings = BigDecimal.ZERO;
 		}
 		bo.setTDEamings(tDEamings);
-		BigDecimal yDEamings = redEnvelopeService.sumWithDay(2,userId,null);
+		BigDecimal yDEamings = redEnvelopeService.sumWithDay(DateUtil.yesterday().toDateStr(),userId,null);
 		if (yDEamings == null){
 			yDEamings = BigDecimal.ZERO;
 		}
 		bo.setTDEamings(yDEamings.subtract(tDEamings));
-		Integer day = DateUtil.thisDayOfMonth();
-		BigDecimal mTDEamings = redEnvelopeService.sumWithDay(day,userId,null);
+		BigDecimal mTDEamings = redEnvelopeService.sumWithDay(DateUtil.beginOfMonth(DateUtil.date()).toDateStr(),userId,null);
 		if (mTDEamings == null){
 			mTDEamings = BigDecimal.ZERO;
 		}
-		bo.setTDEamings(mTDEamings);
+		bo.setMTDEamings(mTDEamings);
 		BigDecimal settleAmount = redEnvelopeService.sumWithDay(null,userId,2);
 		if (settleAmount == null){
 			settleAmount = BigDecimal.ZERO;
@@ -108,11 +108,11 @@ public class AccountApiController extends AbstractApiController {
 	public Result<AccountWalletInfoBO> getWalletAccountInfo(HttpServletRequest request) {
 		Long userId = authService.getTokenUserId(request);
 		if (userId == null ){
-			ResultGenerator.genFailResult(ResultCode.OAUTH_INVALID_ACCESS_TOKEN);
+			return ResultGenerator.genFailResult(ResultCode.OAUTH_INVALID_ACCESS_TOKEN);
 		}
 		User user = userService.findById(userId);
 		if (user == null ){
-			ResultGenerator.genFailResult(ResultCode.USER_IS_NULL);
+			return ResultGenerator.genFailResult(ResultCode.USER_IS_NULL);
 		}
 		Account wallet = accountService.getAccount(userId, 1);
 		AccountWalletInfoBO bo = new AccountWalletInfoBO();
@@ -127,7 +127,7 @@ public class AccountApiController extends AbstractApiController {
 	public Result<AccountFlowBO> accountFlowList(@RequestBody AccountFlowParam param,HttpServletRequest request) {
 		Long userId = authService.getTokenUserId(request);
 		if (userId == null ){
-			ResultGenerator.genFailResult(ResultCode.OAUTH_INVALID_ACCESS_TOKEN);
+			return ResultGenerator.genFailResult(ResultCode.OAUTH_INVALID_ACCESS_TOKEN);
 		}
 		User user = userService.findById(userId);
 		if (user == null){

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

@@ -250,7 +250,7 @@ public class UserApiController extends AbstractApiController {
         Integer invited2 = userService.countByCondition(c);
         bo.setTeamNo(invited + invited2);
         // 7日收益
-        BigDecimal amount = redEnvelopeService.sumWithDay(7, user.getId(), 3);
+        BigDecimal amount = redEnvelopeService.sumWithDay(DateUtil.offsetDay(DateUtil.date(),-7).toDateStr(), user.getId(), 3);
         bo.setL7DEarnings(amount);
         return ResultGenerator.genSuccessResult(bo);
     }

cif-service/src/main/java/com/txz/cif/web/mng/UserController.java

@@ -187,7 +187,7 @@ public class UserController extends AbstractApiController {
         bo.setSettledEarnings(earnings.getTotalInamount());
         //充值总金额
         bo.setRechargeAmount(wallet.getTotalInamount());
-        BigDecimal l7DEarnings =  redEnvelopeService.sumWithDay(7, u.getId(), 3);
+        BigDecimal l7DEarnings =  redEnvelopeService.sumWithDay(DateUtil.offsetDay(DateUtil.date(),-7).toDateStr(), u.getId(), 3);
         bo.setL7DEarnings(l7DEarnings);
         BigDecimal pendingEarnings =  redEnvelopeService.sumWithDay(null, u.getId(), 1);
         bo.setPendingEarnings(pendingEarnings);