From 3660c62eca4ec4bf3fda22607abdf6d702f06abd Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Tue, 08 Jul 2025 16:34:33 +0800
Subject: [PATCH] 新增主键替代复合主键
---
oying-system/src/main/resources/mapper/system/UserStoreMapper.xml | 9 ++--
/dev/null | 52 --------------------------
oying-system/src/main/java/com/oying/modules/system/domain/UserStore.java | 7 +++
oying-system/src/main/java/com/oying/modules/system/domain/UserMerchant.java | 9 +++-
oying-system/src/main/resources/mapper/system/UserMerchantMapper.xml | 9 ++--
5 files changed, 24 insertions(+), 62 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/system/domain/UserMerchant.java b/oying-system/src/main/java/com/oying/modules/system/domain/UserMerchant.java
index 2baefe2..7f5605f 100644
--- a/oying-system/src/main/java/com/oying/modules/system/domain/UserMerchant.java
+++ b/oying-system/src/main/java/com/oying/modules/system/domain/UserMerchant.java
@@ -1,10 +1,12 @@
package com.oying.modules.system.domain;
import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.oying.base.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,11 +23,14 @@
@TableName("sys_user_merchant")
public class UserMerchant extends BaseEntity implements Serializable {
- @TableId(value = "merchant_id")
+ @NotNull(groups = Update.class)
+ @TableId(value = "manager_id", type = IdType.AUTO)
+ @ApiModelProperty(value = "ID", hidden = true)
+ private Long managerId;
+
@ApiModelProperty(value = "商户id")
private Long merchantId;
- @TableId(value = "user_id")
@ApiModelProperty(value = "用户id")
private Long userId;
diff --git a/oying-system/src/main/java/com/oying/modules/system/domain/UserStore.java b/oying-system/src/main/java/com/oying/modules/system/domain/UserStore.java
index d7d1af7..c90c772 100644
--- a/oying-system/src/main/java/com/oying/modules/system/domain/UserStore.java
+++ b/oying-system/src/main/java/com/oying/modules/system/domain/UserStore.java
@@ -1,10 +1,12 @@
package com.oying.modules.system.domain;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.oying.base.BaseEntity;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +23,11 @@
@TableName("sys_user_store")
public class UserStore extends BaseEntity implements Serializable {
+ @NotNull(groups = Update.class)
+ @TableId(value = "manager_id", type = IdType.AUTO)
+ @ApiModelProperty(value = "ID", hidden = true)
+ private Long managerId;
+
@TableId(value = "store_id")
@ApiModelProperty(value = "门店id")
private Long storeId;
diff --git a/oying-system/src/main/resources/mapper/system/UserMerchantMapper.xml b/oying-system/src/main/resources/mapper/system/UserMerchantMapper.xml
index b820327..30bd758 100644
--- a/oying-system/src/main/resources/mapper/system/UserMerchantMapper.xml
+++ b/oying-system/src/main/resources/mapper/system/UserMerchantMapper.xml
@@ -2,8 +2,9 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.oying.modules.system.mapper.UserMerchantMapper">
<resultMap id="BaseResultMap" type="com.oying.modules.system.domain.UserMerchant">
- <id column="merchant_id" property="merchantId"/>
- <id column="user_id" property="userId"/>
+ <id column="manager_id" property="managerId"/>
+ <result column="merchant_id" property="merchantId"/>
+ <result column="user_id" property="userId"/>
<result column="role_type" property="roleType"/>
<result column="permissions" property="permissions"/>
<result column="create_by" property="createBy"/>
@@ -13,7 +14,7 @@
</resultMap>
<sql id="Base_Column_List">
- merchant_id, user_id, role_type, permissions, create_by, create_time, update_by, update_time
+ manager_id, merchant_id, user_id, role_type, permissions, create_by, create_time, update_by, update_time
</sql>
<select id="findAll" resultMap="BaseResultMap">
@@ -33,4 +34,4 @@
</where>
order by user_id desc
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/oying-system/src/main/resources/mapper/system/UserStoreMapper.xml b/oying-system/src/main/resources/mapper/system/UserStoreMapper.xml
index 7e80085..2e07ad2 100644
--- a/oying-system/src/main/resources/mapper/system/UserStoreMapper.xml
+++ b/oying-system/src/main/resources/mapper/system/UserStoreMapper.xml
@@ -2,8 +2,9 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.oying.modules.system.mapper.UserStoreMapper">
<resultMap id="BaseResultMap" type="com.oying.modules.system.domain.UserStore">
- <id column="store_id" property="storeId"/>
- <id column="user_id" property="userId"/>
+ <id column="manager_id" property="managerId"/>
+ <result column="store_id" property="storeId"/>
+ <result column="user_id" property="userId"/>
<result column="role_type" property="roleType"/>
<result column="permissions" property="permissions"/>
<result column="create_by" property="createBy"/>
@@ -13,7 +14,7 @@
</resultMap>
<sql id="Base_Column_List">
- store_id, user_id, role_type, permissions, create_by, create_time, update_by, update_time
+ manager_id, store_id, user_id, role_type, permissions, create_by, create_time, update_by, update_time
</sql>
<select id="findAll" resultMap="BaseResultMap">
@@ -33,4 +34,4 @@
</where>
order by user_id desc
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/oying-tools/src/main/java/com/oying/domain/enums/PayStatusEnum.java b/oying-tools/src/main/java/com/oying/domain/enums/PayStatusEnum.java
deleted file mode 100644
index 93be469..0000000
--- a/oying-tools/src/main/java/com/oying/domain/enums/PayStatusEnum.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.oying.domain.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 支付状态
- * @author Z
- * @date 2018/08/01 16:45:43
- */
-@Getter
-@AllArgsConstructor
-public enum PayStatusEnum {
-
- SUCCESS("SUCCESS", "支付成功"),
-
- REFUND("REFUND", "转入退款"),
-
- NOTPAY("NOTPAY", "未支付"),
-
- CLOSED("CLOSED", "已关闭"),
-
- REVOKED("REVOKED", "已撤销"),
-
- USERPAYING("USERPAYING", "用户支付中"),
-
- PAYERROR("PAYERROR", "支付失败"),
-
- UNKNOWN("UNKNOWN", "未知枚举");
-
- private final String key;
-
- private final String value;
-
- public static PayStatusEnum find(String val) {
- for (PayStatusEnum value : PayStatusEnum.values()) {
- if (val.equals(value.getKey())) {
- return value;
- }
- }
- return UNKNOWN;
- }
-
- public static String getValue(String val) {
- for (PayStatusEnum value : PayStatusEnum.values()) {
- if (val.equals(value.getKey())) {
- return value.getValue();
- }
- }
- return UNKNOWN.getValue();
- }
-}
--
Gitblit v1.9.3