机构类型

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/CardInfoSimpleModel.java

@@ -0,0 +1,28 @@
+package com.zhongshu.card.client.model.school;
+
+import com.zhongshu.card.client.model.base.SuperModel;
+import com.zhongshu.card.client.model.org.UserCountModel;
+import com.zhongshu.card.client.utils.type.school.CardState;
+import com.zhongshu.card.client.utils.type.school.CardType;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author TRX
+ * @date 2024/6/13
+ */
+@Data
+public class CardInfoSimpleModel {
+
+    @Schema(description = "卡片状态")
+    private CardState cardState;
+
+    private String cardStateStr;
+
+    public String getCardStateStr() {
+        if (cardState != null) {
+            return cardState.getRemark();
+        }
+        return "";
+    }
+}

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/CardLossParam.java

@@ -1,5 +1,6 @@
 package com.zhongshu.card.client.model.school;
 
+import com.zhongshu.card.client.utils.type.school.CardType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -21,6 +22,9 @@ public class CardLossParam {
     @Schema(description = "卡片code")
     private String code;
 
+    @Schema(description = "卡片类型")
+    private CardType cardType;
+
     @Schema(description = "姓名, 帮别人挂失、解挂要输入")
     private String userName;
 

FullCardClient/src/main/java/com/zhongshu/card/client/service/school/CardInfoService.java

@@ -2,6 +2,7 @@ package com.zhongshu.card.client.service.school;
 
 import com.zhongshu.card.client.model.school.CardInfoModel;
 import com.zhongshu.card.client.model.school.CardInfoParam;
+import com.zhongshu.card.client.model.school.CardInfoSimpleModel;
 import com.zhongshu.card.client.model.school.CardLossParam;
 import com.zhongshu.card.client.ret.ResultContent;
 
@@ -38,4 +39,7 @@ public interface CardInfoService {
     // 查询卡片详情
     ResultContent<CardInfoModel> getCardDetail(String id);
 
+    // 卡号查询卡片
+    ResultContent<CardInfoSimpleModel> getCardDetailByCode(String code);
+
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/school/CardController.java

@@ -8,10 +8,7 @@ import com.zhongshu.card.client.model.org.OrgUserDetailParam;
 import com.zhongshu.card.client.model.org.RoleAddParam;
 import com.zhongshu.card.client.model.org.RoleModel;
 import com.zhongshu.card.client.model.org.RoleSearchParam;
-import com.zhongshu.card.client.model.school.CardInfoModel;
-import com.zhongshu.card.client.model.school.CardInfoParam;
-import com.zhongshu.card.client.model.school.CardLossParam;
-import com.zhongshu.card.client.model.school.SchoolUserModel;
+import com.zhongshu.card.client.model.school.*;
 import com.zhongshu.card.client.ret.ResultContent;
 import com.zhongshu.card.client.service.school.CardInfoService;
 import com.zhongshu.card.client.service.school.SchoolUserService;
@@ -119,7 +116,7 @@ public class CardController {
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "code查询卡片详情", description = "code查询卡片详情")
     @RequestMapping(value = {"getCardDetailByCode"}, method = {RequestMethod.POST})
-    public ResultContent<CardInfoModel> getCardDetailByCode(@RequestParam(name = "code") String code) {
+    public ResultContent<CardInfoSimpleModel> getCardDetailByCode(@RequestParam(name = "code") String code) {
         return cardInfoService.getCardDetailByCode(code);
     }
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/CardInfoServiceImpl.java

@@ -4,6 +4,7 @@ import com.github.microservice.auth.client.content.ResultState;
 import com.github.microservice.auth.client.service.UserService;
 import com.zhongshu.card.client.model.school.CardInfoModel;
 import com.zhongshu.card.client.model.school.CardInfoParam;
+import com.zhongshu.card.client.model.school.CardInfoSimpleModel;
 import com.zhongshu.card.client.model.school.CardLossParam;
 import com.zhongshu.card.client.ret.ResultContent;
 import com.zhongshu.card.client.ret.ResultMessage;
@@ -338,13 +339,13 @@ public class CardInfoServiceImpl extends SuperService implements CardInfoService
     }
 
     @Override
-    public ResultContent<CardInfoModel> getCardDetailByCode(String code) {
+    public ResultContent<CardInfoSimpleModel> getCardDetailByCode(String code) {
         Assert.hasText(code, "code不能为空");
         CardInfo cardInfo = cardInfoDao.findByCode(code);
         if (ObjectUtils.isEmpty(cardInfo)) {
             return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, code));
         }
-        CardInfoModel model = toModel(cardInfo);
+        CardInfoSimpleModel model = toSimpleModel(cardInfo);
         return ResultContent.buildSuccess(model);
     }
 
@@ -356,4 +357,14 @@ public class CardInfoServiceImpl extends SuperService implements CardInfoService
         }
         return model;
     }
+
+    public CardInfoSimpleModel toSimpleModel(CardInfo entity) {
+        CardInfoSimpleModel model = null;
+        if (ObjectUtils.isNotEmpty(entity)) {
+            model = new CardInfoSimpleModel();
+            BeanUtils.copyProperties(entity, model);
+        }
+        return model;
+    }
+
 }