diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java index 403f7dd5..92087da4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java @@ -260,10 +260,11 @@ public class BmQrBoxServiceImpl implements BmQrBoxService { */ @Override public AjaxResult appTransfer(BmQrBoxInfo bmQrBoxInfo) { - if (null == bmQrBoxInfo.getTransferUser() || 0 >= bmQrBoxInfo.getTransferUser()) { - return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "请选择移交人"); + if (null == bmQrBoxInfo.getInputUser() || 0 >= bmQrBoxInfo.getInputUser()) { + return AjaxResult.error(500, "请选择移交人"); } bmQrBoxInfo.setBoxCode(null).setBoxName(null).setBoxType(null).setStatus(QrBoxStatusEnum.QR_BOX_STATUS_WAIT_RECEIVE.getStatus().toString()); + bmQrBoxInfo.setTransferUser(SecurityUtils.getUserId()); return 0 < bmQrBoxMapper.updateBmQrcodeInfoById(bmQrBoxInfo) ? AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg()) : AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); } @@ -304,8 +305,8 @@ public class BmQrBoxServiceImpl implements BmQrBoxService { final List bmQrBoxInfos = bmQrBoxMapper.find(new BmQrBoxInfo().setBoxId(bmQrBoxInfo.getBoxId())); if (!bmQrBoxInfos.isEmpty()) { final BmQrBoxInfo item = bmQrBoxInfos.get(0); - if (null == item.getTransferUser() || !Objects.equals(item.getTransferUser(), SecurityUtils.getUserId())) { - return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "接收失败,当前操作非移交人,无法接收!"); + if (null == item.getInputUser() || !Objects.equals(item.getInputUser(), SecurityUtils.getUserId())) { + return AjaxResult.error(500, "接收失败,当前操作非移交人,无法接收!"); } List list = bmQrBoxMapper.getBoxBindListById(bmQrBoxInfo); if (CollectionUtils.isNotEmpty(list)) { @@ -343,7 +344,7 @@ public class BmQrBoxServiceImpl implements BmQrBoxService { } } } else { - return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "接收失败,无此标准箱信息!"); + return AjaxResult.error(500, "接收失败,无此标准箱信息!"); } bmQrBoxInfo.setBoxCode(null).setBoxName(null).setBoxType(null) .setInputUser(SecurityUtils.getUserId())