数字

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/data/DataWechatMemberConfigDTO.java

@@ -63,6 +63,8 @@ public class DataWechatMemberConfigDTO implements Serializable{
      */
     private Integer validRefresh;
 
+    private String memberCardAreaName;
+
     public Integer getWechatMemberConfigId() {
         return wechatMemberConfigId;
     }
@@ -152,4 +154,13 @@ public class DataWechatMemberConfigDTO implements Serializable{
         this.validRefresh = validRefresh;
         return this;
     }
+
+    public String getMemberCardAreaName() {
+        return memberCardAreaName;
+    }
+
+    public DataWechatMemberConfigDTO setMemberCardAreaName(String memberCardAreaName) {
+        this.memberCardAreaName = memberCardAreaName;
+        return this;
+    }
 }

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

 package com.gic.enterprise.web.controller;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import com.gic.api.base.commons.ServiceResponse;
@@ -51,13 +53,13 @@ public class DataConfigController {
     @RequestMapping("list-all-applet")
     public RestResponse listAllApplet() {
         return ResultControllerUtils.commonResult(appletsConfigApiService
-                .listValidAppletConfigAppId(UserDetailUtils.getUserDetail().getEnterpriseId()));
+                .listAppletConfigAppIdContainDel(UserDetailUtils.getUserDetail().getEnterpriseId()));
     }
 
     @RequestMapping("list-all-service")
     public RestResponse listAllService() {
         return ResultControllerUtils.commonResult(serviceConfigApiService
-                .listValidServiceConfigAppId(UserDetailUtils.getUserDetail().getEnterpriseId()));
+                .listServiceConfigAppIdContainDel(UserDetailUtils.getUserDetail().getEnterpriseId()));
     }
 
     @RequestMapping("/list-all-member-card")
@@ -112,8 +114,26 @@ public class DataConfigController {
 
     @RequestMapping("list-wechat-member-config")
     public RestResponse listWechatMemberConfig() {
-        return ResultControllerUtils.commonResult(dataConfigApiService
-                .listWechatMemberConfig(UserDetailUtils.getUserDetail().getEnterpriseId()));
+        ServiceResponse<List<DataWechatMemberConfigDTO>> response = dataConfigApiService
+                .listWechatMemberConfig(UserDetailUtils.getUserDetail().getEnterpriseId());
+
+        Map<String, String> memberCardMap = new HashMap<>(2);
+        ServiceResponse<List<OwnerMemberCardDTO>> result = memberCardApiService.getAll(UserDetailUtils.getUserDetail().getEnterpriseId());
+        if (result.isSuccess()) {
+            List<OwnerMemberCardDTO> memberCardList = result.getResult();
+            if (CollectionUtils.isNotEmpty(memberCardList)) {
+                memberCardMap = memberCardList.stream().collect(Collectors.toMap(e -> e.getCardConfigId().toString(), e -> e.getCardName()));
+            }
+        }
+        if (response.isSuccess()) {
+            List<DataWechatMemberConfigDTO> list = response.getResult();
+            if (CollectionUtils.isNotEmpty(list)) {
+                for (DataWechatMemberConfigDTO temp : list) {
+                    temp.setMemberCardAreaName(memberCardMap.get(temp.getMemberCardArea()));
+                }
+            }
+        }
+        return ResultControllerUtils.commonResult(response);
     }
 
     @RequestMapping("/config-member-consume")