From 4b062e6da23780cfde44a6717942f20657b8346e Mon Sep 17 00:00:00 2001
From: Derran <zhangpengjie@qniao.cn>
Date: Wed, 9 Oct 2024 17:58:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=82=AC=E8=B5=8F=E6=8B=9B=E4=BA=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/MarriageBountyOrderDisplay.java  | 36 +++++++++++++++++++
 .../entity/MarriageBountyOrder.java           |  3 ++
 .../UserSubmitMarriageBountyOrderDto.java     | 11 ++++++
 3 files changed, 50 insertions(+)
 create mode 100644 dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/marriagebount/constant/MarriageBountyOrderDisplay.java

diff --git a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/marriagebount/constant/MarriageBountyOrderDisplay.java b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/marriagebount/constant/MarriageBountyOrderDisplay.java
new file mode 100644
index 0000000..292f8e2
--- /dev/null
+++ b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/marriagebount/constant/MarriageBountyOrderDisplay.java
@@ -0,0 +1,36 @@
+package com.qniao.dam.domian.aggregate.marriagebount.constant;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.Getter;
+
+@Getter
+@JsonFormat(shape = JsonFormat.Shape.OBJECT)
+public enum MarriageBountyOrderDisplay {
+
+    ALL(1, "所有人"),
+
+    ONLY_MATCHMAKER(2, "仅红娘");
+
+    @EnumValue
+    @JsonValue
+    private final Integer value;
+    private final String desc;
+
+    MarriageBountyOrderDisplay(Integer value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    @JsonCreator
+    public static MarriageBountyOrderDisplay get(Object code) {
+        for (MarriageBountyOrderDisplay e : MarriageBountyOrderDisplay.values()) {
+            if (e.getValue().equals(code)) {
+                return e;
+            }
+        }
+        return null;
+    }
+}
diff --git a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/marriagebounty/entity/MarriageBountyOrder.java b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/marriagebounty/entity/MarriageBountyOrder.java
index 6a22080..62330fa 100644
--- a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/marriagebounty/entity/MarriageBountyOrder.java
+++ b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/marriagebounty/entity/MarriageBountyOrder.java
@@ -28,6 +28,9 @@ public class MarriageBountyOrder extends Entity<MarriageBountyOrder> {
     @ApiModelProperty("征婚资料标识")
     private Long miId;
 
+    @ApiModelProperty("悬赏招亲版本展示")
+    private MarriageBountyOrderDisplay display;
+
     @ApiModelProperty("悬赏招亲版本")
     private MarriageBountyOrderVersion version;
 
diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/request/UserSubmitMarriageBountyOrderDto.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/request/UserSubmitMarriageBountyOrderDto.java
index afc225d..4472380 100644
--- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/request/UserSubmitMarriageBountyOrderDto.java
+++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/request/UserSubmitMarriageBountyOrderDto.java
@@ -4,6 +4,7 @@ import com.qniao.dam.domain.aggregate.marriagebounty.entity.MarriageBountyOrder;
 import com.qniao.dam.domain.aggregate.order.entity.Order;
 import com.qniao.dam.domain.aggregate.product.entity.Product;
 import com.qniao.dam.domain.aggregate.productspec.entity.ProductSpec;
+import com.qniao.dam.domian.aggregate.marriagebount.constant.MarriageBountyOrderDisplay;
 import com.qniao.dam.domian.aggregate.marriagebount.constant.MarriageBountyOrderType;
 import com.qniao.dam.domian.aggregate.marriagebount.constant.PublishIdentityTypeEnum;
 import com.qniao.dam.domian.aggregate.product.constant.ProductMainCategoryEnum;
@@ -31,6 +32,9 @@ public class UserSubmitMarriageBountyOrderDto implements Trans2DomainAssembler<O
     @NotNull(message = "征婚资料标识不能为空")
     private Long miId;
 
+    @ApiModelProperty("悬赏招亲版本展示")
+    private MarriageBountyOrderDisplay display;
+
     @ApiModelProperty("悬赏招亲发布者类型")
     private PublishIdentityTypeEnum publishType;
 
@@ -62,6 +66,13 @@ public class UserSubmitMarriageBountyOrderDto implements Trans2DomainAssembler<O
         MarriageBountyOrder marriageBountyOrder = new MarriageBountyOrder();
         marriageBountyOrder.setMiId(miId);
         marriageBountyOrder.setType(type);
+        //可见范围
+        if (Objects.isNull(display)) {
+            //默认所有人可见
+            marriageBountyOrder.setDisplay(MarriageBountyOrderDisplay.ALL);
+        } else {
+            marriageBountyOrder.setDisplay(display);
+        }
         if (Objects.isNull(publishType)) {
             //默认嘉宾自己发布
             marriageBountyOrder.setPublishType(PublishIdentityTypeEnum.GUEST);