添加会员卡列表数据

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/DataConfigController.java

@@ -5,12 +5,16 @@ import java.util.stream.Collectors;
 
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.enterprise.dto.data.*;
+import com.gic.enterprise.web.vo.MemberCardVO;
 import com.gic.enterprise.web.vo.data.*;
 import com.gic.member.config.api.dto.DigitalConfigDTO;
+import com.gic.member.config.api.dto.OwnerMemberCardDTO;
 import com.gic.member.config.api.service.AppletsConfigApiService;
 import com.gic.member.config.api.service.EnterpriseConfigApiService;
+import com.gic.member.config.api.service.MemberCardApiService;
 import com.gic.member.config.api.service.ServiceConfigApiService;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +44,8 @@ public class DataConfigController {
     private ServiceConfigApiService serviceConfigApiService;
     @Autowired
     private EnterpriseConfigApiService enterpriseConfigApiService;
+    @Autowired
+    private MemberCardApiService memberCardApiService;
 
 
     @RequestMapping("list-all-applet")
@@ -54,6 +60,12 @@ public class DataConfigController {
                 .listValidServiceConfigAppId(UserDetailUtils.getUserDetail().getEnterpriseId()));
     }
 
+    @RequestMapping("/list-all-member-card")
+    public RestResponse listAllMemberCard() {
+        ServiceResponse<List<OwnerMemberCardDTO>> result = memberCardApiService.getAll(UserDetailUtils.getUserDetail().getEnterpriseId());
+        return ResultControllerUtils.commonResult(result, MemberCardVO.class);
+    }
+
     @RequestMapping("config-wechat-member")
     public RestResponse configWechatMember(DataWechatMemberConfigDTO dto) {
         dto.setValidRefresh(2);
@@ -92,7 +104,10 @@ public class DataConfigController {
             }
         }
         int length = str.toString().length();
-        return str.substring(0, length - 1);
+        if (StringUtils.isNotBlank(str.toString())) {
+            return str.substring(0, length - 1);
+        }
+        return str.toString();
     }
 
     @RequestMapping("list-wechat-member-config")