Merge branch 'dev/2024/0412/update-app' of Harper/feifan-backend-zx-app into master

 修改登录问题

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/sharelink/ShareLinkController.java

@@ -0,0 +1,94 @@
+package cn.newfeifan.mall.module.distri.controller.admin.sharelink;
+
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.newfeifan.mall.framework.common.pojo.PageParam;
+import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import cn.newfeifan.mall.framework.common.pojo.CommonResult;
+import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
+import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
+
+import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
+
+import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
+import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.*;
+
+import cn.newfeifan.mall.module.distri.controller.admin.sharelink.vo.*;
+import cn.newfeifan.mall.module.distri.dal.dataobject.sharelink.ShareLinkDO;
+import cn.newfeifan.mall.module.distri.service.sharelink.ShareLinkService;
+
+@Tag(name = "管理后台 - 分享链接")
+@RestController
+@RequestMapping("/distri/share-link")
+@Validated
+public class ShareLinkController {
+
+    @Resource
+    private ShareLinkService shareLinkService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建分享链接")
+    @PreAuthorize("@ss.hasPermission('distri:share-link:create')")
+    public CommonResult<Long> createShareLink(@Valid @RequestBody ShareLinkSaveReqVO createReqVO) {
+        return success(shareLinkService.createShareLink(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新分享链接")
+    @PreAuthorize("@ss.hasPermission('distri:share-link:update')")
+    public CommonResult<Boolean> updateShareLink(@Valid @RequestBody ShareLinkSaveReqVO updateReqVO) {
+        shareLinkService.updateShareLink(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除分享链接")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('distri:share-link:delete')")
+    public CommonResult<Boolean> deleteShareLink(@RequestParam("id") Long id) {
+        shareLinkService.deleteShareLink(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得分享链接")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('distri:share-link:query')")
+    public CommonResult<ShareLinkRespVO> getShareLink(@RequestParam("id") Long id) {
+        ShareLinkDO shareLink = shareLinkService.getShareLink(id);
+        return success(BeanUtils.toBean(shareLink, ShareLinkRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得分享链接分页")
+    @PreAuthorize("@ss.hasPermission('distri:share-link:query')")
+    public CommonResult<PageResult<ShareLinkRespVO>> getShareLinkPage(@Valid ShareLinkPageReqVO pageReqVO) {
+        PageResult<ShareLinkDO> pageResult = shareLinkService.getShareLinkPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, ShareLinkRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出分享链接 Excel")
+    @PreAuthorize("@ss.hasPermission('distri:share-link:export')")
+    @OperateLog(type = EXPORT)
+    public void exportShareLinkExcel(@Valid ShareLinkPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<ShareLinkDO> list = shareLinkService.getShareLinkPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "分享链接.xls", "数据", ShareLinkRespVO.class,
+                        BeanUtils.toBean(list, ShareLinkRespVO.class));
+    }
+
+}

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

@@ -0,0 +1,39 @@
+package cn.newfeifan.mall.module.distri.controller.admin.sharelink.vo;
+
+import lombok.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.newfeifan.mall.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 分享链接分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ShareLinkPageReqVO extends PageParam {
+
+    @Schema(description = "链接名称", example = "赵六")
+    private String name;
+
+    @Schema(description = "状态：是否启用。默认为1，表示启用；当值为0时，表示停用。", example = "2")
+    private Integer status;
+
+    @Schema(description = "创建链接的用户id，关联消费者member_user表的主键", example = "30193")
+    private Long createUserId;
+
+    @Schema(description = "分享链接类型编码：1.商城，2.店铺，3.商品")
+    private Integer category;
+
+    @Schema(description = "链接对应业务对象id：如果“链接类型”是3=商品，这个id就是商品的spu表的id，即product_spu.id值。", example = "22758")
+    private Long objectId;
+
+    @Schema(description = "通过本分享链接，累计注册的用户总数，默认值是0。每注册一个新用户，累加1.", example = "11628")
+    private Integer registerUserCount;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

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

@@ -0,0 +1,48 @@
+package cn.newfeifan.mall.module.distri.controller.admin.sharelink.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 分享链接 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class ShareLinkRespVO {
+
+    @Schema(description = "分享链接id", requiredMode = Schema.RequiredMode.REQUIRED, example = "20538")
+    @ExcelProperty("分享链接id")
+    private Long id;
+
+    @Schema(description = "链接名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @ExcelProperty("链接名称")
+    private String name;
+
+    @Schema(description = "状态：是否启用。默认为1，表示启用；当值为0时，表示停用。", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("状态：是否启用。默认为1，表示启用；当值为0时，表示停用。")
+    private Integer status;
+
+    @Schema(description = "创建链接的用户id，关联消费者member_user表的主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "30193")
+    @ExcelProperty("创建链接的用户id，关联消费者member_user表的主键")
+    private Long createUserId;
+
+    @Schema(description = "分享链接类型编码：1.商城，2.店铺，3.商品", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("分享链接类型编码：1.商城，2.店铺，3.商品")
+    private Integer category;
+
+    @Schema(description = "链接对应业务对象id：如果“链接类型”是3=商品，这个id就是商品的spu表的id，即product_spu.id值。", requiredMode = Schema.RequiredMode.REQUIRED, example = "22758")
+    @ExcelProperty("链接对应业务对象id：如果“链接类型”是3=商品，这个id就是商品的spu表的id，即product_spu.id值。")
+    private Long objectId;
+
+    @Schema(description = "通过本分享链接，累计注册的用户总数，默认值是0。每注册一个新用户，累加1.", requiredMode = Schema.RequiredMode.REQUIRED, example = "11628")
+    @ExcelProperty("通过本分享链接，累计注册的用户总数，默认值是0。每注册一个新用户，累加1.")
+    private Integer registerUserCount;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

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

@@ -0,0 +1,39 @@
+package cn.newfeifan.mall.module.distri.controller.admin.sharelink.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+
+@Schema(description = "管理后台 - 分享链接新增/修改 Request VO")
+@Data
+public class ShareLinkSaveReqVO {
+
+    @Schema(description = "分享链接id", requiredMode = Schema.RequiredMode.REQUIRED, example = "20538")
+    private Long id;
+
+    @Schema(description = "链接名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @NotEmpty(message = "链接名称不能为空")
+    private String name;
+
+    @Schema(description = "状态：是否启用。默认为1，表示启用；当值为0时，表示停用。", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotNull(message = "状态：是否启用。默认为1，表示启用；当值为0时，表示停用。不能为空")
+    private Integer status;
+
+    @Schema(description = "创建链接的用户id，关联消费者member_user表的主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "30193")
+    @NotNull(message = "创建链接的用户id，关联消费者member_user表的主键不能为空")
+    private Long createUserId;
+
+    @Schema(description = "分享链接类型编码：1.商城，2.店铺，3.商品", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "分享链接类型编码：1.商城，2.店铺，3.商品不能为空")
+    private Integer category;
+
+    @Schema(description = "链接对应业务对象id：如果“链接类型”是3=商品，这个id就是商品的spu表的id，即product_spu.id值。", requiredMode = Schema.RequiredMode.REQUIRED, example = "22758")
+    @NotNull(message = "链接对应业务对象id：如果“链接类型”是3=商品，这个id就是商品的spu表的id，即product_spu.id值。不能为空")
+    private Long objectId;
+
+    @Schema(description = "通过本分享链接，累计注册的用户总数，默认值是0。每注册一个新用户，累加1.", requiredMode = Schema.RequiredMode.REQUIRED, example = "11628")
+    @NotNull(message = "通过本分享链接，累计注册的用户总数，默认值是0。每注册一个新用户，累加1.不能为空")
+    private Integer registerUserCount;
+
+}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/sharelinkregister/ShareLinkRegisterController.java

@@ -0,0 +1,94 @@
+package cn.newfeifan.mall.module.distri.controller.admin.sharelinkregister;
+
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.newfeifan.mall.framework.common.pojo.PageParam;
+import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import cn.newfeifan.mall.framework.common.pojo.CommonResult;
+import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
+import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
+
+import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
+
+import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
+import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.*;
+
+import cn.newfeifan.mall.module.distri.controller.admin.sharelinkregister.vo.*;
+import cn.newfeifan.mall.module.distri.dal.dataobject.sharelinkregister.ShareLinkRegisterDO;
+import cn.newfeifan.mall.module.distri.service.sharelinkregister.ShareLinkRegisterService;
+
+@Tag(name = "管理后台 - 通过分享链接，新注册用户")
+@RestController
+@RequestMapping("/distri/share-link-register")
+@Validated
+public class ShareLinkRegisterController {
+
+    @Resource
+    private ShareLinkRegisterService shareLinkRegisterService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建通过分享链接，新注册用户")
+    @PreAuthorize("@ss.hasPermission('distri:share-link-register:create')")
+    public CommonResult<Long> createShareLinkRegister(@Valid @RequestBody ShareLinkRegisterSaveReqVO createReqVO) {
+        return success(shareLinkRegisterService.createShareLinkRegister(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新通过分享链接，新注册用户")
+    @PreAuthorize("@ss.hasPermission('distri:share-link-register:update')")
+    public CommonResult<Boolean> updateShareLinkRegister(@Valid @RequestBody ShareLinkRegisterSaveReqVO updateReqVO) {
+        shareLinkRegisterService.updateShareLinkRegister(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除通过分享链接，新注册用户")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('distri:share-link-register:delete')")
+    public CommonResult<Boolean> deleteShareLinkRegister(@RequestParam("id") Long id) {
+        shareLinkRegisterService.deleteShareLinkRegister(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得通过分享链接，新注册用户")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('distri:share-link-register:query')")
+    public CommonResult<ShareLinkRegisterRespVO> getShareLinkRegister(@RequestParam("id") Long id) {
+        ShareLinkRegisterDO shareLinkRegister = shareLinkRegisterService.getShareLinkRegister(id);
+        return success(BeanUtils.toBean(shareLinkRegister, ShareLinkRegisterRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得通过分享链接，新注册用户分页")
+    @PreAuthorize("@ss.hasPermission('distri:share-link-register:query')")
+    public CommonResult<PageResult<ShareLinkRegisterRespVO>> getShareLinkRegisterPage(@Valid ShareLinkRegisterPageReqVO pageReqVO) {
+        PageResult<ShareLinkRegisterDO> pageResult = shareLinkRegisterService.getShareLinkRegisterPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, ShareLinkRegisterRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出通过分享链接，新注册用户 Excel")
+    @PreAuthorize("@ss.hasPermission('distri:share-link-register:export')")
+    @OperateLog(type = EXPORT)
+    public void exportShareLinkRegisterExcel(@Valid ShareLinkRegisterPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<ShareLinkRegisterDO> list = shareLinkRegisterService.getShareLinkRegisterPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "通过分享链接，新注册用户.xls", "数据", ShareLinkRegisterRespVO.class,
+                        BeanUtils.toBean(list, ShareLinkRegisterRespVO.class));
+    }
+
+}

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

@@ -0,0 +1,27 @@
+package cn.newfeifan.mall.module.distri.controller.admin.sharelinkregister.vo;
+
+import lombok.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.newfeifan.mall.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 通过分享链接，新注册用户分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ShareLinkRegisterPageReqVO extends PageParam {
+
+    @Schema(description = "分享链接表id：关联分享链接表，本记录对应的分享链接表记录", example = "12173")
+    private Long distriShareLinkId;
+
+    @Schema(description = "注册用户id:通过distri_share_link_id分享链接，新注册的用户id，对应member_user表的id", example = "21753")
+    private Long registerUserId;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

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

@@ -0,0 +1,29 @@
+package cn.newfeifan.mall.module.distri.controller.admin.sharelinkregister.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 通过分享链接，新注册用户 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class ShareLinkRegisterRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19900")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "分享链接表id：关联分享链接表，本记录对应的分享链接表记录", requiredMode = Schema.RequiredMode.REQUIRED, example = "12173")
+    @ExcelProperty("分享链接表id：关联分享链接表，本记录对应的分享链接表记录")
+    private Long distriShareLinkId;
+
+    @Schema(description = "注册用户id:通过distri_share_link_id分享链接，新注册的用户id，对应member_user表的id", requiredMode = Schema.RequiredMode.REQUIRED, example = "21753")
+    @ExcelProperty("注册用户id:通过distri_share_link_id分享链接，新注册的用户id，对应member_user表的id")
+    private Long registerUserId;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

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

@@ -0,0 +1,22 @@
+package cn.newfeifan.mall.module.distri.controller.admin.sharelinkregister.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import javax.validation.constraints.*;
+
+@Schema(description = "管理后台 - 通过分享链接，新注册用户新增/修改 Request VO")
+@Data
+public class ShareLinkRegisterSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19900")
+    private Long id;
+
+    @Schema(description = "分享链接表id：关联分享链接表，本记录对应的分享链接表记录", requiredMode = Schema.RequiredMode.REQUIRED, example = "12173")
+    @NotNull(message = "分享链接表id：关联分享链接表，本记录对应的分享链接表记录不能为空")
+    private Long distriShareLinkId;
+
+    @Schema(description = "注册用户id:通过distri_share_link_id分享链接，新注册的用户id，对应member_user表的id", requiredMode = Schema.RequiredMode.REQUIRED, example = "21753")
+    @NotNull(message = "注册用户id:通过distri_share_link_id分享链接，新注册的用户id，对应member_user表的id不能为空")
+    private Long registerUserId;
+
+}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/sharelink/ShareLinkDO.java

@@ -0,0 +1,52 @@
+package cn.newfeifan.mall.module.distri.dal.dataobject.sharelink;
+
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.newfeifan.mall.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 分享链接 DO
+ *
+ * @author 非繁人
+ */
+@TableName("distri_share_link")
+@KeySequence("distri_share_link_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ShareLinkDO extends BaseDO {
+
+    /**
+     * 分享链接id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 链接名称
+     */
+    private String name;
+    /**
+     * 状态：是否启用。默认为1，表示启用；当值为0时，表示停用。
+     */
+    private Integer status;
+    /**
+     * 创建链接的用户id，关联消费者member_user表的主键
+     */
+    private Long createUserId;
+    /**
+     * 分享链接类型编码：1.商城，2.店铺，3.商品
+     */
+    private Integer category;
+    /**
+     * 链接对应业务对象id：如果“链接类型”是3=商品，这个id就是商品的spu表的id，即product_spu.id值。
+     */
+    private Long objectId;
+    /**
+     * 通过本分享链接，累计注册的用户总数，默认值是0。每注册一个新用户，累加1.
+     */
+    private Integer registerUserCount;
+
+}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/sharelinkregister/ShareLinkRegisterDO.java

@@ -0,0 +1,36 @@
+package cn.newfeifan.mall.module.distri.dal.dataobject.sharelinkregister;
+
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.newfeifan.mall.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 通过分享链接，新注册用户 DO
+ *
+ * @author 非繁人
+ */
+@TableName("distri_share_link_register")
+@KeySequence("distri_share_link_register_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ShareLinkRegisterDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 分享链接表id：关联分享链接表，本记录对应的分享链接表记录
+     */
+    private Long distriShareLinkId;
+    /**
+     * 注册用户id:通过distri_share_link_id分享链接，新注册的用户id，对应member_user表的id
+     */
+    private Long registerUserId;
+
+}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/sharelink/ShareLinkMapper.java

@@ -0,0 +1,32 @@
+package cn.newfeifan.mall.module.distri.dal.mysql.sharelink;
+
+import java.util.*;
+
+import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.newfeifan.mall.framework.mybatis.core.mapper.BaseMapperX;
+import cn.newfeifan.mall.module.distri.dal.dataobject.sharelink.ShareLinkDO;
+import org.apache.ibatis.annotations.Mapper;
+import cn.newfeifan.mall.module.distri.controller.admin.sharelink.vo.*;
+
+/**
+ * 分享链接 Mapper
+ *
+ * @author 非繁人
+ */
+@Mapper
+public interface ShareLinkMapper extends BaseMapperX<ShareLinkDO> {
+
+    default PageResult<ShareLinkDO> selectPage(ShareLinkPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<ShareLinkDO>()
+                .likeIfPresent(ShareLinkDO::getName, reqVO.getName())
+                .eqIfPresent(ShareLinkDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(ShareLinkDO::getCreateUserId, reqVO.getCreateUserId())
+                .eqIfPresent(ShareLinkDO::getCategory, reqVO.getCategory())
+                .eqIfPresent(ShareLinkDO::getObjectId, reqVO.getObjectId())
+                .eqIfPresent(ShareLinkDO::getRegisterUserCount, reqVO.getRegisterUserCount())
+                .betweenIfPresent(ShareLinkDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(ShareLinkDO::getId));
+    }
+
+}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/sharelinkregister/ShareLinkRegisterMapper.java

@@ -0,0 +1,27 @@
+package cn.newfeifan.mall.module.distri.dal.mysql.sharelinkregister;
+
+
+import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.newfeifan.mall.framework.mybatis.core.mapper.BaseMapperX;
+import cn.newfeifan.mall.module.distri.dal.dataobject.sharelinkregister.ShareLinkRegisterDO;
+import org.apache.ibatis.annotations.Mapper;
+import cn.newfeifan.mall.module.distri.controller.admin.sharelinkregister.vo.*;
+
+/**
+ * 通过分享链接，新注册用户 Mapper
+ *
+ * @author 非繁人
+ */
+@Mapper
+public interface ShareLinkRegisterMapper extends BaseMapperX<ShareLinkRegisterDO> {
+
+    default PageResult<ShareLinkRegisterDO> selectPage(ShareLinkRegisterPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<ShareLinkRegisterDO>()
+                .eqIfPresent(ShareLinkRegisterDO::getDistriShareLinkId, reqVO.getDistriShareLinkId())
+                .eqIfPresent(ShareLinkRegisterDO::getRegisterUserId, reqVO.getRegisterUserId())
+                .betweenIfPresent(ShareLinkRegisterDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(ShareLinkRegisterDO::getId));
+    }
+
+}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/sharelink/ShareLinkService.java

@@ -0,0 +1,55 @@
+package cn.newfeifan.mall.module.distri.service.sharelink;
+
+import java.util.*;
+import javax.validation.*;
+import cn.newfeifan.mall.module.distri.controller.admin.sharelink.vo.*;
+import cn.newfeifan.mall.module.distri.dal.dataobject.sharelink.ShareLinkDO;
+import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import cn.newfeifan.mall.framework.common.pojo.PageParam;
+
+/**
+ * 分享链接 Service 接口
+ *
+ * @author 非繁人
+ */
+public interface ShareLinkService {
+
+    /**
+     * 创建分享链接
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createShareLink(@Valid ShareLinkSaveReqVO createReqVO);
+
+    /**
+     * 更新分享链接
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateShareLink(@Valid ShareLinkSaveReqVO updateReqVO);
+
+    /**
+     * 删除分享链接
+     *
+     * @param id 编号
+     */
+    void deleteShareLink(Long id);
+
+    /**
+     * 获得分享链接
+     *
+     * @param id 编号
+     * @return 分享链接
+     */
+    ShareLinkDO getShareLink(Long id);
+
+    /**
+     * 获得分享链接分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 分享链接分页
+     */
+    PageResult<ShareLinkDO> getShareLinkPage(ShareLinkPageReqVO pageReqVO);
+
+}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/sharelink/ShareLinkServiceImpl.java

@@ -0,0 +1,69 @@
+package cn.newfeifan.mall.module.distri.service.sharelink;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+
+import cn.newfeifan.mall.module.distri.controller.admin.sharelink.vo.*;
+import cn.newfeifan.mall.module.distri.dal.dataobject.sharelink.ShareLinkDO;
+import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
+
+import cn.newfeifan.mall.module.distri.dal.mysql.sharelink.ShareLinkMapper;
+
+
+/**
+ * 分享链接 Service 实现类
+ *
+ * @author 非繁人
+ */
+@Service
+@Validated
+public class ShareLinkServiceImpl implements ShareLinkService {
+
+    @Resource
+    private ShareLinkMapper shareLinkMapper;
+
+    @Override
+    public Long createShareLink(ShareLinkSaveReqVO createReqVO) {
+        // 插入
+        ShareLinkDO shareLink = BeanUtils.toBean(createReqVO, ShareLinkDO.class);
+        shareLinkMapper.insert(shareLink);
+        // 返回
+        return shareLink.getId();
+    }
+
+    @Override
+    public void updateShareLink(ShareLinkSaveReqVO updateReqVO) {
+        // 校验存在
+        validateShareLinkExists(updateReqVO.getId());
+        // 更新
+        ShareLinkDO updateObj = BeanUtils.toBean(updateReqVO, ShareLinkDO.class);
+        shareLinkMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteShareLink(Long id) {
+        // 校验存在
+        validateShareLinkExists(id);
+        // 删除
+        shareLinkMapper.deleteById(id);
+    }
+
+    private void validateShareLinkExists(Long id) {
+        if (shareLinkMapper.selectById(id) == null) {
+//            throw exception(SHARE_LINK_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public ShareLinkDO getShareLink(Long id) {
+        return shareLinkMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<ShareLinkDO> getShareLinkPage(ShareLinkPageReqVO pageReqVO) {
+        return shareLinkMapper.selectPage(pageReqVO);
+    }
+
+}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/sharelinkregister/ShareLinkRegisterService.java

@@ -0,0 +1,53 @@
+package cn.newfeifan.mall.module.distri.service.sharelinkregister;
+
+import javax.validation.*;
+import cn.newfeifan.mall.module.distri.controller.admin.sharelinkregister.vo.*;
+import cn.newfeifan.mall.module.distri.dal.dataobject.sharelinkregister.ShareLinkRegisterDO;
+import cn.newfeifan.mall.framework.common.pojo.PageResult;
+
+/**
+ * 通过分享链接，新注册用户 Service 接口
+ *
+ * @author 非繁人
+ */
+public interface ShareLinkRegisterService {
+
+    /**
+     * 创建通过分享链接，新注册用户
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createShareLinkRegister(@Valid ShareLinkRegisterSaveReqVO createReqVO);
+
+    /**
+     * 更新通过分享链接，新注册用户
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateShareLinkRegister(@Valid ShareLinkRegisterSaveReqVO updateReqVO);
+
+    /**
+     * 删除通过分享链接，新注册用户
+     *
+     * @param id 编号
+     */
+    void deleteShareLinkRegister(Long id);
+
+    /**
+     * 获得通过分享链接，新注册用户
+     *
+     * @param id 编号
+     * @return 通过分享链接，新注册用户
+     */
+    ShareLinkRegisterDO getShareLinkRegister(Long id);
+
+    /**
+     * 获得通过分享链接，新注册用户分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 通过分享链接，新注册用户分页
+     */
+    PageResult<ShareLinkRegisterDO> getShareLinkRegisterPage(ShareLinkRegisterPageReqVO pageReqVO);
+
+}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/sharelinkregister/ShareLinkRegisterServiceImpl.java

@@ -0,0 +1,74 @@
+package cn.newfeifan.mall.module.distri.service.sharelinkregister;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import cn.newfeifan.mall.module.distri.controller.admin.sharelinkregister.vo.*;
+import cn.newfeifan.mall.module.distri.dal.dataobject.sharelinkregister.ShareLinkRegisterDO;
+import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import cn.newfeifan.mall.framework.common.pojo.PageParam;
+import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
+
+import cn.newfeifan.mall.module.distri.dal.mysql.sharelinkregister.ShareLinkRegisterMapper;
+
+import static cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.newfeifan.mall.module.distri.enums.ErrorCodeConstants.*;
+
+/**
+ * 通过分享链接，新注册用户 Service 实现类
+ *
+ * @author 非繁人
+ */
+@Service
+@Validated
+public class ShareLinkRegisterServiceImpl implements ShareLinkRegisterService {
+
+    @Resource
+    private ShareLinkRegisterMapper shareLinkRegisterMapper;
+
+    @Override
+    public Long createShareLinkRegister(ShareLinkRegisterSaveReqVO createReqVO) {
+        // 插入
+        ShareLinkRegisterDO shareLinkRegister = BeanUtils.toBean(createReqVO, ShareLinkRegisterDO.class);
+        shareLinkRegisterMapper.insert(shareLinkRegister);
+        // 返回
+        return shareLinkRegister.getId();
+    }
+
+    @Override
+    public void updateShareLinkRegister(ShareLinkRegisterSaveReqVO updateReqVO) {
+        // 校验存在
+        validateShareLinkRegisterExists(updateReqVO.getId());
+        // 更新
+        ShareLinkRegisterDO updateObj = BeanUtils.toBean(updateReqVO, ShareLinkRegisterDO.class);
+        shareLinkRegisterMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteShareLinkRegister(Long id) {
+        // 校验存在
+        validateShareLinkRegisterExists(id);
+        // 删除
+        shareLinkRegisterMapper.deleteById(id);
+    }
+
+    private void validateShareLinkRegisterExists(Long id) {
+        if (shareLinkRegisterMapper.selectById(id) == null) {
+//            throw exception(SHARE_LINK_REGISTER_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public ShareLinkRegisterDO getShareLinkRegister(Long id) {
+        return shareLinkRegisterMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<ShareLinkRegisterDO> getShareLinkRegisterPage(ShareLinkRegisterPageReqVO pageReqVO) {
+        return shareLinkRegisterMapper.selectPage(pageReqVO);
+    }
+
+}

feifan-module-distri/feifan-module-distri-biz/src/main/resources/mapper/sharelink/ShareLinkMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.newfeifan.mall.module.distri.dal.mysql.sharelink.ShareLinkMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.zhongxing.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>

feifan-module-distri/feifan-module-distri-biz/src/main/resources/mapper/sharelinkregister/ShareLinkRegisterMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.newfeifan.mall.module.distri.dal.mysql.sharelinkregister.ShareLinkRegisterMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.zhongxing.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/app/auth/AppAuthController.java

@@ -96,8 +96,7 @@ public class AppAuthController {
     public CommonResult<AppAuthLoginRespVO> socialLoginValidateSmsCode(@RequestBody @Validated SocialLoginValidateSmsCodeReqVO requestVO) {
         authService.validateSmsCode(getLoginUserId(), requestVO.getReqVO());
         AppAuthSocialLoginReqVO loginReqVO = requestVO.getLoginReqVO();
-        String code = requestVO.getReqVO().getCode();
-        return success(authService.socialLogin(loginReqVO, code, false, true));
+        return success(authService.socialLogin(loginReqVO, requestVO.getReqVO().getMobile(), false, true));
     }
 
     // ========== 社交登录相关 ==========

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/service/user/MemberUserServiceImpl.java

@@ -92,7 +92,7 @@ public class MemberUserServiceImpl implements MemberUserService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public MemberUserDO createUser(String nickname,String mobile, String avtar, String registerIp, Integer terminal) {
+    public MemberUserDO createUser(String mobile,String nickname, String avtar, String registerIp, Integer terminal) {
         return privateCreateUser(mobile, nickname, avtar, registerIp, terminal);
     }