From 9e3eb1f74e76771a8e812cd1f5c1305c3ebfa3e8 Mon Sep 17 00:00:00 2001 From: Chopper Date: Thu, 12 Aug 2021 00:28:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=94=B3=E8=AF=89?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=98=AF=EF=BC=8C=E6=97=A0=E9=9C=80=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=92=A4=E9=94=80=E7=94=B3=E8=AF=89=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- framework/src/main/java/cn/lili/common/enums/ResultCode.java | 1 + .../order/order/serviceimpl/OrderComplaintServiceImpl.java | 5 +++++ .../lili/controller/trade/OrderComplaintStoreController.java | 3 +-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/framework/src/main/java/cn/lili/common/enums/ResultCode.java b/framework/src/main/java/cn/lili/common/enums/ResultCode.java index 5b364610..21d2101b 100644 --- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java +++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java @@ -213,6 +213,7 @@ public enum ResultCode { COMPLAINT_NOT_EXIT(33103, "当前投诉记录不存在"), COMPLAINT_ARBITRATION_RESULT_ERROR(33104, "结束订单投诉时，仲裁结果不能为空"), COMPLAINT_APPEAL_CONTENT_ERROR(33105, "商家申诉时，申诉内容不能为空"), + COMPLAINT_CANCEL_ERROR(33106, "申诉已完成，不需要进行取消申诉操作"), /** diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java index cf932c2e..732ac20c 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java @@ -214,6 +214,11 @@ public class OrderComplaintServiceImpl extends ServiceImpl lambdaUpdateWrapper = Wrappers.lambdaUpdate(); lambdaUpdateWrapper.eq(OrderComplaint::getId, id); lambdaUpdateWrapper.set(OrderComplaint::getComplainStatus, ComplaintStatusEnum.CANCEL.name()); diff --git a/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java index 06857b21..c889a432 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java @@ -71,10 +71,9 @@ public class OrderComplaintStoreController { @ApiOperation(value = "修改申诉信息") @PutMapping public ResultMessage update(OrderComplaintVO orderComplainVO) { - orderComplainVO.setStoreId(UserContext.getCurrentUser().getId()); + orderComplainVO.setStoreId(UserContext.getCurrentUser().getStoreId()); orderComplaintService.updateOrderComplain(orderComplainVO); return ResultUtil.data(orderComplainVO); - } @ApiOperation(value = "申诉") From 4d83b63f821116f65b068d370a68971b42f5d6c6 Mon Sep 17 00:00:00 2001 From: Chopper Date: Thu, 12 Aug 2021 00:30:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E6=9F=A5=E7=9C=8B=E7=89=A9=E6=B5=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/controller/trade/OrderManagerController.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java index 55aa9753..27c7faa1 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; import javax.validation.Valid; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.List; @@ -106,4 +107,12 @@ public class OrderManagerController { } + @ApiOperation(value = "查询物流踪迹") + @ApiImplicitParams({ + @ApiImplicitParam(name = "orderSn", value = "订单编号", required = true, dataType = "String", paramType = "path") + }) + @PostMapping(value = "/getTraces/{orderSn}") + public ResultMessage getTraces(@NotBlank(message = "订单编号不能为空") @PathVariable String orderSn) { + return ResultUtil.data(orderService.getTraces(orderSn)); + } } \ No newline at end of file