From 8fe1eee59c0c136220a31acfb0cc28318811e1d2 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Sun, 1 Sep 2024 21:25:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=BB=98=E8=AE=A4=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E4=B8=8E=E7=94=A8=E6=88=B7=E6=90=9C=E7=B4=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/member/controller/admin/user/vo/UserPageReqVO.java | 2 ++
 .../yshop/module/member/dal/mysql/user/MemberUserMapper.java  | 2 +-
 .../member/service/useraddress/AppUserAddressServiceImpl.java | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/yshop-drink-boot3/yshop-module-member/yshop-module-member-biz/src/main/java/co/yixiang/yshop/module/member/controller/admin/user/vo/UserPageReqVO.java b/yshop-drink-boot3/yshop-module-member/yshop-module-member-biz/src/main/java/co/yixiang/yshop/module/member/controller/admin/user/vo/UserPageReqVO.java
index 8f71339..2406093 100644
--- a/yshop-drink-boot3/yshop-module-member/yshop-module-member-biz/src/main/java/co/yixiang/yshop/module/member/controller/admin/user/vo/UserPageReqVO.java
+++ b/yshop-drink-boot3/yshop-module-member/yshop-module-member-biz/src/main/java/co/yixiang/yshop/module/member/controller/admin/user/vo/UserPageReqVO.java
@@ -27,6 +27,8 @@ public class UserPageReqVO extends PageParam {
     @Schema(description = "手机号码")
     private String mobile;
 
+    private String phone;
+
     @Schema(description = "添加时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
diff --git a/yshop-drink-boot3/yshop-module-member/yshop-module-member-biz/src/main/java/co/yixiang/yshop/module/member/dal/mysql/user/MemberUserMapper.java b/yshop-drink-boot3/yshop-module-member/yshop-module-member-biz/src/main/java/co/yixiang/yshop/module/member/dal/mysql/user/MemberUserMapper.java
index e495962..a4bca09 100644
--- a/yshop-drink-boot3/yshop-module-member/yshop-module-member-biz/src/main/java/co/yixiang/yshop/module/member/dal/mysql/user/MemberUserMapper.java
+++ b/yshop-drink-boot3/yshop-module-member/yshop-module-member-biz/src/main/java/co/yixiang/yshop/module/member/dal/mysql/user/MemberUserMapper.java
@@ -36,7 +36,7 @@ public interface MemberUserMapper extends BaseMapperX<MemberUserDO> {
                 .likeIfPresent(MemberUserDO::getUsername, reqVO.getUsername())
                 .likeIfPresent(MemberUserDO::getRealName, reqVO.getRealName())
                 .likeIfPresent(MemberUserDO::getNickname, reqVO.getNickname())
-                .eqIfPresent(MemberUserDO::getMobile, reqVO.getMobile())
+                .likeIfPresent(MemberUserDO::getMobile, reqVO.getPhone())
                 .betweenIfPresent(MemberUserDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(MemberUserDO::getId));
     }
diff --git a/yshop-drink-boot3/yshop-module-member/yshop-module-member-biz/src/main/java/co/yixiang/yshop/module/member/service/useraddress/AppUserAddressServiceImpl.java b/yshop-drink-boot3/yshop-module-member/yshop-module-member-biz/src/main/java/co/yixiang/yshop/module/member/service/useraddress/AppUserAddressServiceImpl.java
index 2aea421..b35b62f 100644
--- a/yshop-drink-boot3/yshop-module-member/yshop-module-member-biz/src/main/java/co/yixiang/yshop/module/member/service/useraddress/AppUserAddressServiceImpl.java
+++ b/yshop-drink-boot3/yshop-module-member/yshop-module-member-biz/src/main/java/co/yixiang/yshop/module/member/service/useraddress/AppUserAddressServiceImpl.java
@@ -43,6 +43,10 @@ public class AppUserAddressServiceImpl extends ServiceImpl<UserAddressMapper,Use
      */
     @Override
     public Long addAndEdit(Long uid, AppAddressParam param){
+        if(ShopCommonEnum.ENABLE_1.getValue().equals(param.getIsDefault())){
+            userAddressMapper.update(UserAddressDO.builder().isDefault(ShopCommonEnum.DEFAULT_0.getValue()).build(),
+                    new LambdaQueryWrapper<UserAddressDO>().eq(UserAddressDO::getUid,uid));
+        }
         UserAddressDO userAddress = UserAddressDO.builder()
                 .address(param.getAddress())
                 .detail(param.getDetail())