bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
mashuai 2025-05-20 17:59:06 +08:00
parent 42002e753a f1becfbfa9
commit dd4f7af324
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java
View File

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