From dabcb942ab62fb522f5932a665fa3e1952702d00 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 22 四月 2021 14:43:18 +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 | 81 +++++++++++++++++++++++++++++++++-------
1 files changed, 67 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 5bfbc88..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("用户");
@@ -574,14 +573,30 @@
comShopOrderDO.setLogisticsNo(orderShipDTO.getLogisticsNo());
int updated = comShopOrderDAO.updateById(comShopOrderDO);
if(updated==1){
+ //创建订单操作记录
+ ComShopOrderOperateDO orderOperateDO = new ComShopOrderOperateDO();
+ orderOperateDO.setOrderNo(comShopOrderDO.getOrderNo());
+ orderOperateDO.setOperationType(ComShopOrderOperateDO.operationType.deliver);
+ orderOperateDO.setOperationTime(new Date());
+ if(orderShipDTO.getIsAdmin()){
+ orderOperateDO.setOperationContent(orderShipDTO.getOperUserAccount()+"已发货");
+ orderOperateDO.setOperationBy(orderShipDTO.getOperUserAccount());
+ }else {
+ orderOperateDO.setOperationContent(orderShipDTO.getOperUserAccount() + "已发货");
+ orderOperateDO.setOperationBy(orderShipDTO.getOperUserAccount());
+ }
+ int inserted = comShopOrderOperateDAO.insert(orderOperateDO);
+ if(inserted!=1){
+ log.error("订单发货日志保存错误");
+ }
return R.ok("发货成功");
}
return R.fail("发货失败!");
}
@Override
- public R deliverOrder(Long orderId) {
- ComShopOrderDO comShopOrderDO = comShopOrderDAO.selectById(orderId);
+ public R deliverOrder(ComShopOrderDeliverDTO orderDeliverDTO) {
+ ComShopOrderDO comShopOrderDO = comShopOrderDAO.selectById(orderDeliverDTO.getOrderId());
if(comShopOrderDO==null){
return R.fail("订单不存在");
}
@@ -598,23 +613,61 @@
comShopOrderDO.setStatus(3);
int updated = comShopOrderDAO.updateById(comShopOrderDO);
if(updated==1){
+
+ //创建订单操作记录
+ ComShopOrderOperateDO orderOperateDO = new ComShopOrderOperateDO();
+ orderOperateDO.setOrderNo(comShopOrderDO.getOrderNo());
+ orderOperateDO.setOperationType(ComShopOrderOperateDO.operationType.deliver);
+ orderOperateDO.setOperationTime(new Date());
+ if(orderDeliverDTO.getIsAdmin()){
+ orderOperateDO.setOperationContent(orderDeliverDTO.getOperUserAccount() + "已发货");
+ orderOperateDO.setOperationBy(orderDeliverDTO.getOperUserAccount());
+ }else {
+ orderOperateDO.setOperationContent(orderDeliverDTO.getOperUserAccount() + "已发货");
+ orderOperateDO.setOperationBy(orderDeliverDTO.getOperUserAccount());
+ }
+ int inserted = comShopOrderOperateDAO.insert(orderOperateDO);
+ if(inserted!=1){
+ log.error("订单发货日志保存错误");
+ }
return R.ok("开始配送");
}
return R.fail("操作失败!");
}
@Override
- public R finishDeliverOrder(Long orderId) {
- ComShopOrderDO comShopOrderDO = comShopOrderDAO.selectById(orderId);
+ public R finishDeliverOrder(ComShopOrderDeliverDTO orderDeliverDTO) {
+ ComShopOrderDO comShopOrderDO = comShopOrderDAO.selectById(orderDeliverDTO.getOrderId());
if(comShopOrderDO==null){
return R.fail("订单不存在");
}
- if(!(comShopOrderDO.getDeliveryStatus() == 4)){
+ if(comShopOrderDO.getDeliveryStatus() != 4 && comShopOrderDO.getDeliveryStatus() != 3){
return R.fail("订单还未开始配送");
}
+ if(!(comShopOrderDO.getStatus() == 3)){
+ return R.fail("订单还未发货");
+ }
+ comShopOrderDO.setStatus(4);
comShopOrderDO.setDeliveryStatus(5);
int updated = comShopOrderDAO.updateById(comShopOrderDO);
if(updated==1){
+
+ //创建订单操作记录
+ ComShopOrderOperateDO orderOperateDO = new ComShopOrderOperateDO();
+ orderOperateDO.setOrderNo(comShopOrderDO.getOrderNo());
+ orderOperateDO.setOperationType(ComShopOrderOperateDO.operationType.complete);
+ orderOperateDO.setOperationTime(new Date());
+ if(orderDeliverDTO.getIsAdmin()){
+ orderOperateDO.setOperationContent("订单已完成");
+ orderOperateDO.setOperationBy(orderDeliverDTO.getOperUserAccount());
+ }else {
+ orderOperateDO.setOperationContent("订单已完成");
+ orderOperateDO.setOperationBy(orderDeliverDTO.getOperUserAccount());
+ }
+ int inserted = comShopOrderOperateDAO.insert(orderOperateDO);
+ if(inserted!=1){
+ log.error("订单发货日志保存错误");
+ }
return R.ok("配送完成");
}
return R.fail("操作失败!");
@@ -623,7 +676,7 @@
@Override
public R shopOrderExportData(ComShopOrderExportDTO comShopOrderExportDTO) {
Page page = new Page();
- page.setSize(1000);
+ page.setSize(10000);
page.setCurrent(1);
IPage<ExcelShopOrderDTO> excelShopOrderDTO = comShopOrderDAO.selectOrderExport(page, comShopOrderExportDTO);
return R.ok(excelShopOrderDTO.getRecords());
@@ -632,7 +685,7 @@
@Override
public R shopOrderFundsExportData(ComShopFundsExportDTO comShopFundsExportDTO) {
Page page = new Page();
- page.setSize(1000);
+ page.setSize(10000);
page.setCurrent(1);
IPage<ExcelShopFundsDTO> excelShopFundsDTO = comShopOrderDAO.selectFundsExport(page, comShopFundsExportDTO);
return R.ok(excelShopFundsDTO.getRecords());
--
Gitblit v1.7.1