From 19886f5a1bdcf74c29390d637a7b08648b38bd88 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期四, 17 六月 2021 14:06:34 +0800
Subject: [PATCH] 人口导入添加noToken 接口，修改大屏工作模块
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java | 65 ++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 20 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..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
@@ -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;
@@ -155,18 +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>()
- .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{
+ 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())
+ .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()){
@@ -175,14 +191,10 @@
orderPreviewVO.setUserAddressVO(userAddressVO);
}
}
- }else{//查询到用户上一笔订单
- ComShopUserAddressDO userAddressDO = comShopUserAddressDAO.selectById(shopOrders.get(0).getReceiverId());
- if(userAddressDO != null){
- ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO();
- BeanUtils.copyProperties(userAddressDO,userAddressVO);
- orderPreviewVO.setUserAddressVO(userAddressVO);
- }
+ */
}
+
+
return R.ok(orderPreviewVO);
}
@@ -198,7 +210,7 @@
ComShopOrderVO shopOrderVO = new ComShopOrderVO();
//查询用户收货地址
ComShopUserAddressDO userAddressDO = comShopUserAddressDAO.selectById(orderCreateDTO.getReceiverId());
- if(userAddressDO == null){
+ if(userAddressDO == null||userAddressDO.getDeleteStatus()!=2){
return R.fail("收货地址不存在");
}
//用户id
@@ -385,6 +397,16 @@
orderGoodsVO.setNum(orderGoods.getAmount());
orderGoodsVO.setGoodsPic(orderGoods.getGoodsAttrPic());
orderGoodsVO.setPrice(orderGoods.getGoodsAttrPrice());
+ //查询商品信息判断商品状态
+ ComShopGoodsDO goodsDO = comShopGoodsDAO.selectById(orderGoods.getGoodsId());
+ if(goodsDO == null || goodsDO.getDeleteStatus().equals(ComShopGoodsDO.deleteStatus.yes) || goodsDO.getDeleteStatus().equals(ComShopGoodsDO.status.recovery)){
+ orderGoodsVO.setGoodsStatus(ComShopOrderGoodsVO.goodsStatus.ysc);
+ }else if(goodsDO.getStatus().equals(ComShopGoodsDO.status.lower)){
+ orderGoodsVO.setGoodsStatus(ComShopOrderGoodsVO.goodsStatus.yxj);
+ }else if(goodsDO.getStatus().equals(ComShopGoodsDO.status.sell)){
+ orderGoodsVO.setGoodsStatus(ComShopOrderGoodsVO.goodsStatus.csz);
+ }
+
//根据商品规格id查询商品规格
ComShopGoodsAttrDO goodsAttrDO = comShopGoodsAttrDAO.selectById(orderGoods.getGoodsAttrId());
if(goodsAttrDO != null){
@@ -499,6 +521,7 @@
}
//订单确认收货
shopOrderDO.setStatus(ComShopOrderDO.status.ywc);
+ shopOrderDO.setReceivingTime(new Date());
if(this.baseMapper.updateById(shopOrderDO) > 0){
//添加订单操作记录
ComShopOrderOperateDO orderOperateDO = new ComShopOrderOperateDO();
@@ -570,6 +593,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 +636,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