店铺签约

cash-common/cash-common-service/src/main/java/com/czg/account/dto/register/MerchantRegisterDTO.java

@@ -1,16 +0,0 @@
-package com.czg.account.dto.register;
-
-import jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotNull;
-
-public record MerchantRegisterDTO(
-        @NotNull(message = "激活时长不能为空")
-        @Min(1)
-        Integer periodMonth,
-        @NotNull(message = "数量不为空")
-        @Min(1)
-        @Max(10)
-        Integer num
-) {
-}

cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoAddDTO.java

@@ -4,6 +4,8 @@ import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @author Administrator
  */
@@ -20,8 +22,14 @@ public class ShopInfoAddDTO {
     private String frontImg;
     @NotEmpty(message = "试用/正式不为空")
     private String profiles;
-//    @NotEmpty(message = "激活码不为空")
-    private String activateCode;
+    /**
+     * 激活时长
+     */
+    private Integer activateDuration;
+    /**
+     * 激活费用
+     */
+    private BigDecimal activateAmount;
     @NotEmpty(message = "登录账号不为空")
     private String accountName;
     @NotEmpty(message = "登录密码不为空")

cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoEditDTO.java

@@ -249,9 +249,13 @@ public class ShopInfoEditDTO {
     private String taxAmount;
 
     /**
-     * 店铺激活码
+     * 激活时长
      */
-    private String activateCode;
+    private Integer activateDuration;
+    /**
+     * 激活费用
+     */
+    private BigDecimal activateAmount;
     /**
      * 是否为主店 1-是 0-否
      */

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopRegister.java

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
- * 激活码 实体类。
+ * 店铺签约 实体类。
  *
  * @author Administrator
  * @since 2025-02-11
@@ -23,8 +23,8 @@ import java.time.LocalDateTime;
 
 @NoArgsConstructor
 @AllArgsConstructor
-@Table("tb_merchant_register")
-public class MerchantRegister implements Serializable {
+@Table("tb_shop_register")
+public class ShopRegister implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -32,18 +32,13 @@ public class MerchantRegister implements Serializable {
     @Id(keyType = KeyType.Auto)
     private Integer id;
 
-    /**
-     * 激活码
-     */
-    private String registerCode;
-
     /**
      * 店铺id
      */
     private Long shopId;
 
     /**
-     * 激活码金额
+     * 店铺签约金额
      */
     private BigDecimal amount;
 
@@ -52,11 +47,6 @@ public class MerchantRegister implements Serializable {
      */
     private Integer periodMonth;
 
-    /**
-     * 状态0未使用1已使用
-     */
-    private Integer status;
-
     /**
      * 创建时间
      */

cash-common/cash-common-service/src/main/java/com/czg/account/service/MerchantRegisterService.java

@@ -1,20 +0,0 @@
-package com.czg.account.service;
-
-import com.czg.account.dto.PageDTO;
-import com.czg.account.dto.register.MerchantRegisterDTO;
-import com.czg.account.entity.MerchantRegister;
-import com.mybatisflex.core.paginate.Page;
-import com.mybatisflex.core.service.IService;
-
-/**
- * 激活码 服务层。
- *
- * @author Administrator
- * @since 2025-02-11
- */
-public interface MerchantRegisterService extends IService<MerchantRegister> {
-
-    Page<MerchantRegister> get(PageDTO pageDTO, Integer state, String startTime, String endTime);
-
-    Boolean add(MerchantRegisterDTO merchantRegisterDTO);
-}

cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopRegisterService.java

@@ -0,0 +1,14 @@
+package com.czg.account.service;
+
+import com.czg.account.entity.ShopRegister;
+import com.mybatisflex.core.service.IService;
+
+/**
+ * 店铺签约 服务层。
+ *
+ * @author Administrator
+ * @since 2025-02-11
+ */
+public interface ShopRegisterService extends IService<ShopRegister> {
+
+}

cash-common/cash-common-service/src/main/java/com/czg/account/vo/ShopRegisterVO.java

@@ -1,6 +1,6 @@
 package com.czg.account.vo;
 
-import com.czg.account.entity.MerchantRegister;
+import com.czg.account.entity.ShopRegister;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class MerchantRegisterVO extends MerchantRegister {
+public class ShopRegisterVO extends ShopRegister {
     private String shopName;
     private String phone;
     private String registerType;