新增主键替代复合主键

xin

2025-07-08 3660c62eca4ec4bf3fda22607abdf6d702f06abd

新增主键替代复合主键

 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;


 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;

 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">

 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">

 oying-tools/src/main/java/com/oying/domain/enums/PayStatusEnum.java

File was deleted