From 6cbbbc92f623c83e918ef0f2eea8ff82cc920b1b Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期五, 30 四月 2021 10:57:04 +0800
Subject: [PATCH] Add:添加邻里圈删除
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 5bb465f..735e451 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
@@ -29,6 +29,7 @@
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -161,6 +162,7 @@
if(shopOrders.isEmpty()){//未查询到用户上一笔订单
//查询用户收货地址中的默认地址
ComShopUserAddressDO userAddressDO = comShopUserAddressDAO.selectOne(new QueryWrapper<ComShopUserAddressDO>()
+ .eq("delete_status", 2)
.eq("user_id",orderPreviewDTO.getUserId()).eq("is_default",ComShopUserAddressDO.isDefault.yes));
if(userAddressDO != null){
ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO();
@@ -178,9 +180,11 @@
}else{//查询到用户上一笔订单
ComShopUserAddressDO userAddressDO = comShopUserAddressDAO.selectById(shopOrders.get(0).getReceiverId());
if(userAddressDO != null){
- ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO();
- BeanUtils.copyProperties(userAddressDO,userAddressVO);
- orderPreviewVO.setUserAddressVO(userAddressVO);
+ if(userAddressDO.getDeleteStatus() == 2) {
+ ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO();
+ BeanUtils.copyProperties(userAddressDO, userAddressVO);
+ orderPreviewVO.setUserAddressVO(userAddressVO);
+ }
}
}
return R.ok(orderPreviewVO);
@@ -198,7 +202,7 @@
ComShopOrderVO shopOrderVO = new ComShopOrderVO();
//查询用户收货地址
ComShopUserAddressDO userAddressDO = comShopUserAddressDAO.selectById(orderCreateDTO.getReceiverId());
- if(userAddressDO == null){
+ if(userAddressDO == null||userAddressDO.getDeleteStatus()!=2){
return R.fail("收货地址不存在");
}
//用户id
@@ -570,6 +574,7 @@
comShopOrderDO.setDeliveryStatus(2);
comShopOrderDO.setDeliveryType(2);
comShopOrderDO.setStatus(3);
+ comShopOrderDO.setDeliveryTime(Calendar.getInstance().getTime());
comShopOrderDO.setLogisticsCompany(orderShipDTO.getLogisticsCompany());
comShopOrderDO.setLogisticsNo(orderShipDTO.getLogisticsNo());
int updated = comShopOrderDAO.updateById(comShopOrderDO);
@@ -612,6 +617,7 @@
comShopOrderDO.setDeliveryStatus(4);
comShopOrderDO.setDeliveryType(1);
comShopOrderDO.setStatus(3);
+ comShopOrderDO.setDeliveryTime(Calendar.getInstance().getTime());
int updated = comShopOrderDAO.updateById(comShopOrderDO);
if(updated==1){
--
Gitblit v1.7.1