From e84450eda524efd94e9c86307108f7dfc4c0392c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Jul 2021 11:36:54 +0800
Subject: [PATCH] 20210706 积分拨付
---
gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 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 a12d0b7..45e5c60 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,9 +7,11 @@
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.ScoreDetails;
import com.xzx.gc.entity.ScoreOrder;
import com.xzx.gc.model.JsonResult;
import com.xzx.gc.shop.dto.*;
+import com.xzx.gc.shop.mapper.ScoreDetailsMapper;
import com.xzx.gc.shop.mapper.ScoreOrderMapper;
import com.xzx.gc.shop.service.OrderService;
import com.xzx.gc.shop.vo.QueryOrderListVo;
@@ -19,9 +21,11 @@
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import tk.mybatis.mapper.entity.Example;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -37,6 +41,8 @@
private OrderService orderService;
@Resource
private ScoreOrderMapper scoreOrderMapper;
+ @Resource
+ private ScoreDetailsMapper scoreDetailsMapper;
/**
* 查询订单列表
@@ -79,7 +85,7 @@
}
Integer status = scoreOrder.getStatus();
if(ScoreOrder.STATUS_READY != status){
- return JsonResult.failMessage("当前订单不是代发货状态！");
+ return JsonResult.failMessage("当前订单不是待发货状态！");
}
String expressCom = model.getExpressCom();
if(StrUtil.isEmpty(expressCom)){
@@ -89,8 +95,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);
@@ -111,10 +117,10 @@
if(ObjectUtil.isEmpty(scoreOrder)){
return JsonResult.failMessage("订单不存在！");
}
- Integer status = scoreOrder.getStatus();
- if(ScoreOrder.STATUS_DOING != status){
- return JsonResult.failMessage("当前订单不是已收货状态！");
- }
+// Integer status = scoreOrder.getStatus();
+// if(ScoreOrder.STATUS_DOING != status){
+// return JsonResult.failMessage("当前订单不是已收货状态！");
+// }
List<String> voucherImgs = model.getVoucherImgs();
if(CollUtil.isEmpty(voucherImgs)){
return JsonResult.failMessage("凭证不能为空！");
@@ -130,6 +136,29 @@
}
}
+ /**
+ * 取消
+ */
+ @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("当前订单不是待发货状态！");
+ }
+
+ orderService.cancelOrder(id,scoreOrder.getUserId());
+ OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
+ .methodName(Constants.SCORESHOP_MODUL_NAME).operateAction("订单管理-取消-" + id).build();
+ mqUtil.sendApp(build);
+ return JsonResult.success("操作成功！");
+ }
+
}
--
Gitblit v1.9.1