优化

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

@@ -76,14 +76,26 @@ public class AccountApiController extends AbstractApiController {
 		bo.setBalance(wallet.getBalance().add(earnings.getBalance()));
 		bo.setSettledAmount(earnings.getTotalInamount());
 		BigDecimal pendingAmount = redEnvelopeService.sumWithDay(null,userId,1);
+		if (pendingAmount == null){
+			pendingAmount = BigDecimal.ZERO;
+		}
 		bo.setPendingAmount(pendingAmount);
 
 		BigDecimal tDEamings = redEnvelopeService.sumWithDay(1,userId,3);
+		if (tDEamings == null){
+			tDEamings = BigDecimal.ZERO;
+		}
 		bo.setTDEamings(tDEamings);
 		BigDecimal yDEamings = redEnvelopeService.sumWithDay(2,userId,3);
+		if (yDEamings == null){
+			yDEamings = BigDecimal.ZERO;
+		}
 		bo.setTDEamings(yDEamings.subtract(tDEamings));
 		Integer day = DateUtil.thisDayOfMonth();
 		BigDecimal mTDEamings = redEnvelopeService.sumWithDay(day,userId,3);
+		if (mTDEamings == null){
+			mTDEamings = BigDecimal.ZERO;
+		}
 		bo.setTDEamings(mTDEamings);
 
 		return ResultGenerator.genSuccessResult(bo);

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

@@ -139,7 +139,8 @@ public class UserApiController extends AbstractApiController {
 
     @ApiOperation(value = "查询用户资料", notes = "",httpMethod = "GET")
     @GetMapping("/getUserInfo")
-    public Result<UserInfoBO> getUserInfo(@RequestHeader(value = X_CLIENT_TOKEN_USERID,required = false) Long userId) {
+    public Result<UserInfoBO> getUserInfo(HttpServletRequest request) {
+        Long userId = authService.getTokenUserId(request);
         User user = userService.findById(userId);
         if (user == null){
             return ResultGenerator.genFailResult(ResultCode.USER_IS_NULL);

cif-service/src/main/resources/bootstrap.properties

@@ -11,7 +11,7 @@ test.nacos=172.10.100.40:30848
 pro.nacos=172.10.100.10:30308
 spring.cloud.nacos.discovery.server-addr=${${spring.profiles.active}.nacos}
 spring.cloud.nacos.config.server-addr=${${spring.profiles.active}.nacos}
-dev.file.home=./
+dev.file.home=/Users/linxk/mydata/temp
 test.file.home=/Users/linxk/mydata/temp
 log.home=${${spring.profiles.active}.file.home}