From 9f947ed231edeb18fb16a03cbd437aa28be93631 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Fri, 25 Jun 2021 14:46:00 +0800 Subject: [PATCH] 20210625 商品分类 --- gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java | 4 ++-- gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java | 1 + gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java | 2 +- 3 files changed, 4 insertions(+), 3 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..939cfae 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 @@ -89,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); 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 6b45805..5495a97 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 @@ -121,7 +121,7 @@ scoreOrder.setStatus(ScoreOrder.STATUS_ON); scoreOrderMapper.updateByPrimaryKeySelective(scoreOrder); } - return scoreExpressInfo.getId(); + return id; } public Long insureOrder(InsureOrderDto model) { diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java index 27e710f..41f190e 100644 --- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java +++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java @@ -8,6 +8,7 @@ @ApiModel(value = "QueryOrderListVo", description = "返回") public class QueryOrderListVo { + private Long id; @ApiModelProperty(value="订单编号") private String orderNo; @ApiModelProperty(value="客户姓名") -- Gitblit v1.9.1