From bcd981811a00c3e7d4ef44582e705f63d5966817 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 24 Jun 2021 18:41:36 +0800
Subject: [PATCH] 20210624 商品分类
---
gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 2 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 8047c64..4eabe4b 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
@@ -1,13 +1,21 @@
package com.xzx.gc.shop.controller;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.xzx.gc.common.constant.CommonEnum;
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.QueryGoodsListDto;
-import com.xzx.gc.shop.dto.QueryOrderListDto;
+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;
import io.swagger.annotations.ApiResponse;
@@ -18,6 +26,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.util.Map;
@RestController
@@ -27,6 +36,8 @@
@Resource
private OrderService orderService;
+ @Resource
+ private ScoreOrderMapper scoreOrderMapper;
/**
* 查询订单列表
@@ -40,4 +51,48 @@
return JsonResult.success(result);
}
+ /**
+ * 查询订单详情
+ */
+ @PostMapping(Constants.ADMIN_VIEW_PREFIX + "/score/goods/viewOrder.json")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = ViewOrderVo.class)})
+ @ApiOperation(value="订单管理-查询订单详情", notes="test: 仅0有正确返回")
+ public JsonResult<ViewOrderVo> viewOrder(@RequestBody ViewOrderDto viewOrderDto) {
+ Long id = viewOrderDto.getId();
+ ViewOrderVo viewOrderVo = orderService.viewOrder(id);
+ return JsonResult.success(viewOrderVo);
+ }
+
+ /**
+ * 发货
+ */
+ @PostMapping(Constants.ADMIN_VIEW_PREFIX + "/score/goods/deliverGoods.json")
+ @ApiOperation(value="订单管理-发货", notes="test: 仅0有正确返回")
+ public JsonResult deliverGoods(@RequestBody DeliverGoodsDto 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("当前订单不是代发货状态！");
+ }
+ String expressCom = model.getExpressCom();
+ if(StrUtil.isEmpty(expressCom)){
+ return JsonResult.failMessage("物流公司不能为空！");
+ }
+ String expressNo = model.getExpressNo();
+ if(StrUtil.isEmpty(expressNo)){
+ return JsonResult.failMessage("快递单号不能为空！");
+ }
+ orderService.deliverGoods(model);
+ 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