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 = "申诉")