oasisInfo

src/main/java/com/izouma/nineth/dto/oasis/OasisDistrictCollectionDTO.java

@@ -21,6 +21,7 @@ public class OasisDistrictCollectionDTO {
     private String     ownerName;
     private String     ownerAvatar;
     private boolean    salable;
+    private boolean    scanOnly;
     private Long       collectionId;
     private String     url;
 }

src/main/java/com/izouma/nineth/dto/oasis/OasisLoginDTO.java

@@ -12,4 +12,6 @@ public class OasisLoginDTO {
     private Long   oasisId;
     private String url;
     private String source;
+    private String token;
+    private Long   userId;
 }

src/main/java/com/izouma/nineth/service/CompanyCollectionService.java

@@ -119,6 +119,7 @@ public class CompanyCollectionService {
             oasisDistrictCollectionDTO.setOasisId(asset.getOasisId());
             oasisDistrictCollectionDTO.setCollectionName(asset.getName());
             oasisDistrictCollectionDTO.setOriginPrice(asset.getPrice());
+            oasisDistrictCollectionDTO.setScanOnly(false);
             oasisDistrictCollectionDTO.setOwnerId(asset.getOwnerId());
             oasisDistrictCollectionDTO.setOwnerName(asset.getOwner());
             oasisDistrictCollectionDTO.setOwnerAvatar(asset.getOwnerAvatar());
@@ -154,6 +155,7 @@ public class CompanyCollectionService {
             oasisDistrictCollectionDTO.setOwnerName(collection.getOwner());
             oasisDistrictCollectionDTO.setOwnerAvatar(collection.getOwnerAvatar());
             oasisDistrictCollectionDTO.setCollectionId(collection.getId());
+            oasisDistrictCollectionDTO.setScanOnly(collection.isScanCode());
             oasisDistrictCollectionDTO.setSource("官方");
             if (collection.isOnShelf()) {
                 oasisDistrictCollectionDTO.setUrl(
@@ -177,6 +179,7 @@ public class CompanyCollectionService {
             OasisDistrictCollectionDTO oasisDistrictCollectionDTO = new OasisDistrictCollectionDTO();
             oasisDistrictCollectionDTO.setOasisId(companyCollection.getOasisId());
             oasisDistrictCollectionDTO.setCollectionName(companyCollection.getName());
+            oasisDistrictCollectionDTO.setScanOnly(false);
             oasisDistrictCollectionDTO.setOriginPrice(companyCollection.getPrice());
             oasisDistrictCollectionDTO.setOwnerName(companyCollection.getMinter());
             oasisDistrictCollectionDTO.setCollectionId(companyCollection.getId());

src/main/java/com/izouma/nineth/web/AuthenticationController.java

@@ -38,7 +38,10 @@ public class AuthenticationController {
     @PostMapping("/oasisLogin")
     public Map<String, Object> oasisLogin(String phone, String password, Integer expiration) {
         User user = userService.loginByPhonePwd(phone, password);
-        return userService.oasisInfo(user.getId());
+        Map<String, Object> result = userService.oasisInfo(user.getId());
+        result.put("token", jwtTokenUtil.generateToken(JwtUserFactory.create(user)));
+        result.put("userId", user.getId());
+        return result;
     }
 
     @PostMapping("/oasisLoginPhone")