基础配置

dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/right/constant/RightTypeEnum.java

@@ -12,13 +12,13 @@ public enum RightTypeEnum {
 
     EDUCATION_CERTIFICATION(101, "学历认证"),
 
-    PROFILE_MODIFICATION(201, "头像修改"),
+    PROFILE_MODIFICATION(201, "头像编辑"),
 
-    UNLOCK_MORE_PEOPLE(301, "解锁更多人数"),
+    UNLOCK_MORE_PEOPLE(301, "解锁人数"),
 
     ADVANCED_SEARCH(302, "高级搜索"),
 
-    OFFLINE_MEET(401, "线下约见面");
+    OFFLINE_MEET(401, "线下见面");
 
     @EnumValue
     @JsonValue

dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/right/user/response/UserListRightByCustomerVo.java

@@ -4,12 +4,16 @@ import com.qniao.dam.domian.aggregate.right.constant.RightTypeEnum;
 import com.qniao.dam.domian.aggregate.right.constant.RightUnitEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
 
 @Data
 public class UserListRightByCustomerVo {
 
+    @ApiModelProperty("权益名称")
+    private String rightName;
+
     @ApiModelProperty("权益类型")
     private RightTypeEnum type;
 
@@ -17,9 +21,11 @@ public class UserListRightByCustomerVo {
     private RightUnitEnum rightSpecUnit;
 
     @ApiModelProperty("开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startTime;
 
     @ApiModelProperty("结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
 
     @ApiModelProperty("剩余天数")

dating-agency-mall-server/src/main/java/com/qniao/dam/query/right/impl/RightQueryServiceImpl.java

@@ -78,6 +78,7 @@ public class RightQueryServiceImpl implements RightQueryService {
     private UserListRightByCustomerVo transformCustomerRight(RightTypeEnum rightType, List<Right> rightList) {
         UserListRightByCustomerVo customerVo = new UserListRightByCustomerVo();
         customerVo.setType(rightType);
+        customerVo.setRightName(rightType.getDesc());
         //权益规格 + 时间 + 单日使用上限 以第一个权益的配置为准
         Right firstRight = rightList.get(0);
         //权益规格