From 360caa64f69e4cb9d94133e04b17180035dbd85f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=BA=86=E7=A5=A5?= Date: Thu, 19 Jun 2025 16:58:48 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E4=BF=AE=E6=94=B9=E8=B4=AD=E7=89=A9?= =?UTF-8?q?=E8=BD=A6=E5=92=8C=E4=BC=9A=E5=91=98=E7=8A=B6=E6=80=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/wzj/soopin/member/domain/bo/MemberAddressBO.java | 9 ++++++--- .../com/wzj/soopin/member/domain/vo/MemberAddressVO.java | 6 ++---- .../member/service/impl/MemberAddressServiceImpl.java | 2 +- .../soopin/member/service/impl/MemberServiceImpl.java | 2 -- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberAddressBO.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberAddressBO.java index cfeb84186..806e21735 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberAddressBO.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberAddressBO.java @@ -22,7 +22,7 @@ public class MemberAddressBO extends BaseBO { private Long memberId; @Schema(description ="收货人名称 精确匹配") - private String nameLike; + private String name; @Schema(description ="PHONE 精确匹配") private String phone; @@ -52,10 +52,13 @@ public class MemberAddressBO extends BaseBO { public LambdaQueryWrapper toWrapper() { return super.toWrapper().eq(city!=null,MemberAddress::getCity,city) .eq(district!=null,MemberAddress::getDistrict,district) - .eq(detailAddress!=null,MemberAddress::getDetailAddress,detailAddress) + .like(detailAddress!=null,MemberAddress::getDetailAddress,detailAddress) + .eq(phone!=null,MemberAddress::getPhoneEncrypted,phone) + .eq(province!=null,MemberAddress::getProvince,province) + .eq(city!=null,MemberAddress::getCity,city) .eq(defaultFlag!=null,MemberAddress::getDefaultFlag,defaultFlag) .eq(memberId!=null,MemberAddress::getMemberId,memberId) - .like(nameLike!=null,MemberAddress::getName,nameLike); + .like(name!=null,MemberAddress::getName,name); } } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/MemberAddressVO.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/MemberAddressVO.java index ad178d10c..9bc4a039b 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/MemberAddressVO.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/MemberAddressVO.java @@ -36,7 +36,7 @@ public class MemberAddressVO extends BaseEntity { private String phoneHidden; /** 是否为默认 */ @Excel(name = "是否为默认") - private Integer defaultStatus; + private Integer defaultFlag; /** 邮政编码 */ @Excel(name = "邮政编码") private String postCode; @@ -52,7 +52,5 @@ public class MemberAddressVO extends BaseEntity { /** 详细地址(街道) */ @Excel(name = "详细地址(街道)") private String detailAddress; - /** 是否默认 */ - @Excel(name = "是否默认") - private Integer isDefault; + } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberAddressServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberAddressServiceImpl.java index 6ce679fe6..e2103cc0f 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberAddressServiceImpl.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberAddressServiceImpl.java @@ -41,7 +41,7 @@ public class MemberAddressServiceImpl extends ServiceImpl selectList(MemberAddressBO query, IPage page) { QueryWrapper qw = new QueryWrapper<>(); - String nameLike = query.getNameLike(); + String nameLike = query.getName(); if (!StringUtils.isEmpty(nameLike)) { qw.like("name", nameLike); } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java index 2b35b8b94..032c206ec 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java @@ -107,8 +107,6 @@ public class MemberServiceImpl extends ServiceImpl implemen - @CachePut(value = CacheConstants.MEMBER, key = "#id") - public Integer changeStatus(MemberBO bo) { UpdateWrapper wrapper = new UpdateWrapper<>(); wrapper.eq("id", bo.getId());