Merge branch 'dev/2024/0620/update-admin-Y' of Harper/feifan-backend-zx-admin into master

修改可见的积分详情

feifan-module-distri/feifan-module-distri-api/src/main/java/cn/newfeifan/mall/module/distri/enums/CaclEnum.java

@@ -23,8 +23,8 @@ public enum CaclEnum {
     ORDER_CANCEL_BY_USER_REFUND_INTEGRAL(16,"手动取消支付返回","取消订单，退回积分"),
     ORDER_CANCEL_BY_SYSTEM_REFUND_INTEGRAL(17,"支付超时返回","订单超时未支付，退回积分"),
     ORDER_PAY_INTEGRAL_ANCESTER(18, "直推奖获得","直推人购物,推荐人获得冻结积分"),//购物 上级直推人 获得积分
-    ORDER_REFUND_INTEGRAL_CONSUMER(19,"订单退款","订单退款，收回消费者获得的冻结积分"),
-    ORDER_REFUND_INTEGRAL_ANCESTER(20,"订单退款","订单退款，收回消费者的推荐人，获得的冻结积分"),
+    ORDER_REFUND_INTEGRAL_CONSUMER(19,"订单退款-撤回购物获得","订单退款，收回消费者获得的冻结积分"),
+    ORDER_REFUND_INTEGRAL_ANCESTER(20,"订单退款-撤回直推奖","订单退款，收回消费者的推荐人，获得的冻结积分"),
     ORDER_PAY_INTEGRAL_CONSUMER(21, "购物获得","消费者购物,获得冻结积分"),//购物者本人 获得积分
     SMALL_QUOTA_CRASH_SETTLE(22, "合赢奖结算获得","每天计算的合赢奖7天后结算"),
     ;

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java

@@ -43,6 +43,9 @@ public class UserProfileRespVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
     private LocalDateTime createTime;
 
+    @Schema(description = "地址")
+    private Long areaId;
+
     /**
      * 所属角色
      */

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java

@@ -28,4 +28,7 @@ public class UserProfileUpdateReqVO {
     @Schema(description = "用户性别，参见 SexEnum 枚举类", example = "1")
     private Integer sex;
 
+    @Schema(description = "地址")
+    private Long areaId;
+
 }