Merge branch 'dev/2024/0420/update-admin' into 'master'

增加用户关系显示头像

See merge request zx-mall/mall-backend-admin!2

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

@@ -14,6 +14,9 @@ public enum CaclEnum {
     HIGH_QUOTA(6, "最高可以获得积分"),
     SMALL_QUOTA_CRASH(7, "小区额度分配"),
     AFTER_CRASH_CALC_PT_TOTAL_QUOTA(8, "碰撞后计算平台总收益"),
+    ORDER_PAY_INTEGRAL(9,"购物获得积分"),//购物获得冻结积分
+    ORDER_REFUND_INTEGRAL(10,"订单退款，积分退回"),
+    ORDER_INTEGRAL_UNFREEZE(11,"订单积分到账")//购物收货7天后，冻结积分变为可用积分
     ;
 
     /**

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/duser/vo/DuserRespVO.java

@@ -65,4 +65,7 @@ public class DuserRespVO {
     @Schema(description = "后代总数")
     private Long childrenCount;
 
+    @Schema(description = "用户头像")
+    private String avatar;
+
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/duser/DuserServiceImpl.java

@@ -222,6 +222,7 @@ public class DuserServiceImpl implements DuserService {
                     .eq(SharePathDO::getDepth, 1)
             );
             duserRespVO.setAncNickName(sharePathDO != null ? sharePathDO.getAncNickName() : "");
+            duserRespVO.setAvatar(memberUserService.getUser(duserRespVO.getUserId()).getAvatar());
         }
     }
 }

sql/mysql/建空库SQL/1_20240227.sql

@@ -120,7 +120,6 @@ ALTER TABLE `sale_shop` ADD COLUMN `logo_url` varchar(255) CHARACTER SET utf8mb4
 
 
 -- 修改spu以及sku表字段
-ALTER TABLE `product_sku` ADD COLUMN `Promotion_fee` int(0) NULL DEFAULT NULL COMMENT '推广费, 单位: 分' AFTER `price`;
 ALTER TABLE `product_sku` ADD COLUMN `mark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注' AFTER `Promotion_fee`;
 
 ALTER TABLE `product_spu` ADD COLUMN `producer_area` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '产地' AFTER `description`;

sql/mysql/建空库SQL/5_20240412.sql

@@ -8,7 +8,7 @@ CREATE TABLE `distri_share_link`  (
                               `status` tinyint NOT NULL DEFAULT 1 COMMENT '状态：是否启用。默认为1，表示启用；当值为0时，表示停用。',
                               `create_user_id` bigint NOT NULL COMMENT '创建链接的用户id，关联消费者member_user表的主键',
                               `category` tinyint NOT NULL COMMENT '分享链接类型编码：1.商城，2.店铺，3.商品',
-                              `object_id` bigint NOT NULL COMMENT '链接对应业务对象id：如果“链接类型”是3=商品，这个id就是商品的spu表的id，即product_spu.id值。',
+                              `object_id` bigint NULL COMMENT '链接对应业务对象id：如果“链接类型”是3=商品，这个id就是商品的spu表的id，即product_spu.id值。',
                               `register_user_count` int NOT NULL DEFAULT 0 COMMENT '通过本分享链接，累计注册的用户总数，默认值是0。每注册一个新用户，累加1.',
 
                               `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',