From f80e1595c702e1251eaab8ec9fe112a53736df7f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Jun 2021 16:47:20 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java | 28 +++++++++++++++++++++++++++-
gc-shop/src/main/java/com/xzx/gc/shop/dto/CancelOrderDto.java | 11 +++++++++++
gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java | 16 ++++++++++++----
3 files changed, 50 insertions(+), 5 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java
index 939cfae..ef2cf6b 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java
@@ -79,7 +79,7 @@
}
Integer status = scoreOrder.getStatus();
if(ScoreOrder.STATUS_READY != status){
- return JsonResult.failMessage("当前订单不是代发货状态！");
+ return JsonResult.failMessage("当前订单不是待发货状态！");
}
String expressCom = model.getExpressCom();
if(StrUtil.isEmpty(expressCom)){
@@ -130,6 +130,32 @@
}
}
+ /**
+ * 取消
+ */
+ @PostMapping(Constants.ADMIN_VIEW_PREFIX + "/score/goods/cancelOrder.json")
+ @ApiOperation(value="订单管理-取消", notes="test: 仅0有正确返回")
+ public JsonResult cancelOrder(@RequestBody CancelOrderDto model, HttpServletRequest request) {
+ long id = model.getId();
+ ScoreOrder scoreOrder = scoreOrderMapper.selectByPrimaryKey(id);
+ if(ObjectUtil.isEmpty(scoreOrder)){
+ return JsonResult.failMessage("订单不存在！");
+ }
+ Integer status = scoreOrder.getStatus();
+ if(ScoreOrder.STATUS_READY != status){
+ return JsonResult.failMessage("当前订单不是待发货状态！");
+ }
+ Long aLong = orderService.cancelOrder(model);
+ if(aLong > 0){
+ OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
+ .methodName(Constants.SCORESHOP_MODUL_NAME).operateAction("订单管理-取消-" + id).build();
+ mqUtil.sendApp(build);
+ return JsonResult.success("操作成功！");
+ }else{
+ return JsonResult.success("操作失败！");
+ }
+ }
+
}
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/dto/CancelOrderDto.java b/gc-shop/src/main/java/com/xzx/gc/shop/dto/CancelOrderDto.java
new file mode 100644
index 0000000..87bbf96
--- /dev/null
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/dto/CancelOrderDto.java
@@ -0,0 +1,11 @@
+package com.xzx.gc.shop.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CancelOrderDto {
+
+ @ApiModelProperty(value="订单ID")
+ private Long id;
+}
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
index f770ac5..2bb7477 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
@@ -12,10 +12,7 @@
import com.xzx.gc.common.exception.RestException;
import com.xzx.gc.common.utils.IdUtils;
import com.xzx.gc.entity.*;
-import com.xzx.gc.shop.dto.AddGoodsOrderDto;
-import com.xzx.gc.shop.dto.DeliverGoodsDto;
-import com.xzx.gc.shop.dto.InsureOrderDto;
-import com.xzx.gc.shop.dto.QueryOrderListDto;
+import com.xzx.gc.shop.dto.*;
import com.xzx.gc.shop.mapper.*;
import com.xzx.gc.shop.vo.ExpressInfoVo;
import com.xzx.gc.shop.vo.QueryOrderListVo;
@@ -233,4 +230,15 @@
scoreDetails.setChangeScore(totalPrice);
scoreDetailsMapper.insert(scoreDetails);
}
+
+ public Long cancelOrder(CancelOrderDto model) {
+ /**
+ * todo 只更新了订单状态，后续操作待增加
+ */
+ ScoreOrder scoreOrder = new ScoreOrder();
+ scoreOrder.setId(model.getId());
+ scoreOrder.setStatus(ScoreOrder.STATUS_CANCEL);
+ scoreOrderMapper.updateByPrimaryKeySelective(scoreOrder);
+ return scoreOrder.getId();
+ }
}
--
Gitblit v1.9.1