用户管理用户查询接口修改

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java

@@ -20,6 +20,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -76,26 +77,36 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
 
             //查询相关信息
             ScoreInfo scoreInfo = scoreInfoMapper.getById(user.getId());
+            if (null!=scoreInfo) {
+                userInfoDto.setCultureGrade(scoreInfo.getCultureGrade().toString());
+                userInfoDto.setMajorGrade(scoreInfo.getMajorGrade().toString());
+            }
             LoginRecord loginRecord = loginRecordMapper.getById(user.getId());
+            if (null!=loginRecord) {
+                userInfoDto.setLastLoginTime(loginRecord.getUpdateTime());
+                userInfoDto.setIp(loginRecord.getIp());
+            }
             UserLimit userLimit = userLimitMapper.getByUserId(user.getId());
+
+            if (null!=userLimit) {
+                userInfoDto.setQueryLimit(userLimit.getUsableLimit());
+            }
             List<PayRecord> byId = payRecordMapper.getById(user.getId());
 
+            if (!CollectionUtils.isEmpty(byId)) {
                 //计算累计充值金额
                 Integer sumMoney=0;
                 for (PayRecord payRecord : byId) {
                     sumMoney+=payRecord.getMoney();
                 }
 
+                userInfoDto.setMoneyAmount(sumMoney.toString());
+            }
+
             //将消息进行同步
             BeanUtils.copyProperties(user, userInfoDto);
             userInfoDto.setUserId(user.getId());
-            userInfoDto.setCultureGrade(scoreInfo.getCultureGrade().toString());
-            userInfoDto.setMajorGrade(scoreInfo.getMajorGrade().toString());
             userInfoDto.setRegisterTime(user.getCreateTime());
-            userInfoDto.setLastLoginTime(loginRecord.getUpdateTime());
-            userInfoDto.setQueryLimit(userLimit.getUsableLimit());
-            userInfoDto.setMoneyAmount(sumMoney.toString());
-            userInfoDto.setIp(loginRecord.getIp());
             list.add(userInfoDto);
         }
 

wisenergy-service/src/main/java/cn/wisenergy/service/common/RefillCardManager.java

@@ -34,7 +34,7 @@ public class RefillCardManager {
             CardInfo cardInfo = new CardInfo();
             cardInfo.setBatchNumber(byId.getBatchNumber());
             cardInfo.setIsDelete(0);
-            cardInfo.setMoney("10");
+            cardInfo.setMoney("498");
             cardInfo.setStatus(0);
             cardInfo.setLimit(3);
             cardInfo.setSecretKey(SecretkeyUtil.getSecretkey());