会员卡列表

gic-data-cloud-web/src/main/java/com/gic/cloud/web/controller/UserController.java

@@ -4,8 +4,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import com.gic.api.base.commons.ServiceResponse;
-import com.gic.cloud.service.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -14,13 +12,17 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.gic.api.base.commons.ServiceResponse;
 import com.gic.cloud.dto.AccountGroupDTO;
 import com.gic.cloud.dto.UserDTO;
 import com.gic.cloud.qo.UserQO;
+import com.gic.cloud.service.*;
 import com.gic.cloud.web.vo.*;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
+import com.gic.member.config.api.dto.OwnerMemberCardDTO;
+import com.gic.member.config.api.service.MemberCardApiService;
 
 @RestController
 @RequestMapping("/user")
@@ -37,6 +39,8 @@ public class UserController {
     private FunctionModuleApiService functionModuleApiService;
     @Autowired
     private DataAuthApiService dataAuthApiService;
+    @Autowired
+    private MemberCardApiService memberCardApiService;
 
     @RequestMapping("/save-account-group")
     public RestResponse saveAccountGroup(AccountGroupDTO dto) {
@@ -130,4 +134,10 @@ public class UserController {
         }
         return ResultControllerUtils.commonResult(userApiService.bulkTransferAccountGroup(userIdList, targetAccountGroupId));
     }
+
+    @RequestMapping("/list-all-member-card")
+    public RestResponse listAllMemberCard(Integer enterpriseId) {
+        ServiceResponse<List<OwnerMemberCardDTO>> result = memberCardApiService.getAll(enterpriseId);
+        return ResultControllerUtils.commonResult(result, MemberCardVO.class);
+    }
 }

gic-data-cloud-web/src/main/java/com/gic/cloud/web/vo/MemberCardVO.java

+package com.gic.cloud.web.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+
+public class MemberCardVO implements Serializable{
+
+    private static final long serialVersionUID = -8228087541902310573L;
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+
+    /**
+     * 会员卡基本信息表主键
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long cardConfigId;
+
+    private Integer ownerId;
+
+    private String cardCode;
+
+    private String cardName;
+
+    public Long getId() {
+        return id;
+    }
+
+    public MemberCardVO setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public Long getCardConfigId() {
+        return cardConfigId;
+    }
+
+    public MemberCardVO setCardConfigId(Long cardConfigId) {
+        this.cardConfigId = cardConfigId;
+        return this;
+    }
+
+    public Integer getOwnerId() {
+        return ownerId;
+    }
+
+    public MemberCardVO setOwnerId(Integer ownerId) {
+        this.ownerId = ownerId;
+        return this;
+    }
+
+    public String getCardCode() {
+        return cardCode;
+    }
+
+    public MemberCardVO setCardCode(String cardCode) {
+        this.cardCode = cardCode;
+        return this;
+    }
+
+    public String getCardName() {
+        return cardName;
+    }
+
+    public MemberCardVO setCardName(String cardName) {
+        this.cardName = cardName;
+        return this;
+    }
+}