From 6375ca6c370b007d68786ec7dd941c6eb0e4efa7 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 26 四月 2021 09:27:57 +0800
Subject: [PATCH] bugfixed: 78658
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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 37ce854..edbe19c 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
@@ -161,6 +161,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();
@@ -198,7 +199,7 @@
ComShopOrderVO shopOrderVO = new ComShopOrderVO();
//查询用户收货地址
ComShopUserAddressDO userAddressDO = comShopUserAddressDAO.selectById(orderCreateDTO.getReceiverId());
- if(userAddressDO == null){
+ if(userAddressDO == null||userAddressDO.getDeleteStatus()!=2){
return R.fail("收货地址不存在");
}
//用户id
@@ -287,6 +288,7 @@
comShopOrderOperateDAO.insert(orderOperateDO);
shopOrderVO.setOrderNo(orderNo);
shopOrderVO.setOrderTotal(orderTotal);
+ shopOrderVO.setOrderId(shopOrderDO.getId());
try {
BigDecimal money = orderTotal;
@@ -418,15 +420,14 @@
/**
* 根据订单id取消订单
- * @param orderId 订单id
- * @param phone 操作用户手机号
+ * @param comShopOrderQueryDTO 订单信息
* @return 取消结果
*/
@Transactional(rollbackFor = Exception.class)
@Override
- public R orderCancel(Long orderId,String phone){
+ public R orderCancel(ComShopOrderQueryDTO comShopOrderQueryDTO){
//查询订单
- ComShopOrderDO shopOrderDO = this.baseMapper.selectById(orderId);
+ ComShopOrderDO shopOrderDO = this.baseMapper.selectById(comShopOrderQueryDTO.getOrderId());
if(shopOrderDO == null){
return R.fail("未查询到订单");
}
@@ -441,9 +442,9 @@
orderOperateDO.setOrderNo(shopOrderDO.getOrderNo());
orderOperateDO.setOperationType(ComShopOrderOperateDO.operationType.cancel);
orderOperateDO.setOperationTime(new Date());
- if(StringUtils.isNotEmpty(phone)){
- orderOperateDO.setOperationContent("用户" + phone + "取消订单");
- orderOperateDO.setOperationBy("用户" + phone);
+ if(comShopOrderQueryDTO.getIsAdmin()){
+ orderOperateDO.setOperationContent("管理员" + comShopOrderQueryDTO.getOperUserAccount() + "取消订单");
+ orderOperateDO.setOperationBy("用户" + comShopOrderQueryDTO.getOperUserAccount());
}else {
orderOperateDO.setOperationContent("用户取消订单");
orderOperateDO.setOperationBy("用户");
@@ -648,11 +649,10 @@
if(!(comShopOrderDO.getStatus() == 3)){
return R.fail("订单还未发货");
}
- comShopOrderDO.setStatus(4);
+ //comShopOrderDO.setStatus(4);
comShopOrderDO.setDeliveryStatus(5);
int updated = comShopOrderDAO.updateById(comShopOrderDO);
if(updated==1){
-
//创建订单操作记录
ComShopOrderOperateDO orderOperateDO = new ComShopOrderOperateDO();
orderOperateDO.setOrderNo(comShopOrderDO.getOrderNo());
@@ -852,6 +852,9 @@
}catch (Exception e){
log.error("调用微信支付异常,异常原因：" + e.getMessage());
}
+ shopOrderVO.setOrderId(orderDO.getId());
+ shopOrderVO.setOrderNo(orderDO.getOrderNo());
+ shopOrderVO.setOrderTotal(orderDO.getTotalAmount());
return R.ok(shopOrderVO);
}
--
Gitblit v1.7.1