From abf447d168a95ebf20745eadffd81229431b9b52 Mon Sep 17 00:00:00 2001 From: liuqingkun Date: Wed, 23 Aug 2023 17:11:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/desk/controller/OrderController.java | 1 + .../modules/weixin/controller/WeChatAddressController.java | 3 ++- .../weixin/service/impl/WeChatAddressServiceImpl.java | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springblade/modules/desk/controller/OrderController.java b/src/main/java/org/springblade/modules/desk/controller/OrderController.java index 35ae510..4f731a2 100644 --- a/src/main/java/org/springblade/modules/desk/controller/OrderController.java +++ b/src/main/java/org/springblade/modules/desk/controller/OrderController.java @@ -24,6 +24,7 @@ import org.springblade.modules.desk.entity.Order; import org.springblade.modules.desk.service.IOrderService; import org.springblade.modules.desk.vo.OrderExcelVO; import org.springblade.modules.weixin.entity.WeChatAddress; +import org.springblade.modules.weixin.entity.WeChatUser; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; diff --git a/src/main/java/org/springblade/modules/weixin/controller/WeChatAddressController.java b/src/main/java/org/springblade/modules/weixin/controller/WeChatAddressController.java index dd47ff9..0120e19 100644 --- a/src/main/java/org/springblade/modules/weixin/controller/WeChatAddressController.java +++ b/src/main/java/org/springblade/modules/weixin/controller/WeChatAddressController.java @@ -25,7 +25,8 @@ public class WeChatAddressController { @GetMapping("/list") public R> list(WeChatUser weChatUser, Query query) { - return R.data(weChatAddressService.page(Condition.getPage(query), Wrappers.lambdaQuery().eq(weChatUser.getId() != null, WeChatAddress::getUserId, weChatUser.getId()))); + return R.data(weChatAddressService.page(Condition.getPage(query), + Wrappers.lambdaQuery().eq(weChatUser.getId() != null, WeChatAddress::getUserId, weChatUser.getId()))); } @GetMapping("/get-default-address") diff --git a/src/main/java/org/springblade/modules/weixin/service/impl/WeChatAddressServiceImpl.java b/src/main/java/org/springblade/modules/weixin/service/impl/WeChatAddressServiceImpl.java index 57046b4..f81c85a 100644 --- a/src/main/java/org/springblade/modules/weixin/service/impl/WeChatAddressServiceImpl.java +++ b/src/main/java/org/springblade/modules/weixin/service/impl/WeChatAddressServiceImpl.java @@ -24,6 +24,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.modules.weixin.entity.WeChatAddress; import org.springblade.modules.weixin.entity.WeChatUser; import org.springblade.modules.weixin.mapper.WeChatAddressMapper; +import org.springblade.modules.weixin.mapper.WeChatUserMapper; import org.springblade.modules.weixin.service.IWeChatAddressService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,6 +37,7 @@ import org.springframework.transaction.annotation.Transactional; public class WeChatAddressServiceImpl extends BaseServiceImpl implements IWeChatAddressService { private final WeChatAddressMapper weChatAddressMapper; + private final WeChatUserMapper userMapper; @Override public IPage getPage(WeChatUser weChatUser, IPage page) { @@ -64,7 +66,9 @@ public class WeChatAddressServiceImpl extends BaseServiceImpllambdaQuery().eq(WeChatAddress::getPhone, phone).eq(WeChatAddress::getIsDefault, 1)); + WeChatUser buyer = userMapper.selectOne(Wrappers.lambdaQuery().eq(WeChatUser::getPhone, phone)); + + return this.getOne(Wrappers.lambdaQuery().eq(WeChatAddress::getUserId, buyer.getId()).eq(WeChatAddress::getIsDefault, 1)); } }