From 037507bbe28ab8093c8cb20b4af85888f67be65a Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 22 四月 2021 14:02:03 +0800
Subject: [PATCH] Default Changelist
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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..37ce854 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
@@ -580,11 +580,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 +621,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 +663,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