From 135e1a36d71ff23a6a4832da6e28e33ce115943c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Jun 2021 10:36:32 +0800
Subject: [PATCH] fix viewJhyOrder.json
---
gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 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 cccc2e8..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
@@ -7,15 +7,12 @@
import com.xzx.gc.common.constant.Constants;
import com.xzx.gc.common.dto.log.OperationAppLog;
import com.xzx.gc.common.request.BaseController;
-import com.xzx.gc.entity.ScoreGoods;
import com.xzx.gc.entity.ScoreOrder;
import com.xzx.gc.model.JsonResult;
import com.xzx.gc.shop.dto.*;
import com.xzx.gc.shop.mapper.ScoreOrderMapper;
import com.xzx.gc.shop.service.OrderService;
-import com.xzx.gc.shop.vo.QueryGoodsListVo;
import com.xzx.gc.shop.vo.QueryOrderListVo;
-import com.xzx.gc.shop.vo.ViewGoodsVo;
import com.xzx.gc.shop.vo.ViewOrderVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -82,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)){
@@ -92,8 +89,8 @@
if(StrUtil.isEmpty(expressNo)){
return JsonResult.failMessage("快递单号不能为空！");
}
- Long expressId = orderService.deliverGoods(model);
- if(expressId > 0){
+ Long aLong = orderService.deliverGoods(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);
@@ -133,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("操作失败！");
+ }
+ }
+
}
--
Gitblit v1.9.1