From 35de4ec51dc2bb3c1ae73fb8a66f10d53a4b1a0d Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 四月 2021 15:20:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 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 db5b30b..edaa96e 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
@@ -418,15 +418,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 +440,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("用户");
@@ -580,11 +579,11 @@
orderOperateDO.setOperationType(ComShopOrderOperateDO.operationType.deliver);
orderOperateDO.setOperationTime(new Date());
if(orderShipDTO.getIsAdmin()){
- orderOperateDO.setOperationContent("已发货");
+ orderOperateDO.setOperationContent(orderShipDTO.getOperUserAccount()+"已发货");
orderOperateDO.setOperationBy(orderShipDTO.getOperUserAccount());
}else {
- orderOperateDO.setOperationContent("已发货");
- orderOperateDO.setOperationBy("用户");
+ orderOperateDO.setOperationContent(orderShipDTO.getOperUserAccount() + "已发货");
+ orderOperateDO.setOperationBy(orderShipDTO.getOperUserAccount());
}
int inserted = comShopOrderOperateDAO.insert(orderOperateDO);
if(inserted!=1){
@@ -621,11 +620,11 @@
orderOperateDO.setOperationType(ComShopOrderOperateDO.operationType.deliver);
orderOperateDO.setOperationTime(new Date());
if(orderDeliverDTO.getIsAdmin()){
- orderOperateDO.setOperationContent("已发货");
+ orderOperateDO.setOperationContent(orderDeliverDTO.getOperUserAccount() + "已发货");
orderOperateDO.setOperationBy(orderDeliverDTO.getOperUserAccount());
}else {
- orderOperateDO.setOperationContent("已发货");
- orderOperateDO.setOperationBy("用户");
+ orderOperateDO.setOperationContent(orderDeliverDTO.getOperUserAccount() + "已发货");
+ orderOperateDO.setOperationBy(orderDeliverDTO.getOperUserAccount());
}
int inserted = comShopOrderOperateDAO.insert(orderOperateDO);
if(inserted!=1){
@@ -663,7 +662,7 @@
orderOperateDO.setOperationBy(orderDeliverDTO.getOperUserAccount());
}else {
orderOperateDO.setOperationContent("订单已完成");
- orderOperateDO.setOperationBy("用户");
+ orderOperateDO.setOperationBy(orderDeliverDTO.getOperUserAccount());
}
int inserted = comShopOrderOperateDAO.insert(orderOperateDO);
if(inserted!=1){
--
Gitblit v1.7.1