代码提交

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;

src/main/java/org/springblade/modules/weixin/controller/WeChatAddressController.java

@@ -25,7 +25,8 @@ public class WeChatAddressController {
 
 	@GetMapping("/list")
 	public R<IPage<WeChatAddress>> list(WeChatUser weChatUser, Query query) {
-		return R.data(weChatAddressService.page(Condition.getPage(query), Wrappers.<WeChatAddress>lambdaQuery().eq(weChatUser.getId() != null, WeChatAddress::getUserId, weChatUser.getId())));
+		return R.data(weChatAddressService.page(Condition.getPage(query),
+			Wrappers.<WeChatAddress>lambdaQuery().eq(weChatUser.getId() != null, WeChatAddress::getUserId, weChatUser.getId())));
 	}
 
 	@GetMapping("/get-default-address")

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<WeChatAddressMapper, WeChatAddress> implements IWeChatAddressService {
 
 	private final WeChatAddressMapper weChatAddressMapper;
+	private final WeChatUserMapper userMapper;
 
 	@Override
 	public IPage<WeChatAddress> getPage(WeChatUser weChatUser, IPage<WeChatAddress> page) {
@@ -64,7 +66,9 @@ public class WeChatAddressServiceImpl extends BaseServiceImpl<WeChatAddressMappe
 
 	@Override
 	public WeChatAddress getAddress(String phone) {
-		return this.getOne(Wrappers.<WeChatAddress>lambdaQuery().eq(WeChatAddress::getPhone, phone).eq(WeChatAddress::getIsDefault, 1));
+		WeChatUser buyer = userMapper.selectOne(Wrappers.<WeChatUser>lambdaQuery().eq(WeChatUser::getPhone, phone));
+
+		return this.getOne(Wrappers.<WeChatAddress>lambdaQuery().eq(WeChatAddress::getUserId, buyer.getId()).eq(WeChatAddress::getIsDefault, 1));
 	}
 
 }