修改接口

performance-web/src/main/java/com/clx/performance/controller/pc/owner/OwnerAccountController.java

@@ -56,8 +56,8 @@ public class OwnerAccountController {
     @UnitCovert(param = false)
     public Result<Map> accountInfo() {
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
-        List<OwnerAccountVO> accountVOList = ownerAccountService.accountInfo(loginUserInfo.getUserNo());
-        return Result.ok(accountVOList.stream().collect(Collectors.groupingBy(OwnerAccountVO::getAccountType)));
+        Map<String,OwnerAccountVO> result = ownerAccountService.accountInfo(loginUserInfo.getUserNo());
+        return Result.ok(result);
     }
 
     @ApiOperation(value = "货主充值记录列表", notes = "<br>By:胡宇帆")

performance-web/src/main/java/com/clx/performance/service/OwnerAccountService.java

@@ -10,6 +10,7 @@ import com.clx.user.vo.pc.owner.OwnerBindCardVO;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 
 import java.util.List;
+import java.util.Map;
 
 public interface OwnerAccountService {
     IPage<OwnerAccountVO> pageList(PageOwnerAccountListParam param);
@@ -18,7 +19,7 @@ public interface OwnerAccountService {
 
     IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightAccountPageList(PagePlatformPrepaidFreightAccountParam param);
 
-    List<OwnerAccountVO> accountInfo(Long ownerUserNo);
+    Map<String,OwnerAccountVO> accountInfo(Long ownerUserNo);
 
     Long accountTopUp(OwnerTopUpParam param);
 

performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java

@@ -35,9 +35,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.*;
 
 @Slf4j
 @Service
@@ -78,8 +76,17 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
     }
 
     @Override
-    public List<OwnerAccountVO> accountInfo(Long ownerUserNo) {
-        return ownerAccountStruct.convertList(ownerAccountDao.accountInfo(ownerUserNo));
+    public Map<String,OwnerAccountVO> accountInfo(Long ownerUserNo) {
+        Map<String,OwnerAccountVO> result = new HashMap<>(2);
+        List<OwnerAccountVO> list = ownerAccountStruct.convertList(ownerAccountDao.accountInfo(ownerUserNo));
+        for (OwnerAccountVO ownerAccountVO : list) {
+            if (OwnerAccountEnum.AccountTypeStatus.MARGIN_ACCOUNT.getCode().equals(ownerAccountVO.getAccountType())) {
+                result.put(OwnerAccountEnum.AccountTypeStatus.MARGIN_ACCOUNT.getMsg(), ownerAccountVO);
+            } else {
+                result.put(OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getMsg(), ownerAccountVO);
+            }
+        }
+        return result;
     }
 
     @Override