From 5c708751297d9027077953a6c6ea98e2bc1ef00a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Fri, 20 Sep 2024 13:49:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B09.20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../integral/entity/IntegralDetail.java       |  3 ++-
 .../entity/MtUserExpressAddress.java          |  5 +++++
 .../mapper/xml/MtUserExpressAddressMapper.xml | 19 +++++++++++--------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralDetail.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralDetail.java
index 8cac7ff34..8e7c7c5b1 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralDetail.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralDetail.java
@@ -3,6 +3,7 @@ package com.fuint.business.integral.entity;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fuint.repository.model.base.BaseEntity;
@@ -19,7 +20,7 @@ public class IntegralDetail extends BaseEntity implements Serializable {
     /**
      * 积分明细ID
      */
-    @TableId(value = "id" )
+    @TableId(type = IdType.AUTO)
     private Integer id;
     /**
      * 用户ID，表示积分变动的用户
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/MtUserExpressAddress.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/MtUserExpressAddress.java
index 11cd1298f..9f791f481 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/MtUserExpressAddress.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/MtUserExpressAddress.java
@@ -43,5 +43,10 @@ public class MtUserExpressAddress extends BaseEntity {
      */
     private Integer storeId;
 
+    /**
+     * 性别，0：男，1：女
+     */
+    private Integer sex;
+
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/MtUserExpressAddressMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/MtUserExpressAddressMapper.xml
index 01ca9a6c3..623fb0c35 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/MtUserExpressAddressMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/MtUserExpressAddressMapper.xml
@@ -20,7 +20,7 @@
     <!--查询单个-->
     <select id="queryById" resultMap="MtUserExpressAddressMap">
         select
-          id, user_id, name, mobile, address, if_default, store_id, create_time, update_time, create_by, update_by
+          id, user_id, name, mobile, address, if_default, store_id, create_time, update_time, create_by, update_by,sex
         from mt_user_express_address
         where id = #{id}
     </select>
@@ -28,7 +28,7 @@
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="MtUserExpressAddressMap">
         select
-          id, user_id, name, mobile, address, if_default, store_id, create_time, update_time, create_by, update_by
+          id, user_id, name, mobile, address, if_default, store_id, create_time, update_time, create_by, update_by,sex
         from mt_user_express_address
         <where>
             store_id = #{storeId}
@@ -88,21 +88,24 @@
             <if test="updateBy != null">
                 and update_by = #{updateBy}
             </if>
+            <if test="sex != null">
+                and sex = #{sex}
+            </if>
         </where>
     </select>
 
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into mt_user_express_address(user_id, name, mobile, address, if_default, store_id, create_time, update_time, create_by, update_by,full_address)
-        values (#{userId}, #{name}, #{mobile}, #{address}, #{ifDefault}, #{storeId}, #{createTime}, #{createTime}, #{createBy}, #{updateBy},#{fullAddress})
+        insert into mt_user_express_address(user_id, name, mobile, address, if_default, store_id, create_time, update_time, create_by, update_by,full_address,sex)
+        values (#{userId}, #{name}, #{mobile}, #{address}, #{ifDefault}, #{storeId}, #{createTime}, #{createTime}, #{createBy}, #{updateBy},#{fullAddress},#{sex})
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into mt_user_express_address(user_id, name, mobile, address, if_default, store_id, create_time, update_time, create_by, update_by)
+        insert into mt_user_express_address(user_id, name, mobile, address, if_default, store_id, create_time, update_time, create_by, update_by,sex)
         values
         <foreach collection="entities" item="entity" separator=",">
-        (#{entity.userId}, #{entity.name}, #{entity.mobile}, #{entity.address}, #{entity.ifDefault}, #{entity.storeId}, #{entity.createTime}, #{entity.updateTime}, #{entity.createBy}, #{entity.updateBy})
+        (#{entity.userId}, #{entity.name}, #{entity.mobile}, #{entity.address}, #{entity.ifDefault}, #{entity.storeId}, #{entity.createTime}, #{entity.updateTime}, #{entity.createBy}, #{entity.updateBy},#{entity.sex})
         </foreach>
     </insert>
 
@@ -175,12 +178,12 @@
 
     <select id="getDefault" resultMap="MtUserExpressAddressMap">
         select
-            id, user_id, name, mobile, address, if_default, store_id, create_time, update_time, create_by, update_by
+            id, user_id, name, mobile, address, if_default, store_id, create_time, update_time, create_by, update_by,sex
         from mt_user_express_address
     </select>
     <select id="getList" resultMap="MtUserExpressAddressMap">
         select
-            id, user_id, name, mobile, address, if_default, store_id, create_time, update_time, create_by, update_by
+            id, user_id, name, mobile, address, if_default, store_id, create_time, update_time, create_by, update_by,sex
         from mt_user_express_address
         where user_id = #{userId}
         order by if_default