From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java | 50 +++++++++++++++++++++++++++++---------------------
1 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
index 2569896..4367e2c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
@@ -156,19 +156,33 @@
}
//查询默认收货地址
- //查询上次购买记录的收货地址
- List<ComShopOrderDO> shopOrders = this.baseMapper.selectList(new QueryWrapper<ComShopOrderDO>()
- .eq("user_id",orderPreviewDTO.getUserId()).orderByDesc("create_at"));
- if(shopOrders.isEmpty()){//未查询到用户上一笔订单
- //查询用户收货地址中的默认地址
- ComShopUserAddressDO userAddressDO = comShopUserAddressDAO.selectOne(new QueryWrapper<ComShopUserAddressDO>()
+ ComShopUserAddressDO userDefaultAddressDO = comShopUserAddressDAO.selectOne(new QueryWrapper<ComShopUserAddressDO>()
+ .eq("delete_status", 2)
+ .eq("user_id",orderPreviewDTO.getUserId()).eq("is_default",ComShopUserAddressDO.isDefault.yes));
+
+ //查询用户收货地址中的默认地址
+ if(userDefaultAddressDO != null){
+ ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO();
+ BeanUtils.copyProperties(userDefaultAddressDO,userAddressVO);
+ orderPreviewVO.setUserAddressVO(userAddressVO);
+ }else{
+ //查询上次购买记录的收货地址
+ //查询到用户上一笔订单
+ List<ComShopOrderDO> shopOrders = this.baseMapper.selectList(new QueryWrapper<ComShopOrderDO>()
.eq("delete_status", 2)
- .eq("user_id",orderPreviewDTO.getUserId()).eq("is_default",ComShopUserAddressDO.isDefault.yes));
- if(userAddressDO != null){
- ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO();
- BeanUtils.copyProperties(userAddressDO,userAddressVO);
- orderPreviewVO.setUserAddressVO(userAddressVO);
- }else{
+ .eq("user_id",orderPreviewDTO.getUserId())
+ .orderByDesc("create_at"));
+ if(shopOrders!=null && shopOrders.size()>0) {
+ ComShopUserAddressDO userAddressDO = comShopUserAddressDAO.selectById(shopOrders.get(0).getReceiverId());
+ if (userAddressDO != null) {
+ ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO();
+ BeanUtils.copyProperties(userAddressDO, userAddressVO);
+ orderPreviewVO.setUserAddressVO(userAddressVO);
+ }
+ }
+ //无默认地址， 无上一单记录 地址
+ /*
+ if(orderPreviewVO.getUserAddressVO()==null){
List<ComShopUserAddressDO> userAddressDOList = comShopUserAddressDAO.selectList(new QueryWrapper<ComShopUserAddressDO>()
.eq("user_id",orderPreviewDTO.getUserId()).orderByDesc("create_at"));
if(!userAddressDOList.isEmpty()){
@@ -177,16 +191,10 @@
orderPreviewVO.setUserAddressVO(userAddressVO);
}
}
- }else{//查询到用户上一笔订单
- ComShopUserAddressDO userAddressDO = comShopUserAddressDAO.selectById(shopOrders.get(0).getReceiverId());
- if(userAddressDO != null){
- if(userAddressDO.getDeleteStatus() == 2) {
- ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO();
- BeanUtils.copyProperties(userAddressDO, userAddressVO);
- orderPreviewVO.setUserAddressVO(userAddressVO);
- }
- }
+ */
}
+
+
return R.ok(orderPreviewVO);
}
--
Gitblit v1.7.1