mysql数据源更换到crm服务器

Reviewed-on: #5

ludu-job-admin/ludu-job-admin-biz/src/main/resources/application-local.yaml

@@ -40,7 +40,7 @@ spring:
       primary: master
       datasource:
         master:
-          url: jdbc:mysql://120.46.37.243:3306/ludu_db?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://101.43.112.107:3306/ludu_db?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           #          url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # MySQL Connector/J 5.X 连接的示例
           #          url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例
           #          url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/asset/vo/AssetRespVO.java

@@ -41,4 +41,6 @@ public class AssetRespVO {
     @ExcelProperty("最后一次反馈时间")
     private Long lastfeedbacktime;
 
+    private Long personCount;
+
 }

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/ticssrMachine/TicssrMachineApi.java

@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.datacenter.controller.admin.ticssrMachine;
+
+import cn.iocoder.yudao.module.datacenter.controller.admin.asset.vo.AssetRespVO;
+import cn.iocoder.yudao.module.datacenter.service.asset.AssetService;
+import cn.iocoder.yudao.module.datacenter.service.passengerInformation.PassengerInformationService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Description 临时身份证自助补办机
+ */
+@Tag(name = "大屏服务 - 临时身份证自助补办机")
+@RestController
+@RequestMapping("/datacenter/ticssrMachine")
+@Validated
+public class TicssrMachineApi {
+    @Autowired
+    private AssetService assetService;
+    @Autowired
+    private PassengerInformationService passengerInformationService;
+
+    @GetMapping("/temporaryIDCardMessage")
+    public List<AssetRespVO> temporaryIDCardMessage(){
+        List<AssetRespVO> list = assetService.nameAsset("临时身份证补办机");
+        for (AssetRespVO assetRespVO : list) {
+            Long personCount = passengerInformationService.personCount(assetRespVO.getDataId());
+            assetRespVO.setPersonCount(personCount);
+        }
+        return list;
+    }
+}

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/passengerInformation/PassengerInformation.java

@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.datacenter.dal.dataobject.passengerInformation;
+
+import lombok.Data;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+@Document("passengerInformation")
+@Data
+public class PassengerInformation {
+    //编号
+    private String id;
+    //设备id
+    private String deviceId;
+    //旅客姓名
+    private String name;
+    //旅客身份证
+    private String idCard;
+    //提交时间
+    private String commitTime;
+}

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/mongodb/passengerInformation/PassengerInformationRepository.java

@@ -0,0 +1,15 @@
+package cn.iocoder.yudao.module.datacenter.dal.mongodb.passengerInformation;
+
+import cn.iocoder.yudao.module.datacenter.dal.dataobject.passengerInformation.PassengerInformation;
+import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.data.mongodb.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PassengerInformationRepository extends MongoRepository<PassengerInformation,String> {
+    @Query("{ 'commitTime': { $regex: ?0 }, 'deviceId': ?1 }")
+    List countAllByDeviceId(String regex, String deviceId);
+
+}

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/passengerInformation/PassengerInformationService.java

@@ -0,0 +1,5 @@
+package cn.iocoder.yudao.module.datacenter.service.passengerInformation;
+
+public interface PassengerInformationService {
+    public Long personCount(String deviceId);
+}

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/passengerInformation/PassengerInformationServiceImpl.java

@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.datacenter.service.passengerInformation;
+
+import cn.iocoder.yudao.module.datacenter.dal.mongodb.passengerInformation.PassengerInformationRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+@Service
+@Validated
+public class PassengerInformationServiceImpl implements PassengerInformationService{
+    @Autowired
+    private PassengerInformationRepository passengerInformationRepository;
+    @Override
+    public Long personCount(String deviceId) {
+        // 获取今天的日期字符串，格式为 "yyyy-MM-dd"
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Calendar calendar = Calendar.getInstance();
+        String todayDate = dateFormat.format(calendar.getTime());
+        // 构造正则表达式以匹配今天的日期
+        String regex = "^" + todayDate;
+        return Long.parseLong(passengerInformationRepository.countAllByDeviceId(regex,deviceId).size()+"");
+    }
+}

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/resources/application-local.yaml

@@ -45,7 +45,7 @@ spring:
       primary: master
       datasource:
         master:
-          url: jdbc:mysql://120.46.37.243:3306/ludu_ticketing?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://101.43.112.107:3306/ludu_ticketing?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           #          url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # MySQL Connector/J 5.X 连接的示例
           #          url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例
           #          url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例

ludu-module-parking/ludu-module-parking-biz/src/main/resources/application-local.yaml

@@ -40,7 +40,7 @@ spring:
       primary: master
       datasource:
         master:
-          url: jdbc:mysql://120.46.37.243:3306/ludu_parking?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # MySQL Connector/J 5.X 连接的示例
+          url: jdbc:mysql://101.43.112.107:3306/ludu_parking?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # MySQL Connector/J 5.X 连接的示例
           #          url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例
           #          url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
           #          url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=ruoyi-vue-pro # SQLServer 连接的示例

ludu-module-ticketing/ludu-module-ticketing-biz/src/main/resources/application-local.yaml

@@ -45,7 +45,7 @@ spring:
       primary: master
       datasource:
         master:
-          url: jdbc:mysql://120.46.37.243:3306/ludu_ticketing?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://101.43.112.107:3306/ludu_ticketing?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           #          url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # MySQL Connector/J 5.X 连接的示例
           #          url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例
           #          url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例

pom.xml

@@ -14,7 +14,6 @@
         <!--  各种 module 拓展 -->
         <module>yudao-module-system</module>
         <module>yudao-module-infra</module>
-        <module>yudao-module-member</module>
         <module>ludu-module-ticketing</module>
         <module>ludu-job-admin</module>
         <module>ludu-module-parking</module>

yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-local.yaml

@@ -48,7 +48,7 @@ spring:
       primary: master
       datasource:
         master:
-          url: jdbc:mysql://120.46.37.243:3306/ludu_db?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://101.43.112.107:3306/ludu_db?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           #          url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # MySQL Connector/J 5.X 连接的示例
           #          url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例
           #          url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例

yudao-module-member/pom.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>cn.iocoder.cloud</groupId>
-        <artifactId>yudao</artifactId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <modules>
-        <module>yudao-module-member-api</module>
-        <module>yudao-module-member-biz</module>
-    </modules>
-    <artifactId>yudao-module-member</artifactId>
-    <packaging>pom</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>
-        member 模块，我们放会员业务。
-        例如说：会员中心等等
-    </description>
-
-</project>

yudao-module-member/yudao-module-member-api/pom.xml

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>cn.iocoder.cloud</groupId>
-        <artifactId>yudao-module-member</artifactId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>yudao-module-member-api</artifactId>
-    <packaging>jar</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>
-        member 模块 API，暴露给其它模块调用
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>yudao-common</artifactId>
-        </dependency>
-
-        <!-- Web 相关 -->
-        <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-ui</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- 参数校验 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- RPC 远程调用相关 -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
-
-</project>

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/config/MemberConfigApi.java

@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.module.member.api.config;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.member.api.config.dto.MemberConfigRespDTO;
-import cn.iocoder.yudao.module.member.enums.ApiConstants;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-
-@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
-@Tag(name = "RPC 服务 - 用户配置")
-public interface MemberConfigApi {
-
-    String PREFIX = ApiConstants.PREFIX + "/config";
-
-    @GetMapping(PREFIX + "/get")
-    @Operation(summary = "获得用户配置")
-    CommonResult<MemberConfigRespDTO> getConfig();
-
-}

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/config/dto/MemberConfigRespDTO.java

@@ -1,22 +0,0 @@
-package cn.iocoder.yudao.module.member.api.config.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description = "RPC 服务 - 用户信息 Response DTO")
-@Data
-public class MemberConfigRespDTO {
-
-    @Schema(description = "积分抵扣开关", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
-    private Boolean pointTradeDeductEnable;
-
-    @Schema(description = "积分抵扣，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
-    private Integer pointTradeDeductUnitPrice; // 1 积分抵扣多少分
-
-    @Schema(description = "积分抵扣最大值", requiredMode = Schema.RequiredMode.REQUIRED, example = "200")
-    private Integer pointTradeDeductMaxPrice;
-
-    @Schema(description = "1 元赠送多少分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
-    private Integer pointTradeGivePoint;
-
-}

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApi.java

@@ -1,52 +0,0 @@
-package cn.iocoder.yudao.module.member.api.level;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO;
-import cn.iocoder.yudao.module.member.enums.ApiConstants;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
-@Tag(name = "RPC 服务 - 会员等级")
-public interface MemberLevelApi {
-
-    String PREFIX = ApiConstants.PREFIX + "/level";
-
-    @GetMapping(PREFIX + "/get")
-    @Operation(summary = "获得会员等级")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    CommonResult<MemberLevelRespDTO> getMemberLevel(@RequestParam("id") Long id);
-
-    @PostMapping(PREFIX + "/add")
-    @Operation(summary = "增加会员经验")
-    @Parameters({
-            @Parameter(name = "userId", description = "会员编号", required = true, example = "1024"),
-            @Parameter(name = "experience", description = "经验值", required = true, example = "100"),
-            @Parameter(name = "bizType", description = "业务类型", required = true, example = "1"),
-            @Parameter(name = "bizId", description = "业务编号", required = true, example = "1")
-    })
-    CommonResult<Boolean> addExperience(@RequestParam("userId") Long userId,
-                                        @RequestParam("experience") Integer experience,
-                                        @RequestParam("bizType") Integer bizType,
-                                        @RequestParam("bizId") String bizId);
-
-    @PostMapping(PREFIX + "/reduce")
-    @Operation(summary = "扣减会员经验")
-    @Parameters({
-            @Parameter(name = "userId", description = "会员编号", required = true, example = "1024"),
-            @Parameter(name = "experience", description = "经验值", required = true, example = "100"),
-            @Parameter(name = "bizType", description = "业务类型", required = true, example = "1"),
-            @Parameter(name = "bizId", description = "业务编号", required = true, example = "1")
-    })
-    CommonResult<Boolean> reduceExperience(@RequestParam("userId") Long userId,
-                                           @RequestParam("experience") Integer experience,
-                                           @RequestParam("bizType") Integer bizType,
-                                           @RequestParam("bizId") String bizId);
-
-}

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/level/dto/MemberLevelRespDTO.java

@@ -1,28 +0,0 @@
-package cn.iocoder.yudao.module.member.api.level.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description = "RPC 服务 - 会员等级 Response DTO")
-@Data
-public class MemberLevelRespDTO {
-
-    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Long id;
-
-    @Schema(description = "等级名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "普通会员")
-    private String name;
-
-    @Schema(description = "等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Integer level;
-
-    @Schema(description = "升级经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
-    private Integer experience;
-
-    @Schema(description = "享受折扣", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
-    private Integer discountPercent;
-
-    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Integer status; // 参见 CommonStatusEnum 枚举
-
-}

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/package-info.java

@@ -1,4 +0,0 @@
-/**
- * member API 包，定义暴露给其它模块的 API
- */
-package cn.iocoder.yudao.module.member.api;

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/point/MemberPointApi.java

@@ -1,47 +0,0 @@
-package cn.iocoder.yudao.module.member.api.point;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.member.enums.ApiConstants;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.validation.constraints.Min;
-
-@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
-@Tag(name = "RPC 服务 - 用户积分")
-public interface MemberPointApi {
-
-    String PREFIX = ApiConstants.PREFIX + "/point";
-
-    @PostMapping(PREFIX + "/add")
-    @Operation(summary = "增加用户积分")
-    @Parameters({
-            @Parameter(name = "userId", description = "会员编号", required = true, example = "1024"),
-            @Parameter(name = "point", description = "积分", required = true, example = "100"),
-            @Parameter(name = "bizType", description = "业务类型", required = true, example = "1"),
-            @Parameter(name = "bizId", description = "业务编号", required = true, example = "1")
-    })
-    CommonResult<Boolean> addPoint(@RequestParam("userId") Long userId,
-                                   @RequestParam("point") @Min(value = 1L, message = "积分必须是正数") Integer point,
-                                   @RequestParam("bizType") Integer bizType,
-                                   @RequestParam("bizId") String bizId);
-
-    @PostMapping(PREFIX + "/reducePoint")
-    @Operation(summary = "减少用户积分")
-    @Parameters({
-            @Parameter(name = "userId", description = "会员编号", required = true, example = "1024"),
-            @Parameter(name = "point", description = "积分", required = true, example = "100"),
-            @Parameter(name = "bizType", description = "业务类型", required = true, example = "1"),
-            @Parameter(name = "bizId", description = "业务编号", required = true, example = "1")
-    })
-    CommonResult<Boolean> reducePoint(@RequestParam("userId") Long userId,
-                                      @RequestParam("point") @Min(value = 1L, message = "积分必须是正数") Integer point,
-                                      @RequestParam("bizType") Integer bizType,
-                                      @RequestParam("bizId") String bizId);
-
-}

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApi.java

@@ -1,56 +0,0 @@
-package cn.iocoder.yudao.module.member.api.user;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
-import cn.iocoder.yudao.module.member.enums.ApiConstants;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
-
-@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
-@Tag(name = "RPC 服务 - 会员用户")
-public interface MemberUserApi {
-
-    String PREFIX = ApiConstants.PREFIX + "/user";
-
-    @GetMapping(PREFIX + "/get")
-    @Operation(summary = "获得会员用户信息")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    CommonResult<MemberUserRespDTO> getUser(@RequestParam("id") Long id);
-
-    @GetMapping(PREFIX + "/list")
-    @Operation(summary = "获得会员用户信息们")
-    @Parameter(name = "ids", description = "用户编号的数组", example = "1,2", required = true)
-    CommonResult<List<MemberUserRespDTO>> getUserList(@RequestParam("ids") Collection<Long> ids);
-
-    /**
-     * 获得会员用户 Map
-     *
-     * @param ids 用户编号的数组
-     * @return 会员用户 Map
-     */
-    default Map<Long, MemberUserRespDTO> getUserMap(Collection<Long> ids) {
-        List<MemberUserRespDTO> list = getUserList(ids).getCheckedData();
-        return convertMap(list, MemberUserRespDTO::getId);
-    }
-
-    @GetMapping(PREFIX + "/list-by-nickname")
-    @Operation(summary = "基于用户昵称，模糊匹配用户列表")
-    @Parameter(name = "nickname", description = "用户昵称，模糊匹配", required = true, example = "土豆")
-    CommonResult<List<MemberUserRespDTO>> getUserListByNickname(@RequestParam("nickname") String nickname);
-
-    @GetMapping(PREFIX + "/get-by-mobile")
-    @Operation(summary = "基于手机号，精准匹配用户")
-    @Parameter(name = "mobile", description = "基于手机号，精准匹配用户", required = true, example = "1560")
-    CommonResult<MemberUserRespDTO> getUserByMobile(@RequestParam("mobile") String mobile);
-
-}

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/MemberUserRespDTO.java

@@ -1,38 +0,0 @@
-package cn.iocoder.yudao.module.member.api.user.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "RPC 服务 - 用户信息 Response DTO")
-@Data
-public class MemberUserRespDTO {
-
-    @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    private Long id;
-
-    @Schema(description = "昵称", example = "小王同学")
-    private String nickname;
-
-    @Schema(description = "帐号状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Integer status; // 参见 CommonStatusEnum 枚举
-
-    @Schema(description = "用户头像", example = "https://www.iocoder.cn/xxx.jpg")
-    private String avatar;
-
-    @Schema(description = "手机号", example = "15601691300")
-    private String mobile;
-
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    private LocalDateTime createTime;
-
-    // ========== 其它信息 ==========
-
-    @Schema(description = "会员级别编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Long levelId;
-
-    @Schema(description = "积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "886")
-    private Integer point;
-
-}

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ApiConstants.java

@@ -1,23 +0,0 @@
-package cn.iocoder.yudao.module.member.enums;
-
-import cn.iocoder.yudao.framework.common.enums.RpcConstants;
-
-/**
- * API 相关的枚举
- *
- * @author 芋道源码
- */
-public class ApiConstants {
-
-    /**
-     * 服务名
-     *
-     * 注意，需要保证和 spring.application.name 保持一致
-     */
-    public static final String NAME = "member-server";
-
-    public static final String PREFIX = RpcConstants.RPC_API_PREFIX + "/member";
-
-    public static final String VERSION = "1.0.0";
-
-}

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/DictTypeConstants.java

@@ -1,15 +0,0 @@
-package cn.iocoder.yudao.module.member.enums;
-
-/**
- * Member 字典类型的枚举类
- *
- * @author owen
- */
-public interface DictTypeConstants {
-
-    /**
-     * 会员经验记录 - 业务类型
-     */
-    String MEMBER_EXPERIENCE_BIZ_TYPE = "member_experience_biz_type";
-
-}

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java

@@ -1,65 +0,0 @@
-package cn.iocoder.yudao.module.member.enums;
-
-import cn.iocoder.yudao.framework.common.exception.ErrorCode;
-
-/**
- * Member 错误码枚举类
- * <p>
- * member 系统，使用 1-004-000-000 段
- */
-public interface ErrorCodeConstants {
-
-    // ========== 用户相关  1-004-001-000 ============
-    ErrorCode USER_NOT_EXISTS = new ErrorCode(1_004_001_000, "用户不存在");
-    ErrorCode USER_MOBILE_NOT_EXISTS = new ErrorCode(1_004_001_001, "手机号未注册用户");
-    ErrorCode USER_MOBILE_USED = new ErrorCode(1_004_001_002, "修改手机失败，该手机号({})已经被使用");
-    ErrorCode USER_POINT_NOT_ENOUGH = new ErrorCode(1_004_001_003, "用户积分余额不足");
-
-    // ========== AUTH 模块 1-004-003-000 ==========
-    ErrorCode AUTH_LOGIN_BAD_CREDENTIALS = new ErrorCode(1_004_003_000, "登录失败，账号密码不正确");
-    ErrorCode AUTH_LOGIN_USER_DISABLED = new ErrorCode(1_004_003_001, "登录失败，账号被禁用");
-    ErrorCode AUTH_SOCIAL_USER_NOT_FOUND = new ErrorCode(1_004_003_005, "登录失败，解析不到三方登录信息");
-    ErrorCode AUTH_MOBILE_USED = new ErrorCode(1_004_003_007, "手机号已经被使用");
-
-    // ========== 用户收件地址 1-004-004-000 ==========
-    ErrorCode ADDRESS_NOT_EXISTS = new ErrorCode(1_004_004_000, "用户收件地址不存在");
-
-    //========== 用户标签 1-004-006-000 ==========
-    ErrorCode TAG_NOT_EXISTS = new ErrorCode(1_004_006_000, "用户标签不存在");
-    ErrorCode TAG_NAME_EXISTS = new ErrorCode(1_004_006_001, "用户标签已经存在");
-    ErrorCode TAG_HAS_USER = new ErrorCode(1_004_006_002, "用户标签下存在用户，无法删除");
-
-    //========== 积分配置 1-004-007-000 ==========
-
-    //========== 积分记录 1-004-008-000 ==========
-    ErrorCode POINT_RECORD_BIZ_NOT_SUPPORT = new ErrorCode(1_004_008_000, "用户积分记录业务类型不支持");
-
-    //========== 签到配置 1-004-009-000 ==========
-    ErrorCode SIGN_IN_CONFIG_NOT_EXISTS = new ErrorCode(1_004_009_000, "签到天数规则不存在");
-    ErrorCode SIGN_IN_CONFIG_EXISTS = new ErrorCode(1_004_009_001, "签到天数规则已存在");
-
-    //========== 签到配置 1-004-010-000 ==========
-    ErrorCode SIGN_IN_RECORD_TODAY_EXISTS = new ErrorCode(1_004_010_000, "今日已签到，请勿重复签到");
-
-    //========== 用户等级 1-004-011-000 ==========
-    ErrorCode LEVEL_NOT_EXISTS = new ErrorCode(1_004_011_000, "用户等级不存在");
-    ErrorCode LEVEL_NAME_EXISTS = new ErrorCode(1_004_011_001, "用户等级名称[{}]已被使用");
-    ErrorCode LEVEL_VALUE_EXISTS = new ErrorCode(1_004_011_002, "用户等级值[{}]已被[{}]使用");
-    ErrorCode LEVEL_EXPERIENCE_MIN = new ErrorCode(1_004_011_003, "升级经验必须大于上一个等级[{}]设置的升级经验[{}]");
-    ErrorCode LEVEL_EXPERIENCE_MAX = new ErrorCode(1_004_011_004, "升级经验必须小于下一个等级[{}]设置的升级经验[{}]");
-    ErrorCode LEVEL_HAS_USER = new ErrorCode(1_004_011_005, "用户等级下存在用户，无法删除");
-
-    ErrorCode EXPERIENCE_BIZ_NOT_SUPPORT = new ErrorCode(1_004_011_201, "用户经验业务类型不支持");
-
-    //========== 用户分组 1-004-012-000 ==========
-    ErrorCode GROUP_NOT_EXISTS = new ErrorCode(1_004_012_000, "用户分组不存在");
-    ErrorCode GROUP_HAS_USER = new ErrorCode(1_004_012_001, "用户分组下存在用户，无法删除");
-
-    // ========== 通道信息 1_004_013_001 ==========
-    ErrorCode INFOR_NOT_EXISTS = new ErrorCode(1_004_013_001, "通道信息不存在");
-
-    // ========== 通道信息 1_004_014_001 ==========
-    ErrorCode INFORMATION_NOT_EXISTS = new ErrorCode(1_004_014_001, "通道信息不存在");
-
-
-}

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/MemberExperienceBizTypeEnum.java

@@ -1,51 +0,0 @@
-package cn.iocoder.yudao.module.member.enums;
-
-import cn.hutool.core.util.EnumUtil;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Objects;
-
-/**
- * 会员经验 - 业务类型
- *
- * @author owen
- */
-@Getter
-@AllArgsConstructor
-public enum MemberExperienceBizTypeEnum {
-
-    /**
-     * 管理员调整、邀请新用户、下单、退单、签到、抽奖
-     */
-    ADMIN(0, "管理员调整", "管理员调整获得 {} 经验", true),
-    INVITE_REGISTER(1, "邀新奖励", "邀请好友获得 {} 经验", true),
-    SIGN_IN(4, "签到奖励", "签到获得 {} 经验", true),
-    LOTTERY(5, "抽奖奖励", "抽奖获得 {} 经验", true),
-    ORDER_GIVE(11, "下单奖励", "下单获得 {} 经验", true),
-    ORDER_GIVE_CANCEL(12, "下单奖励（整单取消）", "取消订单获得 {} 经验", false), // ORDER_GIVE 的取消
-    ORDER_GIVE_CANCEL_ITEM(13, "下单奖励（单个退款）", "退款订单获得 {} 经验", false), // ORDER_GIVE 的取消
-    ;
-
-    /**
-     * 业务类型
-     */
-    private final int type;
-    /**
-     * 标题
-     */
-    private final String title;
-    /**
-     * 描述
-     */
-    private final String description;
-    /**
-     * 是否为扣减积分
-     */
-    private final boolean add;
-
-    public static MemberExperienceBizTypeEnum getByType(Integer type) {
-        return EnumUtil.getBy(MemberExperienceBizTypeEnum.class,
-                e -> Objects.equals(type, e.getType()));
-    }
-}

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/point/MemberPointBizTypeEnum.java

@@ -1,58 +0,0 @@
-package cn.iocoder.yudao.module.member.enums.point;
-
-import cn.hutool.core.util.EnumUtil;
-import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Objects;
-
-/**
- * 会员积分的业务类型枚举
- *
- * @author 芋道源码
- */
-@AllArgsConstructor
-@Getter
-public enum MemberPointBizTypeEnum implements IntArrayValuable {
-
-    SIGN(1, "签到", "签到获得 {} 积分", true),
-    ADMIN(2, "管理员修改", "管理员修改 {} 积分", true),
-
-    ORDER_USE(11, "订单积分抵扣", "下单使用 {} 积分", false), // 下单时，扣减积分
-    ORDER_USE_CANCEL(12, "订单积分抵扣（整单取消）", "订单取消，退还 {} 积分", true), // ORDER_USE 的取消
-    ORDER_USE_CANCEL_ITEM(13, "订单积分抵扣（单个退款）", "订单退款，退还 {} 积分", true), // ORDER_USE 的取消
-
-    ORDER_GIVE(21, "订单积分奖励", "下单获得 {} 积分", true), // 支付订单时，赠送积分
-    ORDER_GIVE_CANCEL(22, "订单积分奖励（整单取消）", "订单取消，退还 {} 积分", false), // ORDER_GIVE 的取消
-    ORDER_GIVE_CANCEL_ITEM(23, "订单积分奖励（单个退款）", "订单退款，扣除赠送的 {} 积分", false) // ORDER_GIVE 的取消
-    ;
-
-    /**
-     * 类型
-     */
-    private final Integer type;
-    /**
-     * 名字
-     */
-    private final String name;
-    /**
-     * 描述
-     */
-    private final String description;
-    /**
-     * 是否为扣减积分
-     */
-    private final boolean add;
-
-    @Override
-    public int[] array() {
-        return new int[0];
-    }
-
-    public static MemberPointBizTypeEnum getByType(Integer type) {
-        return EnumUtil.getBy(MemberPointBizTypeEnum.class,
-                e -> Objects.equals(type, e.getType()));
-    }
-
-}

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/message/package-info.java

@@ -1,4 +0,0 @@
-/**
- * 消息队列的消息
- */
-package cn.iocoder.yudao.module.member.message;

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/message/user/MemberUserCreateMessage.java

@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.module.member.message.user;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * 会员用户创建消息
- *
- * @author owen
- */
-@Data
-public class MemberUserCreateMessage {
-
-    /**
-     * 用户编号
-     */
-    @NotNull(message = "用户编号不能为空")
-    private Long userId;
-
-}

yudao-module-member/yudao-module-member-biz/Dockerfile

@@ -1,19 +0,0 @@
-## AdoptOpenJDK 停止发布 OpenJDK 二进制，而 Eclipse Temurin 是它的延伸，提供更好的稳定性
-## 感谢复旦核博士的建议！灰子哥，牛皮！
-FROM eclipse-temurin:8-jre
-
-## 创建目录，并使用它作为工作目录
-RUN mkdir -p /yudao-module-member-biz
-WORKDIR /yudao-module-member-biz
-## 将后端项目的 Jar 文件，复制到镜像中
-COPY ./target/yudao-module-member-biz.jar app.jar
-
-## 设置 TZ 时区
-## 设置 JAVA_OPTS 环境变量，可通过 docker run -e "JAVA_OPTS=" 进行覆盖
-ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms512m -Xmx512m"
-
-## 暴露后端项目的 48080 端口
-EXPOSE 48087
-
-## 启动后端项目
-CMD java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar app.jar

yudao-module-member/yudao-module-member-biz/pom.xml

@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>cn.iocoder.cloud</groupId>
-        <artifactId>yudao-module-member</artifactId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>yudao-module-member-biz</artifactId>
-    <packaging>jar</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>
-        member 模块，我们放会员业务。
-        例如说：会员中心等等
-    </description>
-
-    <dependencies>
-        <!-- Spring Cloud 基础 -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-bootstrap</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>yudao-spring-boot-starter-env</artifactId>
-        </dependency>
-
-        <!-- 依赖服务 -->
-        <dependency>
-            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>yudao-module-member-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>yudao-module-system-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>yudao-module-infra-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-
-        <!-- 业务组件 -->
-        <dependency>
-            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
-        </dependency>
-
-        <!-- Web 相关 -->
-        <dependency>
-            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>yudao-spring-boot-starter-security</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-
-        <!-- DB 相关 -->
-        <dependency>
-            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>yudao-spring-boot-starter-mybatis</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>yudao-spring-boot-starter-redis</artifactId>
-        </dependency>
-
-        <!-- RPC 远程调用相关 -->
-        <dependency>
-            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>yudao-spring-boot-starter-rpc</artifactId>
-        </dependency>
-
-        <!-- Registry 注册中心相关 -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- Config 配置中心相关 -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- 消息队列相关 -->
-        <dependency>
-            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>yudao-spring-boot-starter-mq</artifactId>
-        </dependency>
-
-        <!-- Test 测试相关 -->
-        <dependency>
-            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>yudao-spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- 工具类相关 -->
-        <dependency>
-            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>yudao-spring-boot-starter-excel</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>yudao-spring-boot-starter-biz-ip</artifactId>
-        </dependency>
-
-        <!-- 监控相关 -->
-        <dependency>
-            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>yudao-spring-boot-starter-monitor</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <!-- 设置构建的 jar 包名 -->
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <!-- 打包 -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/MemberServerApplication.java

@@ -1,30 +0,0 @@
-package cn.iocoder.yudao.module.member;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-/**
- * 项目的启动类
- *
- * 如果你碰到启动的问题，请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章
- * 如果你碰到启动的问题，请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章
- * 如果你碰到启动的问题，请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章
- *
- * @author 芋道源码
- */
-@SpringBootApplication
-public class MemberServerApplication {
-
-    public static void main(String[] args) {
-        // 如果你碰到启动的问题，请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章
-        // 如果你碰到启动的问题，请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章
-        // 如果你碰到启动的问题，请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章
-
-        SpringApplication.run(MemberServerApplication.class, args);
-
-        // 如果你碰到启动的问题，请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章
-        // 如果你碰到启动的问题，请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章
-        // 如果你碰到启动的问题，请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章
-    }
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/address/MemberAddressApiImpl.java

@@ -1,37 +0,0 @@
-package cn.iocoder.yudao.module.member.api.address;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.member.convert.address.MemberAddressApi;
-import cn.iocoder.yudao.module.member.convert.address.dto.MemberAddressRespDTO;
-import cn.iocoder.yudao.module.member.convert.address.AddressConvert;
-import cn.iocoder.yudao.module.member.service.address.AddressService;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-/**
- * 用户收件地址 API 实现类
- *
- * @author 芋道源码
- */
-@RestController // 提供 RESTful API 接口，给 Feign 调用
-@Validated
-public class MemberAddressApiImpl implements MemberAddressApi {
-
-    @Resource
-    private AddressService addressService;
-
-    @Override
-    public CommonResult<MemberAddressRespDTO> getAddress(Long id, Long userId) {
-        return success(AddressConvert.INSTANCE.convert02(addressService.getAddress(userId, id)));
-    }
-
-    @Override
-    public CommonResult<MemberAddressRespDTO> getDefaultAddress(Long userId) {
-        return success(AddressConvert.INSTANCE.convert02(addressService.getDefaultUserAddress(userId)));
-    }
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/config/MemberConfigApiImpl.java

@@ -1,31 +0,0 @@
-package cn.iocoder.yudao.module.member.api.config;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.member.api.config.dto.MemberConfigRespDTO;
-import cn.iocoder.yudao.module.member.convert.config.MemberConfigConvert;
-import cn.iocoder.yudao.module.member.service.config.MemberConfigService;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-/**
- * 用户配置 API 实现类
- *
- * @author owen
- */
-@RestController // 提供 RESTful API 接口，给 Feign 调用
-@Validated
-public class MemberConfigApiImpl implements MemberConfigApi {
-
-    @Resource
-    private MemberConfigService memberConfigService;
-
-    @Override
-    public CommonResult<MemberConfigRespDTO> getConfig() {
-        return success(MemberConfigConvert.INSTANCE.convert01(memberConfigService.getConfig()));
-    }
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApiImpl.java

@@ -1,49 +0,0 @@
-package cn.iocoder.yudao.module.member.api.level;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO;
-import cn.iocoder.yudao.module.member.convert.level.MemberLevelConvert;
-import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
-import cn.iocoder.yudao.module.member.service.level.MemberLevelService;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.EXPERIENCE_BIZ_NOT_SUPPORT;
-
-/**
- * 会员等级 API 实现类
- *
- * @author owen
- */
-@RestController // 提供 RESTful API 接口，给 Feign 调用
-@Validated
-public class MemberLevelApiImpl implements MemberLevelApi {
-
-    @Resource
-    private MemberLevelService memberLevelService;
-
-    @Override
-    public CommonResult<MemberLevelRespDTO> getMemberLevel(Long id) {
-        return success(MemberLevelConvert.INSTANCE.convert02(memberLevelService.getLevel(id)));
-    }
-
-    @Override
-    public CommonResult<Boolean> addExperience(Long userId, Integer experience, Integer bizType, String bizId) {
-        MemberExperienceBizTypeEnum bizTypeEnum = MemberExperienceBizTypeEnum.getByType(bizType);
-        if (bizTypeEnum == null) {
-            throw exception(EXPERIENCE_BIZ_NOT_SUPPORT);
-        }
-        memberLevelService.addExperience(userId, experience, bizTypeEnum, bizId);
-        return success(true);
-    }
-
-    @Override
-    public CommonResult<Boolean> reduceExperience(Long userId, Integer experience, Integer bizType, String bizId) {
-        return addExperience(userId, -experience, bizType, bizId);
-    }
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/package-info.java

@@ -1 +0,0 @@
-package cn.iocoder.yudao.module.member.api;

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/point/MemberPointApiImpl.java

@@ -1,50 +0,0 @@
-package cn.iocoder.yudao.module.member.api.point;
-
-import cn.hutool.core.lang.Assert;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.member.enums.point.MemberPointBizTypeEnum;
-import cn.iocoder.yudao.module.member.service.point.MemberPointRecordService;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.POINT_RECORD_BIZ_NOT_SUPPORT;
-
-/**
- * 用户积分的 API 实现类
- *
- * @author owen
- */
-@RestController // 提供 RESTful API 接口，给 Feign 调用
-@Validated
-public class MemberPointApiImpl implements MemberPointApi {
-
-    @Resource
-    private MemberPointRecordService memberPointRecordService;
-
-    @Override
-    public CommonResult<Boolean> addPoint(Long userId, Integer point, Integer bizType, String bizId) {
-        Assert.isTrue(point > 0);
-        MemberPointBizTypeEnum bizTypeEnum = MemberPointBizTypeEnum.getByType(bizType);
-        if (bizTypeEnum == null) {
-            throw exception(POINT_RECORD_BIZ_NOT_SUPPORT);
-        }
-        memberPointRecordService.createPointRecord(userId, point, bizTypeEnum, bizId);
-        return success(true);
-    }
-
-    @Override
-    public CommonResult<Boolean> reducePoint(Long userId, Integer point, Integer bizType, String bizId) {
-        Assert.isTrue(point > 0);
-        MemberPointBizTypeEnum bizTypeEnum = MemberPointBizTypeEnum.getByType(bizType);
-        if (bizTypeEnum == null) {
-            throw exception(POINT_RECORD_BIZ_NOT_SUPPORT);
-        }
-        memberPointRecordService.createPointRecord(userId, -point, bizTypeEnum, bizId);
-        return success(true);
-    }
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApiImpl.java

@@ -1,50 +0,0 @@
-package cn.iocoder.yudao.module.member.api.user;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
-import cn.iocoder.yudao.module.member.convert.user.MemberUserConvert;
-import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
-import cn.iocoder.yudao.module.member.service.user.MemberUserService;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.Collection;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-/**
- * 会员用户的 API 实现类
- *
- * @author 芋道源码
- */
-@RestController // 提供 RESTful API 接口，给 Feign 调用
-@Validated
-public class MemberUserApiImpl implements MemberUserApi {
-
-    @Resource
-    private MemberUserService userService;
-
-    @Override
-    public CommonResult<MemberUserRespDTO> getUser(Long id) {
-        MemberUserDO user = userService.getUser(id);
-        return success(MemberUserConvert.INSTANCE.convert2(user));
-    }
-
-    @Override
-    public CommonResult<List<MemberUserRespDTO>> getUserList(Collection<Long> ids) {
-        return success(MemberUserConvert.INSTANCE.convertList2(userService.getUserList(ids)));
-    }
-
-    @Override
-    public CommonResult<List<MemberUserRespDTO>> getUserListByNickname(String nickname) {
-        return success(MemberUserConvert.INSTANCE.convertList2(userService.getUserListByNickname(nickname)));
-    }
-
-    @Override
-    public CommonResult<MemberUserRespDTO> getUserByMobile(String mobile) {
-        return success(MemberUserConvert.INSTANCE.convert2(userService.getUserByMobile(mobile)));
-    }
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/AddressController.java

@@ -1,41 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.address;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressRespVO;
-import cn.iocoder.yudao.module.member.convert.address.AddressConvert;
-import cn.iocoder.yudao.module.member.dal.dataobject.address.MemberAddressDO;
-import cn.iocoder.yudao.module.member.service.address.AddressService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 用户收件地址")
-@RestController
-@RequestMapping("/member/address")
-@Validated
-public class AddressController {
-
-    @Resource
-    private AddressService addressService;
-
-    @GetMapping("/list")
-    @Operation(summary = "获得用户收件地址列表")
-    @Parameter(name = "userId", description = "用户编号", required = true)
-    @PreAuthorize("@ss.hasPermission('member:user:query')")
-    public CommonResult<List<AddressRespVO>> getAddressList(@RequestParam("userId") Long userId) {
-        List<MemberAddressDO> list = addressService.getAddressList(userId);
-        return success(AddressConvert.INSTANCE.convertList2(list));
-    }
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/package-info.java

@@ -1 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.address;

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/vo/AddressBaseVO.java

@@ -1,35 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.address.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * 用户收件地址 Base VO，提供给添加、修改、详细的子 VO 使用
- * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
- */
-@Data
-public class AddressBaseVO {
-
-    @Schema(description = "收件人名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
-    @NotNull(message = "收件人名称不能为空")
-    private String name;
-
-    @Schema(description = "手机号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "手机号不能为空")
-    private String mobile;
-
-    @Schema(description = "地区编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "15716")
-    @NotNull(message = "地区编码不能为空")
-    private Long areaId;
-
-    @Schema(description = "收件详细地址", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "收件详细地址不能为空")
-    private String detailAddress;
-
-    @Schema(description = "是否默认", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotNull(message = "是否默认不能为空")
-    private Boolean defaultStatus;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/vo/AddressRespVO.java

@@ -1,19 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.address.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 用户收件地址 Response VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class AddressRespVO extends AddressBaseVO {
-
-    @Schema(description = "收件地址编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "7380")
-    private Long id;
-
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    private LocalDateTime createTime;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/config/MemberConfigController.java

@@ -1,45 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.config;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.member.controller.admin.config.vo.MemberConfigRespVO;
-import cn.iocoder.yudao.module.member.controller.admin.config.vo.MemberConfigSaveReqVO;
-import cn.iocoder.yudao.module.member.convert.config.MemberConfigConvert;
-import cn.iocoder.yudao.module.member.dal.dataobject.config.MemberConfigDO;
-import cn.iocoder.yudao.module.member.service.config.MemberConfigService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 会员设置")
-@RestController
-@RequestMapping("/member/config")
-@Validated
-public class MemberConfigController {
-
-    @Resource
-    private MemberConfigService memberConfigService;
-
-    @PutMapping("/save")
-    @Operation(summary = "保存会员配置")
-    @PreAuthorize("@ss.hasPermission('member:config:save')")
-    public CommonResult<Boolean> saveConfig(@Valid @RequestBody MemberConfigSaveReqVO saveReqVO) {
-        memberConfigService.saveConfig(saveReqVO);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得会员配置")
-    @PreAuthorize("@ss.hasPermission('member:config:query')")
-    public CommonResult<MemberConfigRespVO> getConfig() {
-        MemberConfigDO config = memberConfigService.getConfig();
-        return success(MemberConfigConvert.INSTANCE.convert(config));
-    }
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/config/vo/MemberConfigBaseVO.java

@@ -1,31 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.config.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * 会员配置 Base VO，提供给添加、修改、详细的子 VO 使用
- * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
- */
-@Data
-public class MemberConfigBaseVO {
-
-    @Schema(description = "积分抵扣开关", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
-    @NotNull(message = "积分抵扣开发不能为空")
-    private Boolean pointTradeDeductEnable;
-
-    @Schema(description = "积分抵扣，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "13506")
-    @NotNull(message = "积分抵扣不能为空")
-    private Integer pointTradeDeductUnitPrice;
-
-    @Schema(description = "积分抵扣最大值", requiredMode = Schema.RequiredMode.REQUIRED, example = "32428")
-    @NotNull(message = "积分抵扣最大值不能为空")
-    private Integer pointTradeDeductMaxPrice;
-
-    @Schema(description = "1 元赠送多少分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
-    @NotNull(message = "1 元赠送积分不能为空")
-    private Integer pointTradeGivePoint;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/config/vo/MemberConfigRespVO.java

@@ -1,17 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.config.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "管理后台 - 会员配置 Response VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MemberConfigRespVO extends MemberConfigBaseVO {
-
-    @Schema(description = "自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    private Long id;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/config/vo/MemberConfigSaveReqVO.java

@@ -1,13 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.config.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "管理后台 - 会员配置保存 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MemberConfigSaveReqVO extends MemberConfigBaseVO {
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/MemberGroupController.java

@@ -1,81 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.group;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.member.controller.admin.group.vo.*;
-import cn.iocoder.yudao.module.member.convert.group.MemberGroupConvert;
-import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
-import cn.iocoder.yudao.module.member.service.group.MemberGroupService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-
-@Tag(name = "管理后台 - 用户分组")
-@RestController
-@RequestMapping("/member/group")
-@Validated
-public class MemberGroupController {
-
-    @Resource
-    private MemberGroupService groupService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建用户分组")
-    @PreAuthorize("@ss.hasPermission('member:group:create')")
-    public CommonResult<Long> createGroup(@Valid @RequestBody MemberGroupCreateReqVO createReqVO) {
-        return success(groupService.createGroup(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新用户分组")
-    @PreAuthorize("@ss.hasPermission('member:group:update')")
-    public CommonResult<Boolean> updateGroup(@Valid @RequestBody MemberGroupUpdateReqVO updateReqVO) {
-        groupService.updateGroup(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除用户分组")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('member:group:delete')")
-    public CommonResult<Boolean> deleteGroup(@RequestParam("id") Long id) {
-        groupService.deleteGroup(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得用户分组")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('member:group:query')")
-    public CommonResult<MemberGroupRespVO> getGroup(@RequestParam("id") Long id) {
-        MemberGroupDO group = groupService.getGroup(id);
-        return success(MemberGroupConvert.INSTANCE.convert(group));
-    }
-
-    @GetMapping("/list-all-simple")
-    @Operation(summary = "获取会员分组精简信息列表", description = "只包含被开启的会员分组，主要用于前端的下拉选项")
-    public CommonResult<List<MemberGroupSimpleRespVO>> getSimpleGroupList() {
-        // 获用户列表，只要开启状态的
-        List<MemberGroupDO> list = groupService.getEnableGroupList();
-        return success(MemberGroupConvert.INSTANCE.convertSimpleList(list));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得用户分组分页")
-    @PreAuthorize("@ss.hasPermission('member:group:query')")
-    public CommonResult<PageResult<MemberGroupRespVO>> getGroupPage(@Valid MemberGroupPageReqVO pageVO) {
-        PageResult<MemberGroupDO> pageResult = groupService.getGroupPage(pageVO);
-        return success(MemberGroupConvert.INSTANCE.convertPage(pageResult));
-    }
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupBaseVO.java

@@ -1,29 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.group.vo;
-
-import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
-import cn.iocoder.yudao.framework.common.validation.InEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * 用户分组 Base VO，提供给添加、修改、详细的子 VO 使用
- * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
- */
-@Data
-public class MemberGroupBaseVO {
-
-    @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "购物达人")
-    @NotNull(message = "名称不能为空")
-    private String name;
-
-    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
-    private String remark;
-
-    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "状态不能为空")
-    @InEnum(CommonStatusEnum.class)
-    private Integer status;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupCreateReqVO.java

@@ -1,14 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.group.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "管理后台 - 用户分组创建 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MemberGroupCreateReqVO extends MemberGroupBaseVO {
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupPageReqVO.java

@@ -1,30 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.group.vo;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.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 MemberGroupPageReqVO extends PageParam {
-
-    @Schema(description = "名称", example = "购物达人")
-    private String name;
-
-    @Schema(description = "状态", example = "1")
-    private Integer status;
-
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupRespVO.java

@@ -1,22 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.group.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 用户分组 Response VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MemberGroupRespVO extends MemberGroupBaseVO {
-
-    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20357")
-    private Long id;
-
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    private LocalDateTime createTime;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupSimpleRespVO.java

@@ -1,18 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.group.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.ToString;
-
-@Schema(description = "管理后台 - 用户分组 Response VO")
-@Data
-@ToString(callSuper = true)
-public class MemberGroupSimpleRespVO {
-
-    @Schema(description = "编号", example = "6103")
-    private Long id;
-
-    @Schema(description = "等级名称", example = "芋艿")
-    private String name;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupUpdateReqVO.java

@@ -1,20 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.group.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import javax.validation.constraints.NotNull;
-
-@Schema(description = "管理后台 - 用户分组更新 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MemberGroupUpdateReqVO extends MemberGroupBaseVO {
-
-    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20357")
-    @NotNull(message = "编号不能为空")
-    private Long id;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberExperienceRecordController.java

@@ -1,52 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.level;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceRecordPageReqVO;
-import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceRecordRespVO;
-import cn.iocoder.yudao.module.member.convert.level.MemberExperienceRecordConvert;
-import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceRecordDO;
-import cn.iocoder.yudao.module.member.service.level.MemberExperienceRecordService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 会员经验记录")
-@RestController
-@RequestMapping("/member/experience-record")
-@Validated
-public class MemberExperienceRecordController {
-
-    @Resource
-    private MemberExperienceRecordService experienceLogService;
-
-    @GetMapping("/get")
-    @Operation(summary = "获得会员经验记录")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('member:experience-record:query')")
-    public CommonResult<MemberExperienceRecordRespVO> getExperienceRecord(@RequestParam("id") Long id) {
-        MemberExperienceRecordDO experienceLog = experienceLogService.getExperienceRecord(id);
-        return success(MemberExperienceRecordConvert.INSTANCE.convert(experienceLog));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得会员经验记录分页")
-    @PreAuthorize("@ss.hasPermission('member:experience-record:query')")
-    public CommonResult<PageResult<MemberExperienceRecordRespVO>> getExperienceRecordPage(
-            @Valid MemberExperienceRecordPageReqVO pageVO) {
-        PageResult<MemberExperienceRecordDO> pageResult = experienceLogService.getExperienceRecordPage(pageVO);
-        return success(MemberExperienceRecordConvert.INSTANCE.convertPage(pageResult));
-    }
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelController.java

@@ -1,80 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.level;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.*;
-import cn.iocoder.yudao.module.member.convert.level.MemberLevelConvert;
-import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
-import cn.iocoder.yudao.module.member.service.level.MemberLevelService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 会员等级")
-@RestController
-@RequestMapping("/member/level")
-@Validated
-public class MemberLevelController {
-
-    @Resource
-    private MemberLevelService levelService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建会员等级")
-    @PreAuthorize("@ss.hasPermission('member:level:create')")
-    public CommonResult<Long> createLevel(@Valid @RequestBody MemberLevelCreateReqVO createReqVO) {
-        return success(levelService.createLevel(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新会员等级")
-    @PreAuthorize("@ss.hasPermission('member:level:update')")
-    public CommonResult<Boolean> updateLevel(@Valid @RequestBody MemberLevelUpdateReqVO updateReqVO) {
-        levelService.updateLevel(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除会员等级")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('member:level:delete')")
-    public CommonResult<Boolean> deleteLevel(@RequestParam("id") Long id) {
-        levelService.deleteLevel(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得会员等级")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('member:level:query')")
-    public CommonResult<MemberLevelRespVO> getLevel(@RequestParam("id") Long id) {
-        MemberLevelDO level = levelService.getLevel(id);
-        return success(MemberLevelConvert.INSTANCE.convert(level));
-    }
-
-    @GetMapping("/list-all-simple")
-    @Operation(summary = "获取会员等级精简信息列表", description = "只包含被开启的会员等级，主要用于前端的下拉选项")
-    public CommonResult<List<MemberLevelSimpleRespVO>> getSimpleLevelList() {
-        // 获用户列表，只要开启状态的
-        List<MemberLevelDO> list = levelService.getEnableLevelList();
-        // 排序后，返回给前端
-        return success(MemberLevelConvert.INSTANCE.convertSimpleList(list));
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "获得会员等级列表")
-    @PreAuthorize("@ss.hasPermission('member:level:query')")
-    public CommonResult<List<MemberLevelRespVO>> getLevelList(@Valid MemberLevelListReqVO listReqVO) {
-        List<MemberLevelDO> result = levelService.getLevelList(listReqVO);
-        return success(MemberLevelConvert.INSTANCE.convertList(result));
-    }
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelRecordController.java

@@ -1,52 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.level;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.member.controller.admin.level.vo.record.MemberLevelRecordPageReqVO;
-import cn.iocoder.yudao.module.member.controller.admin.level.vo.record.MemberLevelRecordRespVO;
-import cn.iocoder.yudao.module.member.convert.level.MemberLevelRecordConvert;
-import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelRecordDO;
-import cn.iocoder.yudao.module.member.service.level.MemberLevelRecordService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 会员等级记录")
-@RestController
-@RequestMapping("/member/level-record")
-@Validated
-public class MemberLevelRecordController {
-
-    @Resource
-    private MemberLevelRecordService levelLogService;
-
-    @GetMapping("/get")
-    @Operation(summary = "获得会员等级记录")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('member:level-record:query')")
-    public CommonResult<MemberLevelRecordRespVO> getLevelRecord(@RequestParam("id") Long id) {
-        MemberLevelRecordDO levelLog = levelLogService.getLevelRecord(id);
-        return success(MemberLevelRecordConvert.INSTANCE.convert(levelLog));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得会员等级记录分页")
-    @PreAuthorize("@ss.hasPermission('member:level-record:query')")
-    public CommonResult<PageResult<MemberLevelRecordRespVO>> getLevelRecordPage(
-            @Valid MemberLevelRecordPageReqVO pageVO) {
-        PageResult<MemberLevelRecordDO> pageResult = levelLogService.getLevelRecordPage(pageVO);
-        return success(MemberLevelRecordConvert.INSTANCE.convertPage(pageResult));
-    }
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceRecordBaseVO.java

@@ -1,43 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.level.vo.experience;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * 会员经验记录 Base VO，提供给添加、修改、详细的子 VO 使用
- * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
- */
-@Data
-public class MemberExperienceRecordBaseVO {
-
-    @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "3638")
-    @NotNull(message = "用户编号不能为空")
-    private Long userId;
-
-    @Schema(description = "业务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "12164")
-    @NotNull(message = "业务编号不能为空")
-    private String bizId;
-
-    @Schema(description = "业务类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "业务类型不能为空")
-    private Integer bizType;
-
-    @Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "增加经验")
-    @NotNull(message = "标题不能为空")
-    private String title;
-
-    @Schema(description = "经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
-    @NotNull(message = "经验不能为空")
-    private Integer experience;
-
-    @Schema(description = "变更后的经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "200")
-    @NotNull(message = "变更后的经验不能为空")
-    private Integer totalExperience;
-
-    @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "下单增加 100 经验")
-    @NotNull(message = "描述不能为空")
-    private String description;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceRecordPageReqVO.java

@@ -1,36 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.level.vo.experience;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.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 MemberExperienceRecordPageReqVO extends PageParam {
-
-    @Schema(description = "用户编号", example = "3638")
-    private Long userId;
-
-    @Schema(description = "业务编号", example = "12164")
-    private String bizId;
-
-    @Schema(description = "业务类型", example = "1")
-    private Integer bizType;
-
-    @Schema(description = "标题", example = "增加经验")
-    private String title;
-
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceRecordRespVO.java

@@ -1,22 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.level.vo.experience;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 会员经验记录 Response VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MemberExperienceRecordRespVO extends MemberExperienceRecordBaseVO {
-
-    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "19610")
-    private Long id;
-
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    private LocalDateTime createTime;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelBaseVO.java

@@ -1,53 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
-
-import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
-import cn.iocoder.yudao.framework.common.validation.InEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.hibernate.validator.constraints.Range;
-import org.hibernate.validator.constraints.URL;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Positive;
-
-/**
- * 会员等级 Base VO，提供给添加、修改、详细的子 VO 使用
- * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
- */
-@Data
-public class MemberLevelBaseVO {
-
-    @Schema(description = "等级名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
-    @NotBlank(message = "等级名称不能为空")
-    private String name;
-
-    @Schema(description = "升级经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
-    @NotNull(message = "升级经验不能为空")
-    @Positive(message = "升级经验必须大于 0")
-    private Integer experience;
-
-    @Schema(description = "等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "等级不能为空")
-    @Positive(message = "等级必须大于 0")
-    private Integer level;
-
-    @Schema(description = "享受折扣", requiredMode = Schema.RequiredMode.REQUIRED, example = "98")
-    @NotNull(message = "享受折扣不能为空")
-    @Range(min = 0, max = 100, message = "享受折扣的范围为 0-100")
-    private Integer discountPercent;
-
-    @Schema(description = "等级图标", example = "https://www.iocoder.cn/yudao.jpg")
-    @URL(message = "等级图标必须是 URL 格式")
-    private String icon;
-
-    @Schema(description = "等级背景图", example = "https://www.iocoder.cn/yudao.jpg")
-    @URL(message = "等级背景图必须是 URL 格式")
-    private String backgroundUrl;
-
-    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "状态不能为空")
-    @InEnum(CommonStatusEnum.class)
-    private Integer status;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelCreateReqVO.java

@@ -1,14 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "管理后台 - 会员等级创建 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MemberLevelCreateReqVO extends MemberLevelBaseVO {
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelListReqVO.java

@@ -1,18 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.ToString;
-
-@Schema(description = "管理后台 - 会员等级列表筛选 Request VO")
-@Data
-@ToString(callSuper = true)
-public class MemberLevelListReqVO {
-
-    @Schema(description = "等级名称", example = "芋艿")
-    private String name;
-
-    @Schema(description = "状态", example = "1")
-    private Integer status;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelRespVO.java

@@ -1,22 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 会员等级 Response VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MemberLevelRespVO extends MemberLevelBaseVO {
-
-    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "6103")
-    private Long id;
-
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    private LocalDateTime createTime;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelSimpleRespVO.java

@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.ToString;
-
-@Schema(description = "管理后台 - 会员等级 Response VO")
-@Data
-@ToString(callSuper = true)
-public class MemberLevelSimpleRespVO {
-
-    @Schema(description = "编号", example = "6103")
-    private Long id;
-
-    @Schema(description = "等级名称", example = "芋艿")
-    private String name;
-
-    @Schema(description = "等级图标", example = "https://www.iocoder.cn/yudao.jpg")
-    private String icon;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelUpdateReqVO.java

@@ -1,20 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import javax.validation.constraints.NotNull;
-
-@Schema(description = "管理后台 - 会员等级更新 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MemberLevelUpdateReqVO extends MemberLevelBaseVO {
-
-    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "6103")
-    @NotNull(message = "编号不能为空")
-    private Long id;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/record/MemberLevelRecordBaseVO.java

@@ -1,47 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.level.vo.record;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * 会员等级记录 Base VO，提供给添加、修改、详细的子 VO 使用
- * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
- */
-@Data
-public class MemberLevelRecordBaseVO {
-
-    @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "25923")
-    @NotNull(message = "用户编号不能为空")
-    private Long userId;
-
-    @Schema(description = "等级编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "25985")
-    @NotNull(message = "等级编号不能为空")
-    private Long levelId;
-
-    @Schema(description = "会员等级", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "会员等级不能为空")
-    private Integer level;
-
-    @Schema(description = "享受折扣", requiredMode = Schema.RequiredMode.REQUIRED, example = "13319")
-    @NotNull(message = "享受折扣不能为空")
-    private Integer discountPercent;
-
-    @Schema(description = "升级经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "13319")
-    @NotNull(message = "升级经验不能为空")
-    private Integer experience;
-
-    @Schema(description = "会员此时的经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "13319")
-    @NotNull(message = "会员此时的经验不能为空")
-    private Integer userExperience;
-
-    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "推广需要")
-    @NotNull(message = "备注不能为空")
-    private String remark;
-
-    @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "升级为金牌会员")
-    @NotNull(message = "描述不能为空")
-    private String description;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/record/MemberLevelRecordPageReqVO.java

@@ -1,30 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.level.vo.record;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.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 MemberLevelRecordPageReqVO extends PageParam {
-
-    @Schema(description = "用户编号", example = "25923")
-    private Long userId;
-
-    @Schema(description = "等级编号", example = "25985")
-    private Long levelId;
-
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/record/MemberLevelRecordRespVO.java

@@ -1,22 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.level.vo.record;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 会员等级记录 Response VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MemberLevelRecordRespVO extends MemberLevelRecordBaseVO {
-
-    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "8741")
-    private Long id;
-
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    private LocalDateTime createTime;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/MemberPointRecordController.java

@@ -1,56 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.point;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.member.controller.admin.point.vo.recrod.MemberPointRecordPageReqVO;
-import cn.iocoder.yudao.module.member.controller.admin.point.vo.recrod.MemberPointRecordRespVO;
-import cn.iocoder.yudao.module.member.convert.point.MemberPointRecordConvert;
-import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointRecordDO;
-import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
-import cn.iocoder.yudao.module.member.service.point.MemberPointRecordService;
-import cn.iocoder.yudao.module.member.service.user.MemberUserService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.CollectionUtils;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
-
-@Tag(name = "管理后台 - 签到记录")
-@RestController
-@RequestMapping("/member/point/record")
-@Validated
-public class MemberPointRecordController {
-
-    @Resource
-    private MemberPointRecordService pointRecordService;
-
-    @Resource
-    private MemberUserService memberUserService;
-
-    @GetMapping("/page")
-    @Operation(summary = "获得用户积分记录分页")
-    @PreAuthorize("@ss.hasPermission('point:record:query')")
-    public CommonResult<PageResult<MemberPointRecordRespVO>> getPointRecordPage(@Valid MemberPointRecordPageReqVO pageVO) {
-        // 执行分页查询
-        PageResult<MemberPointRecordDO> pageResult = pointRecordService.getPointRecordPage(pageVO);
-        if (CollectionUtils.isEmpty(pageResult.getList())) {
-            return success(PageResult.empty(pageResult.getTotal()));
-        }
-
-        // 拼接结果返回
-        List<MemberUserDO> users = memberUserService.getUserList(
-                convertSet(pageResult.getList(), MemberPointRecordDO::getUserId));
-        return success(MemberPointRecordConvert.INSTANCE.convertPage(pageResult, users));
-    }
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/vo/recrod/MemberPointRecordPageReqVO.java

@@ -1,27 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.point.vo.recrod;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "管理后台 - 用户积分记录分页 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MemberPointRecordPageReqVO extends PageParam {
-
-    @Schema(description = "用户昵称", example = "张三")
-    private String nickname;
-
-    @Schema(description = "用户编号", example = "123")
-    private Long userId;
-
-    @Schema(description = "业务类型", example = "1")
-    private Integer bizType;
-
-    @Schema(description = "积分标题", example = "呵呵")
-    private String title;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/vo/recrod/MemberPointRecordRespVO.java

@@ -1,42 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.point.vo.recrod;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 用户积分记录 Response VO")
-@Data
-public class MemberPointRecordRespVO {
-
-    @Schema(description = "自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "31457")
-    private Long id;
-
-    @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    private Long userId;
-
-    @Schema(description = "昵称", example = "张三")
-    private String nickname;
-
-    @Schema(description = "业务编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "22706")
-    private String bizId;
-
-    @Schema(description = "业务类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Integer bizType;
-
-    @Schema(description = "积分标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
-    private String title;
-
-    @Schema(description = "积分描述", example = "你猜")
-    private String description;
-
-    @Schema(description = "积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
-    private Integer point;
-
-    @Schema(description = "变动后的积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "200")
-    private Integer totalPoint;
-
-    @Schema(description = "发生时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    private LocalDateTime createTime;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/MemberSignInConfigController.java

@@ -1,74 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.signin;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.member.controller.admin.signin.vo.config.MemberSignInConfigCreateReqVO;
-import cn.iocoder.yudao.module.member.controller.admin.signin.vo.config.MemberSignInConfigRespVO;
-import cn.iocoder.yudao.module.member.controller.admin.signin.vo.config.MemberSignInConfigUpdateReqVO;
-import cn.iocoder.yudao.module.member.convert.signin.MemberSignInConfigConvert;
-import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInConfigDO;
-import cn.iocoder.yudao.module.member.service.signin.MemberSignInConfigService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-// TODO 芋艿：url
-@Tag(name = "管理后台 - 签到规则")
-@RestController
-@RequestMapping("/member/sign-in/config")
-@Validated
-public class MemberSignInConfigController {
-
-    @Resource
-    private MemberSignInConfigService signInConfigService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建签到规则")
-    @PreAuthorize("@ss.hasPermission('point:sign-in-config:create')")
-    public CommonResult<Long> createSignInConfig(@Valid @RequestBody MemberSignInConfigCreateReqVO createReqVO) {
-        return success(signInConfigService.createSignInConfig(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新签到规则")
-    @PreAuthorize("@ss.hasPermission('point:sign-in-config:update')")
-    public CommonResult<Boolean> updateSignInConfig(@Valid @RequestBody MemberSignInConfigUpdateReqVO updateReqVO) {
-        signInConfigService.updateSignInConfig(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除签到规则")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('point:sign-in-config:delete')")
-    public CommonResult<Boolean> deleteSignInConfig(@RequestParam("id") Long id) {
-        signInConfigService.deleteSignInConfig(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得签到规则")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('point:sign-in-config:query')")
-    public CommonResult<MemberSignInConfigRespVO> getSignInConfig(@RequestParam("id") Long id) {
-        MemberSignInConfigDO signInConfig = signInConfigService.getSignInConfig(id);
-        return success(MemberSignInConfigConvert.INSTANCE.convert(signInConfig));
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "获得签到规则列表")
-    @PreAuthorize("@ss.hasPermission('point:sign-in-config:query')")
-    public CommonResult<List<MemberSignInConfigRespVO>> getSignInConfigList() {
-        List<MemberSignInConfigDO> list = signInConfigService.getSignInConfigList();
-        return success(MemberSignInConfigConvert.INSTANCE.convertList(list));
-    }
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/MemberSignInRecordController.java

@@ -1,55 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.signin;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO;
-import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordRespVO;
-import cn.iocoder.yudao.module.member.convert.signin.MemberSignInRecordConvert;
-import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
-import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
-import cn.iocoder.yudao.module.member.service.signin.MemberSignInRecordService;
-import cn.iocoder.yudao.module.member.service.user.MemberUserService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.CollectionUtils;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
-
-@Tag(name = "管理后台 - 签到记录")
-@RestController
-@RequestMapping("/member/sign-in/record")
-@Validated
-public class MemberSignInRecordController {
-
-    @Resource
-    private MemberSignInRecordService signInRecordService;
-
-    @Resource
-    private MemberUserService memberUserService;
-
-    @GetMapping("/page")
-    @Operation(summary = "获得签到记录分页")
-    @PreAuthorize("@ss.hasPermission('point:sign-in-record:query')")
-    public CommonResult<PageResult<MemberSignInRecordRespVO>> getSignInRecordPage(@Valid MemberSignInRecordPageReqVO pageVO) {
-        // 执行分页查询
-        PageResult<MemberSignInRecordDO> pageResult = signInRecordService.getSignInRecordPage(pageVO);
-        if (CollectionUtils.isEmpty(pageResult.getList())) {
-            return success(PageResult.empty(pageResult.getTotal()));
-        }
-
-        // 拼接结果返回
-        List<MemberUserDO> users = memberUserService.getUserList(
-                convertSet(pageResult.getList(), MemberSignInRecordDO::getUserId));
-        return success(MemberSignInRecordConvert.INSTANCE.convertPage(pageResult, users));
-    }
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/vo/config/MemberSignInConfigBaseVO.java

@@ -1,45 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.signin.vo.config;
-
-import cn.hutool.core.util.ObjUtil;
-import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
-import cn.iocoder.yudao.framework.common.validation.InEnum;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.PositiveOrZero;
-
-/**
- * 签到规则 Base VO，提供给添加、修改、详细的子 VO 使用
- * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
- */
-@Data
-public class MemberSignInConfigBaseVO {
-
-    @Schema(description = "签到第 x 天", requiredMode = Schema.RequiredMode.REQUIRED, example = "7")
-    @NotNull(message = "签到天数不能为空")
-    private Integer day;
-
-    @Schema(description = "奖励积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
-    @NotNull(message = "奖励积分不能为空")
-    @PositiveOrZero(message = "奖励积分不能小于 0")
-    private Integer point;
-
-    @Schema(description = "奖励经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
-    @NotNull(message = "奖励经验不能为空")
-    @PositiveOrZero(message = "奖励经验不能小于 0")
-    private Integer experience;
-
-    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "状态不能为空")
-    @InEnum(CommonStatusEnum.class)
-    private Integer status;
-
-    @AssertTrue(message = "签到奖励积分和经验不能同时为空")
-    @JsonIgnore
-    public boolean isConfigAward() {
-        return ObjUtil.notEqual(point, 0) || ObjUtil.notEqual(experience, 0);
-    }
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/vo/config/MemberSignInConfigCreateReqVO.java

@@ -1,12 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.signin.vo.config;
-
-import lombok.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-@Schema(description = "管理后台 - 签到规则创建 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MemberSignInConfigCreateReqVO extends MemberSignInConfigBaseVO {
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/vo/config/MemberSignInConfigRespVO.java

@@ -1,19 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.signin.vo.config;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 签到规则 Response VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MemberSignInConfigRespVO extends MemberSignInConfigBaseVO {
-
-    @Schema(description = "自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "20937")
-    private Integer id;
-
-    @Schema(description = "创建时间")
-    private LocalDateTime createTime;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/vo/config/MemberSignInConfigUpdateReqVO.java

@@ -1,18 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.signin.vo.config;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import javax.validation.constraints.*;
-
-@Schema(description = "管理后台 - 签到规则更新 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MemberSignInConfigUpdateReqVO extends MemberSignInConfigBaseVO {
-
-    @Schema(description = "规则自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "13653")
-    @NotNull(message = "规则自增主键不能为空")
-    private Long id;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/vo/record/MemberSignInRecordPageReqVO.java

@@ -1,33 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.signin.vo.record;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.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 MemberSignInRecordPageReqVO extends PageParam {
-
-    @Schema(description = "签到用户", example = "土豆")
-    private String nickname;
-
-    @Schema(description = "第几天签到", example = "10")
-    private Integer day;
-
-    @Schema(description = "用户编号", example = "123")
-    private Long userId;
-
-    @Schema(description = "签到时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/vo/record/MemberSignInRecordRespVO.java

@@ -1,30 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.signin.vo.record;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 签到记录 Response VO")
-@Data
-public class MemberSignInRecordRespVO {
-
-    @Schema(description = "签到自增 id", requiredMode = Schema.RequiredMode.REQUIRED, example = "11903")
-    private Long id;
-
-    @Schema(description = "签到用户", requiredMode = Schema.RequiredMode.REQUIRED, example = "6507")
-    private Long userId;
-
-    @Schema(description = "昵称", example = "张三")
-    private String nickname;
-
-    @Schema(description = "第几天签到", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Integer day;
-
-    @Schema(description = "签到的积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
-    private Integer point;
-
-    @Schema(description = "签到时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    private LocalDateTime createTime;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/tag/MemberTagController.java

@@ -1,94 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.tag;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.member.controller.admin.tag.vo.MemberTagCreateReqVO;
-import cn.iocoder.yudao.module.member.controller.admin.tag.vo.MemberTagPageReqVO;
-import cn.iocoder.yudao.module.member.controller.admin.tag.vo.MemberTagRespVO;
-import cn.iocoder.yudao.module.member.controller.admin.tag.vo.MemberTagUpdateReqVO;
-import cn.iocoder.yudao.module.member.convert.tag.MemberTagConvert;
-import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO;
-import cn.iocoder.yudao.module.member.service.tag.MemberTagService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Collection;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 会员标签")
-@RestController
-@RequestMapping("/member/tag")
-@Validated
-public class MemberTagController {
-
-    @Resource
-    private MemberTagService tagService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建会员标签")
-    @PreAuthorize("@ss.hasPermission('member:tag:create')")
-    public CommonResult<Long> createTag(@Valid @RequestBody MemberTagCreateReqVO createReqVO) {
-        return success(tagService.createTag(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新会员标签")
-    @PreAuthorize("@ss.hasPermission('member:tag:update')")
-    public CommonResult<Boolean> updateTag(@Valid @RequestBody MemberTagUpdateReqVO updateReqVO) {
-        tagService.updateTag(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除会员标签")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('member:tag:delete')")
-    public CommonResult<Boolean> deleteTag(@RequestParam("id") Long id) {
-        tagService.deleteTag(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得会员标签")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('member:tag:query')")
-    public CommonResult<MemberTagRespVO> getMemberTag(@RequestParam("id") Long id) {
-        MemberTagDO tag = tagService.getTag(id);
-        return success(MemberTagConvert.INSTANCE.convert(tag));
-    }
-
-    @GetMapping("/list-all-simple")
-    @Operation(summary = "获取会员标签精简信息列表", description = "只包含被开启的会员标签，主要用于前端的下拉选项")
-    public CommonResult<List<MemberTagRespVO>> getSimpleTagList() {
-        // 获用户列表，只要开启状态的
-        List<MemberTagDO> list = tagService.getTagList();
-        // 排序后，返回给前端
-        return success(MemberTagConvert.INSTANCE.convertList(list));
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "获得会员标签列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('member:tag:query')")
-    public CommonResult<List<MemberTagRespVO>> getMemberTagList(@RequestParam("ids") Collection<Long> ids) {
-        List<MemberTagDO> list = tagService.getTagList(ids);
-        return success(MemberTagConvert.INSTANCE.convertList(list));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得会员标签分页")
-    @PreAuthorize("@ss.hasPermission('member:tag:query')")
-    public CommonResult<PageResult<MemberTagRespVO>> getTagPage(@Valid MemberTagPageReqVO pageVO) {
-        PageResult<MemberTagDO> pageResult = tagService.getTagPage(pageVO);
-        return success(MemberTagConvert.INSTANCE.convertPage(pageResult));
-    }
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/tag/vo/MemberTagBaseVO.java

@@ -1,19 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.tag.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * 会员标签 Base VO，提供给添加、修改、详细的子 VO 使用
- * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
- */
-@Data
-public class MemberTagBaseVO {
-
-    @Schema(description = "标签名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
-    @NotNull(message = "标签名称不能为空")
-    private String name;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/tag/vo/MemberTagCreateReqVO.java

@@ -1,14 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.tag.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "管理后台 - 会员标签创建 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MemberTagCreateReqVO extends MemberTagBaseVO {
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/tag/vo/MemberTagPageReqVO.java

@@ -1,27 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.tag.vo;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.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 MemberTagPageReqVO extends PageParam {
-
-    @Schema(description = "标签名称", example = "李四")
-    private String name;
-
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/tag/vo/MemberTagRespVO.java

@@ -1,22 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.tag.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 会员标签 Response VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MemberTagRespVO extends MemberTagBaseVO {
-
-    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "907")
-    private Long id;
-
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    private LocalDateTime createTime;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/tag/vo/MemberTagUpdateReqVO.java

@@ -1,20 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.tag.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import javax.validation.constraints.NotNull;
-
-@Schema(description = "管理后台 - 会员标签更新 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MemberTagUpdateReqVO extends MemberTagBaseVO {
-
-    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "907")
-    @NotNull(message = "编号不能为空")
-    private Long id;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java

@@ -1,121 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.user;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.member.controller.admin.user.vo.*;
-import cn.iocoder.yudao.module.member.convert.user.MemberUserConvert;
-import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
-import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
-import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO;
-import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
-import cn.iocoder.yudao.module.member.enums.point.MemberPointBizTypeEnum;
-import cn.iocoder.yudao.module.member.service.group.MemberGroupService;
-import cn.iocoder.yudao.module.member.service.level.MemberLevelService;
-import cn.iocoder.yudao.module.member.service.point.MemberPointRecordService;
-import cn.iocoder.yudao.module.member.service.tag.MemberTagService;
-import cn.iocoder.yudao.module.member.service.user.MemberUserService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
-import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
-
-@Tag(name = "管理后台 - 会员用户")
-@RestController
-@RequestMapping("/member/user")
-@Validated
-public class MemberUserController {
-
-    @Resource
-    private MemberUserService memberUserService;
-    @Resource
-    private MemberTagService memberTagService;
-    @Resource
-    private MemberLevelService memberLevelService;
-    @Resource
-    private MemberGroupService memberGroupService;
-    @Resource
-    private MemberPointRecordService memberPointRecordService;
-
-    @PutMapping("/update")
-    @Operation(summary = "更新会员用户")
-    @PreAuthorize("@ss.hasPermission('member:user:update')")
-    public CommonResult<Boolean> updateUser(@Valid @RequestBody MemberUserUpdateReqVO updateReqVO) {
-        memberUserService.updateUser(updateReqVO);
-        return success(true);
-    }
-
-    @PutMapping("/update-level")
-    @Operation(summary = "更新会员用户等级")
-    @PreAuthorize("@ss.hasPermission('member:user:update-level')")
-    public CommonResult<Boolean> updateUserLevel(@Valid @RequestBody MemberUserUpdateLevelReqVO updateReqVO) {
-        memberLevelService.updateUserLevel(updateReqVO);
-        return success(true);
-    }
-
-    @PutMapping("/update-point")
-    @Operation(summary = "更新会员用户积分")
-    @PreAuthorize("@ss.hasPermission('member:user:update-point')")
-    public CommonResult<Boolean> updateUserPoint(@Valid @RequestBody MemberUserUpdatePointReqVO updateReqVO) {
-        memberPointRecordService.createPointRecord(updateReqVO.getId(), updateReqVO.getPoint(),
-                MemberPointBizTypeEnum.ADMIN, String.valueOf(getLoginUserId()));
-        return success(true);
-    }
-
-    @PutMapping("/update-balance")
-    @Operation(summary = "更新会员用户余额")
-    @PreAuthorize("@ss.hasPermission('member:user:update-balance')")
-    public CommonResult<Boolean> updateUserBalance(@Valid @RequestBody Long id) {
-        // todo @jason：增加一个【修改余额】
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得会员用户")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('member:user:query')")
-    public CommonResult<MemberUserRespVO> getUser(@RequestParam("id") Long id) {
-        MemberUserDO user = memberUserService.getUser(id);
-        return success(MemberUserConvert.INSTANCE.convert03(user));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得会员用户分页")
-    @PreAuthorize("@ss.hasPermission('member:user:query')")
-    public CommonResult<PageResult<MemberUserRespVO>> getUserPage(@Valid MemberUserPageReqVO pageVO) {
-        PageResult<MemberUserDO> pageResult = memberUserService.getUserPage(pageVO);
-        if (CollUtil.isEmpty(pageResult.getList())) {
-            return success(PageResult.empty());
-        }
-
-        // 处理用户标签返显
-        Set<Long> tagIds = pageResult.getList().stream()
-                .map(MemberUserDO::getTagIds)
-                .filter(Objects::nonNull)
-                .flatMap(Collection::stream)
-                .collect(Collectors.toSet());
-        List<MemberTagDO> tags = memberTagService.getTagList(tagIds);
-        // 处理用户级别返显
-        List<MemberLevelDO> levels = memberLevelService.getLevelList(
-                convertSet(pageResult.getList(), MemberUserDO::getLevelId));
-        // 处理用户分组返显
-        List<MemberGroupDO> groups = memberGroupService.getGroupList(
-                convertSet(pageResult.getList(), MemberUserDO::getGroupId));
-        return success(MemberUserConvert.INSTANCE.convertPage(pageResult, tags, levels, groups));
-    }
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserBaseVO.java

@@ -1,65 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.user.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.hibernate.validator.constraints.URL;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
-
-/**
- * 会员用户 Base VO，提供给添加、修改、详细的子 VO 使用
- * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
- */
-@Data
-public class MemberUserBaseVO {
-
-    @Schema(description = "手机号", requiredMode = Schema.RequiredMode.REQUIRED, example = "15601691300")
-    @NotNull(message = "手机号不能为空")
-    private String mobile;
-
-    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotNull(message = "状态不能为空")
-    private Byte status;
-
-    @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
-    @NotNull(message = "用户昵称不能为空")
-    private String nickname;
-
-    @Schema(description = "头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/x.png")
-    @URL(message = "头像必须是 URL 格式")
-    private String avatar;
-
-    @Schema(description = "用户昵称", example = "李四")
-    private String name;
-
-    @Schema(description = "用户性别", example = "1")
-    private Integer sex;
-
-    @Schema(description = "所在地编号", example = "4371")
-    private Long areaId;
-
-    @Schema(description = "所在地全程", example = "上海上海市普陀区")
-    private String areaName;
-
-    @Schema(description = "出生日期", example = "2023-03-12")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDateTime birthday;
-
-    @Schema(description = "会员备注", example = "我是小备注")
-    private String mark;
-
-    @Schema(description = "会员标签", example = "[1, 2]")
-    private List<Long> tagIds;
-
-    @Schema(description = "会员等级编号", example = "1")
-    private Long levelId;
-
-    @Schema(description = "用户分组编号", example = "1")
-    private Long groupId;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserPageReqVO.java

@@ -1,48 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.user.vo;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-import static cn.iocoder.yudao.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 MemberUserPageReqVO extends PageParam {
-
-    @Schema(description = "手机号", example = "15601691300")
-    private String mobile;
-
-    @Schema(description = "用户昵称", example = "李四")
-    private String nickname;
-
-    @Schema(description = "最后登录时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] loginDate;
-
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
-    @Schema(description = "会员标签编号列表", example = "[1, 2]")
-    private List<Long> tagIds;
-
-    @Schema(description = "会员等级编号", example = "1")
-    private Long levelId;
-
-    @Schema(description = "用户分组编号", example = "1")
-    private Long groupId;
-
-    // TODO 芋艿：注册用户类型；
-
-    // TODO 芋艿：登录用户类型；
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserRespVO.java

@@ -1,52 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.user.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Schema(description = "管理后台 - 会员用户 Response VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MemberUserRespVO extends MemberUserBaseVO {
-
-    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "23788")
-    private Long id;
-
-    @Schema(description = "注册 IP", requiredMode = Schema.RequiredMode.REQUIRED, example = "127.0.0.1")
-    private String registerIp;
-
-    @Schema(description = "最后登录IP", requiredMode = Schema.RequiredMode.REQUIRED, example = "127.0.0.1")
-    private String loginIp;
-
-    @Schema(description = "最后登录时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    private LocalDateTime loginDate;
-
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    private LocalDateTime createTime;
-
-    // ========== 其它信息 ==========
-
-    @Schema(description = "积分", requiredMode  = Schema.RequiredMode.REQUIRED, example = "100")
-    private Integer point;
-
-    @Schema(description = "总积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "2000")
-    private Integer totalPoint;
-
-    @Schema(description = "会员标签", example = "[红色, 快乐]")
-    private List<String> tagNames;
-
-    @Schema(description = "会员等级", example = "黄金会员")
-    private String levelName;
-
-    @Schema(description = "用户分组", example = "购物达人")
-    private String groupName;
-
-    @Schema(description = "用户经验值", requiredMode  = Schema.RequiredMode.REQUIRED, example = "200")
-    private Integer experience;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserUpdateLevelReqVO.java

@@ -1,29 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.user.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.ToString;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-@Schema(description = "管理后台 - 用户修改等级 Request VO")
-@Data
-@ToString(callSuper = true)
-public class MemberUserUpdateLevelReqVO {
-
-    @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "23788")
-    @NotNull(message = "用户编号不能为空")
-    private Long id;
-
-    /**
-     * 取消用户等级时，值为空
-     */
-    @Schema(description = "用户等级编号", example = "1")
-    private Long levelId;
-
-    @Schema(description = "修改原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "推广需要")
-    @NotBlank(message = "修改原因不能为空")
-    private String reason;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserUpdatePointReqVO.java

@@ -1,22 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.user.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.ToString;
-
-import javax.validation.constraints.NotNull;
-
-@Schema(description = "管理后台 - 用户修改积分 Request VO")
-@Data
-@ToString(callSuper = true)
-public class MemberUserUpdatePointReqVO {
-
-    @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "23788")
-    @NotNull(message = "用户编号不能为空")
-    private Long id;
-
-    @Schema(description = "变动积分，正数为增加，负数为减少", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
-    @NotNull(message = "变动积分不能为空")
-    private Integer point;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserUpdateReqVO.java

@@ -1,20 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.user.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import javax.validation.constraints.NotNull;
-
-@Schema(description = "管理后台 - 会员用户更新 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MemberUserUpdateReqVO extends MemberUserBaseVO {
-
-    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "23788")
-    @NotNull(message = "编号不能为空")
-    private Long id;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/AppAddressController.http

@@ -1,54 +0,0 @@
-### 请求 /create 接口 => 成功
-POST {{appApi}}//member/address/create
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-Authorization: Bearer {{appToken}}
-
-{
-  "name": "yunai",
-  "mobile": "15601691300",
-  "areaId": "610632",
-  "postCode": "200000",
-  "detailAddress": "芋道源码 233 号 666 室",
-  "defaulted": true
-}
-
-### 请求 /update 接口 => 成功
-PUT {{appApi}}//member/address/update
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-Authorization: Bearer {{appToken}}
-
-{
-  "id": "1",
-  "name": "yunai888",
-  "mobile": "15601691300",
-  "areaId": "610632",
-  "postCode": "200000",
-  "detailAddress": "芋道源码 233 号 666 室",
-  "defaulted": false
-}
-
-### 请求 /delete 接口 => 成功
-DELETE {{appApi}}//member/address/delete?id=2
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-Authorization: Bearer {{appToken}}
-
-### 请求 /get 接口 => 成功
-GET {{appApi}}//member/address/get?id=1
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-Authorization: Bearer {{appToken}}
-
-### 请求 /get-default 接口 => 成功
-GET {{appApi}}//member/address/get-default
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-Authorization: Bearer {{appToken}}
-
-### 请求 /list 接口 => 成功
-GET {{appApi}}//member/address/list
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-Authorization: Bearer {{appToken}}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/AppAddressController.java

@@ -1,82 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.app.address;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
-import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreateReqVO;
-import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressRespVO;
-import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO;
-import cn.iocoder.yudao.module.member.convert.address.AddressConvert;
-import cn.iocoder.yudao.module.member.dal.dataobject.address.MemberAddressDO;
-import cn.iocoder.yudao.module.member.service.address.AddressService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "用户 APP - 用户收件地址")
-@RestController
-@RequestMapping("/member/address")
-@Validated
-public class AppAddressController {
-
-    @Resource
-    private AddressService addressService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建用户收件地址")
-    @PreAuthenticated
-    public CommonResult<Long> createAddress(@Valid @RequestBody AppAddressCreateReqVO createReqVO) {
-        return success(addressService.createAddress(getLoginUserId(), createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新用户收件地址")
-    @PreAuthenticated
-    public CommonResult<Boolean> updateAddress(@Valid @RequestBody AppAddressUpdateReqVO updateReqVO) {
-        addressService.updateAddress(getLoginUserId(), updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除用户收件地址")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthenticated
-    public CommonResult<Boolean> deleteAddress(@RequestParam("id") Long id) {
-        addressService.deleteAddress(getLoginUserId(), id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得用户收件地址")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthenticated
-    public CommonResult<AppAddressRespVO> getAddress(@RequestParam("id") Long id) {
-        MemberAddressDO address = addressService.getAddress(getLoginUserId(), id);
-        return success(AddressConvert.INSTANCE.convert(address));
-    }
-
-    @GetMapping("/get-default")
-    @Operation(summary = "获得默认的用户收件地址")
-    @PreAuthenticated
-    public CommonResult<AppAddressRespVO> getDefaultUserAddress() {
-        MemberAddressDO address = addressService.getDefaultUserAddress(getLoginUserId());
-        return success(AddressConvert.INSTANCE.convert(address));
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "获得用户收件地址列表")
-    @PreAuthenticated
-    public CommonResult<List<AppAddressRespVO>> getAddressList() {
-        List<MemberAddressDO> list = addressService.getAddressList(getLoginUserId());
-        return success(AddressConvert.INSTANCE.convertList(list));
-    }
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java

@@ -1,35 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.app.address.vo;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-// TODO 芋艿：example 缺失
-/**
-* 用户收件地址 Base VO，提供给添加、修改、详细的子 VO 使用
-* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
-*/
-@Data
-public class AppAddressBaseVO {
-
-    @Schema(description = "收件人名称", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "收件人名称不能为空")
-    private String name;
-
-    @Schema(description = "手机号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "手机号不能为空")
-    private String mobile;
-
-    @Schema(description = "地区编号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "地区编号不能为空")
-    private Long areaId;
-
-    @Schema(description = "收件详细地址", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "收件详细地址不能为空")
-    private String detailAddress;
-
-    @Schema(description = "是否默认地址", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "是否默认地址不能为空")
-    private Boolean defaultStatus;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressCreateReqVO.java

@@ -1,11 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.app.address.vo;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-@Schema(description = "用户 APP - 用户收件地址创建 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class AppAddressCreateReqVO extends AppAddressBaseVO {
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressRespVO.java

@@ -1,20 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.app.address.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "用户 APP - 用户收件地址 Response VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class AppAddressRespVO extends AppAddressBaseVO {
-
-    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    private Long id;
-
-    @Schema(description = "地区名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "上海上海市普陀区")
-    private String areaName;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressUpdateReqVO.java

@@ -1,16 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.app.address.vo;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import javax.validation.constraints.*;
-
-@Schema(description = "用户 APP - 用户收件地址更新 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class AppAddressUpdateReqVO extends AppAddressBaseVO {
-
-    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    @NotNull(message = "编号不能为空")
-    private Long id;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/AppAuthController.http

@@ -1,67 +0,0 @@
-### 请求 /login 接口 => 成功
-POST {{appApi}}/member/auth/login
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-
-{
-  "mobile": "15601691388",
-  "password": "admin123"
-}
-
-### 请求 /send-sms-code 接口 => 成功
-POST {{appApi}}/member/auth/send-sms-code
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-
-{
-  "mobile": "15601691388",
-  "scene": 1
-}
-
-### 请求 /sms-login 接口 => 成功
-POST {{appApi}}/member/auth/sms-login
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-terminal: 30
-
-{
-  "mobile": "15601691388",
-  "code": 9999
-}
-
-### 请求 /social-login 接口 => 成功
-POST {{appApi}}/member/auth/social-login
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-
-{
-  "type": 34,
-  "code": "0e1oc9000CTjFQ1oim200bhtb61oc90g",
-  "state": "default"
-}
-
-### 请求 /weixin-mini-app-login 接口 => 成功
-POST {{appApi}}/member/auth/weixin-mini-app-login
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-
-{
-  "phoneCode": "618e6412e0c728f5b8fc7164497463d0158a923c9e7fd86af8bba393b9decbc5",
-  "loginCode": "001frTkl21JUf94VGxol2hSlff1frTkR"
-}
-
-### 请求 /logout 接口 => 成功
-POST {{appApi}}/member/auth/logout
-Content-Type: application/json
-Authorization: Bearer c1b76bdaf2c146c581caa4d7fd81ee66
-tenant-id: {{appTenentId}}
-
-### 请求 /auth/refresh-token 接口 => 成功
-POST {{appApi}}/member/auth/refresh-token?refreshToken=bc43d929094849a28b3a69f6e6940d70
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-
-### 请求 /auth/create-weixin-jsapi-signature 接口 => 成功
-POST {{appApi}}/member/auth/create-weixin-jsapi-signature?url=http://www.iocoder.cn
-Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/AppAuthController.java

@@ -1,126 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.app.auth;
-
-import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.security.config.SecurityProperties;
-import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
-import cn.iocoder.yudao.module.member.controller.app.auth.vo.*;
-import cn.iocoder.yudao.module.member.convert.auth.AuthConvert;
-import cn.iocoder.yudao.module.member.service.auth.MemberAuthService;
-import cn.iocoder.yudao.module.system.api.social.SocialClientApi;
-import cn.iocoder.yudao.module.system.api.social.dto.SocialWxJsapiSignatureRespDTO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.annotation.security.PermitAll;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "用户 APP - 认证")
-@RestController
-@RequestMapping("/member/auth")
-@Validated
-@Slf4j
-public class AppAuthController {
-
-    @Resource
-    private MemberAuthService authService;
-
-    @Resource
-    private SocialClientApi socialClientApi;
-
-    @Resource
-    private SecurityProperties securityProperties;
-
-    @PostMapping("/login")
-    @Operation(summary = "使用手机 + 密码登录")
-    public CommonResult<AppAuthLoginRespVO> login(@RequestBody @Valid AppAuthLoginReqVO reqVO) {
-        return success(authService.login(reqVO));
-    }
-
-    @PostMapping("/logout")
-    @PermitAll
-    @Operation(summary = "登出系统")
-    public CommonResult<Boolean> logout(HttpServletRequest request) {
-        String token = SecurityFrameworkUtils.obtainAuthorization(request,
-                securityProperties.getTokenHeader(), securityProperties.getTokenParameter());
-        if (StrUtil.isNotBlank(token)) {
-            authService.logout(token);
-        }
-        return success(true);
-    }
-
-    @PostMapping("/refresh-token")
-    @Operation(summary = "刷新令牌")
-    @Parameter(name = "refreshToken", description = "刷新令牌", required = true)
-    public CommonResult<AppAuthLoginRespVO> refreshToken(@RequestParam("refreshToken") String refreshToken) {
-        return success(authService.refreshToken(refreshToken));
-    }
-
-    // ========== 短信登录相关 ==========
-
-    @PostMapping("/sms-login")
-    @Operation(summary = "使用手机 + 验证码登录")
-    public CommonResult<AppAuthLoginRespVO> smsLogin(@RequestBody @Valid AppAuthSmsLoginReqVO reqVO) {
-        return success(authService.smsLogin(reqVO));
-    }
-
-    @PostMapping("/send-sms-code")
-    @Operation(summary = "发送手机验证码")
-    public CommonResult<Boolean> sendSmsCode(@RequestBody @Valid AppAuthSmsSendReqVO reqVO) {
-        authService.sendSmsCode(getLoginUserId(), reqVO);
-        return success(true);
-    }
-
-    @PostMapping("/validate-sms-code")
-    @Operation(summary = "校验手机验证码")
-    public CommonResult<Boolean> validateSmsCode(@RequestBody @Valid AppAuthSmsValidateReqVO reqVO) {
-        authService.validateSmsCode(getLoginUserId(), reqVO);
-        return success(true);
-    }
-
-    // ========== 社交登录相关 ==========
-
-    @GetMapping("/social-auth-redirect")
-    @Operation(summary = "社交授权的跳转")
-    @Parameters({
-            @Parameter(name = "type", description = "社交类型", required = true),
-            @Parameter(name = "redirectUri", description = "回调路径")
-    })
-    public CommonResult<String> socialAuthRedirect(@RequestParam("type") Integer type,
-                                                   @RequestParam("redirectUri") String redirectUri) {
-        return CommonResult.success(authService.getSocialAuthorizeUrl(type, redirectUri));
-    }
-
-    @PostMapping("/social-login")
-    @Operation(summary = "社交快捷登录，使用 code 授权码", description = "适合未登录的用户，但是社交账号已绑定用户")
-    public CommonResult<AppAuthLoginRespVO> socialLogin(@RequestBody @Valid AppAuthSocialLoginReqVO reqVO) {
-        return success(authService.socialLogin(reqVO));
-    }
-
-    @PostMapping("/weixin-mini-app-login")
-    @Operation(summary = "微信小程序的一键登录")
-    public CommonResult<AppAuthLoginRespVO> weixinMiniAppLogin(@RequestBody @Valid AppAuthWeixinMiniAppLoginReqVO reqVO) {
-        return success(authService.weixinMiniAppLogin(reqVO));
-    }
-
-    @PostMapping("/create-weixin-jsapi-signature")
-    @Operation(summary = "创建微信 JS SDK 初始化所需的签名",
-            description = "参考 https://developers.weixin.qq.com/doc/offiaccount/OA_Web_Apps/JS-SDK.html 文档")
-    public CommonResult<SocialWxJsapiSignatureRespDTO> createWeixinMpJsapiSignature(@RequestParam("url") String url) {
-        SocialWxJsapiSignatureRespDTO signature = socialClientApi.createWxMpJsapiSignature(
-                UserTypeEnum.MEMBER.getValue(), url).getCheckedData();
-        return success(AuthConvert.INSTANCE.convert(signature));
-    }
-
-}