年龄配置接口

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

@@ -55,7 +55,7 @@ public class DataGenerationConfigDTO implements Serializable{
     /**
      * 1:有效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      *
@@ -144,12 +144,12 @@ public class DataGenerationConfigDTO implements Serializable{
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public DataGenerationConfigDTO setStatus(Integer status) {
-        this.status = status;
+    public DataGenerationConfigDTO setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 
@@ -191,7 +191,7 @@ public class DataGenerationConfigDTO implements Serializable{
                 ", secondSign=" + secondSign +
                 ", ageSecondValue=" + ageSecondValue +
                 ", description='" + description + '\'' +
-                ", status=" + status +
+                ", deleteFlag=" + deleteFlag +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 ", memberCardId=" + memberCardId +

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/DataGenerationConfigServiceImpl.java

@@ -27,7 +27,7 @@ public class DataGenerationConfigServiceImpl implements DataGenerationConfigServ
         Date now = new Date();
         dto.setUpdateTime(now);
         dto.setCreateTime(now);
-        dto.setStatus(1);
+        dto.setDeleteFlag(0);
         TabDataGenerationConfig record = EntityUtil.changeEntityNew(TabDataGenerationConfig.class, dto);
         tabDataGenerationConfigMapper.insert(record);
     }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/DataConfigApiServiceImpl.java

@@ -333,6 +333,10 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
         Integer enterpriseId = dtoList.get(0).getEnterpriseId();
         Long memberCardId = dtoList.get(0).getMemberCardId();
 
+        if (-1L == memberCardId) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "会员卡数据错误");
+        }
+
         checkShareMemberCard(enterpriseId, memberCardId);
         checkUpdateTime(memberCardId);
 

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

@@ -16,10 +16,7 @@ import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
 import com.gic.enterprise.web.vo.MemberCardVO;
 import com.gic.enterprise.web.vo.data.*;
-import com.gic.member.config.api.dto.AppletsConfigSimpleOutputDTO;
-import com.gic.member.config.api.dto.DigitalConfigDTO;
-import com.gic.member.config.api.dto.OwnerMemberCardDTO;
-import com.gic.member.config.api.dto.ServiceConfigSimpleOutputDTO;
+import com.gic.member.config.api.dto.*;
 import com.gic.member.config.api.service.AppletsConfigApiService;
 import com.gic.member.config.api.service.EnterpriseConfigApiService;
 import com.gic.member.config.api.service.MemberCardApiService;
@@ -338,19 +335,40 @@ public class DataConfigController {
                 PerformanceVO.class);
     }
 
+    @RequestMapping("/list-all-member-card-new")
+    public RestResponse listAllMemberCardNew() {
+        ServiceResponse<Object> result = dataConfigApiService.listAllMemberCard(UserDetailUtils.getUserDetail().getEnterpriseId());
+        if (result.isSuccess()) {
+            List<ChannelAreaInfoDTO> list = (List<ChannelAreaInfoDTO>) result.getResult();
+            Long minMemberCardId = list.stream().filter(e -> Objects.equals(e.getOwnerEntId(), e.getEnterpriseId())).mapToLong(e -> e.getAreaId()).min().getAsLong();
+            List<MemberCardVO> voList = new ArrayList<>();
+            for (ChannelAreaInfoDTO temp : list) {
+                MemberCardVO vo = new MemberCardVO();
+                vo.setCardConfigId(temp.getAreaId());
+                vo.setCardName(temp.getName());
+                vo.setEnterpriseId(temp.getEnterpriseId());
+                vo.setOwnerEntId(temp.getOwnerEntId());
+                vo.setMinMemberCardId(minMemberCardId);
+
+                voList.add(vo);
+            }
+
+            return RestResponse.success(voList);
+        }
+        return RestResponse.failure(result.getCode(), result.getMessage());
+    }
 
     @RequestMapping("/config-generation")
     public RestResponse configGeneration(@RequestBody List<DataGenerationConfigDTO> dtoList) {
-        return OperationResultUtils.operationResult(dataConfigApiService.saveGenerationConfig(dtoList.stream()
-                        .map(e -> e.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId())).collect(Collectors.toList())),
-                OperationResultUtils.LOG_EDIT + "数据统计配置-年龄段配置",
+        return OperationResultUtils.operationResult(dataConfigApiService.saveGenerationConfig(dtoList),
+                OperationResultUtils.LOG_EDIT + "数据统计配置-年龄段配置:" + JSON.toJSONString(dtoList),
                 UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseName());
     }
 
     @RequestMapping("/get-generation-config")
-    public RestResponse getGenerationConfig() {
+    public RestResponse getGenerationConfig(Long memberCardId) {
         return ResultControllerUtils.commonResult(
-                dataConfigApiService.listGenerationConfig(UserDetailUtils.getUserDetail().getEnterpriseId()),
+                dataConfigApiService.listGenerationConfig(memberCardId),
                 GenerationConfigVO.class);
     }
 }

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/MemberCardVO.java

@@ -3,6 +3,8 @@ package com.gic.enterprise.web.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serializable;
+import java.util.Objects;
+
 /**
  *
  * @ClassName: MemberCardVO
@@ -21,6 +23,22 @@ public class MemberCardVO implements Serializable{
 
     private String cardName;
 
+    /**
+     * 1-自有，2-共享
+     */
+    private Byte type;
+
+    private Integer ownerEntId;
+
+    private Integer enterpriseId;
+
+    /**
+     * 1：默认会员卡（创建最早的卡）0:否
+     */
+    private Integer isDefault;
+
+    private Long minMemberCardId;
+
     public Long getCardConfigId() {
         return cardConfigId;
     }
@@ -39,11 +57,58 @@ public class MemberCardVO implements Serializable{
         return this;
     }
 
+    public Byte getType() {
+        if (Objects.equals(enterpriseId, ownerEntId)) {
+            return 1;
+        }
+        return 2;
+    }
+
+    public MemberCardVO setType(Byte type) {
+        this.type = type;
+        return this;
+    }
+
+    public Integer getOwnerEntId() {
+        return ownerEntId;
+    }
+
+    public MemberCardVO setOwnerEntId(Integer ownerEntId) {
+        this.ownerEntId = ownerEntId;
+        return this;
+    }
+
+    public MemberCardVO setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+        return this;
+    }
+
+    public Integer getIsDefault() {
+        if (Objects.equals(cardConfigId, minMemberCardId)) {
+            return 1;
+        }
+        return 0;
+    }
+
+    public MemberCardVO setIsDefault(Integer isDefault) {
+        this.isDefault = isDefault;
+        return this;
+    }
+
+    public MemberCardVO setMinMemberCardId(Long minMemberCardId) {
+        this.minMemberCardId = minMemberCardId;
+        return this;
+    }
+
     @Override
     public String toString() {
         return "MemberCardVO{" +
                 "cardConfigId=" + cardConfigId +
                 ", cardName='" + cardName + '\'' +
+                ", type=" + type +
+                ", ownerEntId=" + ownerEntId +
+                ", enterpriseId=" + enterpriseId +
+                ", isDefault=" + isDefault +
                 '}';
     }
 }

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/data/GenerationConfigVO.java

 package com.gic.enterprise.web.vo.data;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
+import java.util.Date;
+
 /**
  *
  * @ClassName: GenerationConfigVO
@@ -41,6 +45,14 @@ public class GenerationConfigVO implements Serializable{
      */
     private String description;
 
+    private Date createTime;
+
+    /**
+     * 会员卡ID
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long memberCardId;
+
     public Integer getAgeLevel() {
         return ageLevel;
     }
@@ -95,6 +107,24 @@ public class GenerationConfigVO implements Serializable{
         return this;
     }
 
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public GenerationConfigVO setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Long getMemberCardId() {
+        return memberCardId;
+    }
+
+    public GenerationConfigVO setMemberCardId(Long memberCardId) {
+        this.memberCardId = memberCardId;
+        return this;
+    }
+
     @Override
     public String toString() {
         return "GenerationConfigVO{" +
@@ -104,6 +134,8 @@ public class GenerationConfigVO implements Serializable{
                 ", secondSign=" + secondSign +
                 ", ageSecondValue=" + ageSecondValue +
                 ", description='" + description + '\'' +
+                ", createTime=" + createTime +
+                ", memberCardId=" + memberCardId +
                 '}';
     }
 }