Skip to content

J
jiedao-api-boot-master
Commit 5d7680e8 authored by zhengyi's avatar zhengyi
Browse files
Options

收货人限制修改审批日志数据完善 

Signed-off-by: default avatarzhengyi <landuo321@aliyun.com>
parent 070e29d6
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 32 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderCargoControl/OrderCargoControlServiceImpl.java
View file @ 5d7680e8
......@@ -493,17 +493,25 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
// TODO 审批取消、审批拒绝,待补充业务日志及其他细节
if (orderApprovalDO.getType() == 61) {
msg = result == 3 ? "收货人限制修改申请取消" : "收货人限制修改申请拒绝";
ApplyInfoVO applyInfoVO = new ApplyInfoVO();
applyInfoVO.setName("是否限制修改收货人");
applyInfoVO.setOrgValue(applyVO.getIsLimitUpdateConsignee() ? "是" : "否");
applyInfoVO.setNewValue(applyVO.getNewIsLimitUpdateConsignee() ? "是" : "否");
list.add(applyInfoVO);
applyInfoVO = new ApplyInfoVO();
applyInfoVO.setName("锁定收货人天数");
applyInfoVO.setOrgValue(Objects.isNull(applyVO.getLockConsigneeDay()) ? "空" : applyVO.getLockConsigneeDay() + "天");
applyInfoVO.setNewValue(Objects.isNull(applyVO.getNewLockConsigneeDay()) ? "空" : applyVO.getNewLockConsigneeDay() + "天");
list.add(applyInfoVO);
}else if (orderApprovalDO.getType() == 62) {
ApplyInfoVO applyInfoVO;
if (applyVO.getIsLimitUpdateConsignee() != applyVO.getNewIsLimitUpdateConsignee()) {
applyInfoVO = new ApplyInfoVO();
applyInfoVO.setName("是否限制修改收货人");
applyInfoVO.setOrgValue(applyVO.getIsLimitUpdateConsignee() ? "是" : "否");
applyInfoVO.setNewValue(applyVO.getNewIsLimitUpdateConsignee() ? "是" : "否");
list.add(applyInfoVO);
}
if ((Objects.nonNull(applyVO.getLockConsigneeDay()) && Objects.nonNull(applyVO.getNewLockConsigneeDay())
&& !Objects.equals(applyVO.getLockConsigneeDay(), applyVO.getNewLockConsigneeDay()))
|| (Objects.isNull(applyVO.getLockConsigneeDay()) && Objects.nonNull(applyVO.getNewLockConsigneeDay()))
|| (Objects.nonNull(applyVO.getLockConsigneeDay()) && Objects.isNull(applyVO.getNewLockConsigneeDay()))) {
applyInfoVO = new ApplyInfoVO();
applyInfoVO.setName("锁定收货人天数");
applyInfoVO.setOrgValue(Objects.isNull(applyVO.getLockConsigneeDay()) ? "空" : applyVO.getLockConsigneeDay() + "天");
applyInfoVO.setNewValue(Objects.isNull(applyVO.getNewLockConsigneeDay()) ? "空" : applyVO.getNewLockConsigneeDay() + "天");
list.add(applyInfoVO);
}
} else if (orderApprovalDO.getType() == 62) {
msg = result == 3 ? "海外仓修改申请取消" : "海外仓修改申请拒绝";
ApplyInfoVO applyInfoVO = new ApplyInfoVO();
applyInfoVO.setName("订单修改为海外仓模式");
......@@ -523,17 +531,25 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
.set(OrderDO::getLockConsigneeTime, newLockConsigneeTime)
.eq(OrderDO::getOrderId, orderApprovalDO.getOrderId()));
msg = "收货人限制修改申请审批通过";
ApplyInfoVO applyInfoVO = new ApplyInfoVO();
applyInfoVO.setName("是否限制修改收货人");
applyInfoVO.setOrgValue(applyVO.getIsLimitUpdateConsignee() ? "是" : "否");
applyInfoVO.setNewValue(applyVO.getNewIsLimitUpdateConsignee() ? "是" : "否");
list.add(applyInfoVO);
applyInfoVO = new ApplyInfoVO();
applyInfoVO.setName("锁定收货人天数");
applyInfoVO.setOrgValue(Objects.isNull(applyVO.getLockConsigneeDay()) ? "空" : applyVO.getLockConsigneeDay() + "天");
applyInfoVO.setNewValue(Objects.isNull(applyVO.getNewLockConsigneeDay()) ? "空" : applyVO.getNewLockConsigneeDay() + "天");
list.add(applyInfoVO);
}else if (orderApprovalDO.getType() == 62) {
ApplyInfoVO applyInfoVO;
if (applyVO.getIsLimitUpdateConsignee() != applyVO.getNewIsLimitUpdateConsignee()) {
applyInfoVO = new ApplyInfoVO();
applyInfoVO.setName("是否限制修改收货人");
applyInfoVO.setOrgValue(applyVO.getIsLimitUpdateConsignee() ? "是" : "否");
applyInfoVO.setNewValue(applyVO.getNewIsLimitUpdateConsignee() ? "是" : "否");
list.add(applyInfoVO);
}
if ((Objects.nonNull(applyVO.getLockConsigneeDay()) && Objects.nonNull(applyVO.getNewLockConsigneeDay())
&& !Objects.equals(applyVO.getLockConsigneeDay(), applyVO.getNewLockConsigneeDay()))
|| (Objects.isNull(applyVO.getLockConsigneeDay()) && Objects.nonNull(applyVO.getNewLockConsigneeDay()))
|| (Objects.nonNull(applyVO.getLockConsigneeDay()) && Objects.isNull(applyVO.getNewLockConsigneeDay()))) {
applyInfoVO = new ApplyInfoVO();
applyInfoVO.setName("锁定收货人天数");
applyInfoVO.setOrgValue(Objects.isNull(applyVO.getLockConsigneeDay()) ? "空" : applyVO.getLockConsigneeDay() + "天");
applyInfoVO.setNewValue(Objects.isNull(applyVO.getNewLockConsigneeDay()) ? "空" : applyVO.getNewLockConsigneeDay() + "天");
list.add(applyInfoVO);
}
} else if (orderApprovalDO.getType() == 62) {
// TODO 海外仓修改申请
......@@ -607,16 +623,24 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
StringUtils.isNotBlank(orderCargoControlApplyVO.getCcIds()) ? orderCargoControlApplyVO.getCcIds().split(StrUtil.COMMA) : null);
orderApprovalDO.setFormId(formId);
msg = "收货人限制修改申请";
ApplyInfoVO applyInfoVO = new ApplyInfoVO();
applyInfoVO.setName("是否限制修改收货人");
applyInfoVO.setOrgValue(orderCargoControlApplyVO.getIsLimitUpdateConsignee() ? "是" : "否");
applyInfoVO.setNewValue(orderCargoControlApplyVO.getNewIsLimitUpdateConsignee() ? "是" : "否");
list.add(applyInfoVO);
applyInfoVO = new ApplyInfoVO();
applyInfoVO.setName("锁定收货人天数");
applyInfoVO.setOrgValue(Objects.isNull(orderCargoControlApplyVO.getLockConsigneeDay()) ? "空" : orderCargoControlApplyVO.getLockConsigneeDay() + "天");
applyInfoVO.setNewValue(Objects.isNull(orderCargoControlApplyVO.getNewLockConsigneeDay()) ? "空" : orderCargoControlApplyVO.getNewLockConsigneeDay() + "天");
list.add(applyInfoVO);
ApplyInfoVO applyInfoVO;
if (orderCargoControlApplyVO.getIsLimitUpdateConsignee() != orderCargoControlApplyVO.getNewIsLimitUpdateConsignee()) {
applyInfoVO = new ApplyInfoVO();
applyInfoVO.setName("是否限制修改收货人");
applyInfoVO.setOrgValue(orderCargoControlApplyVO.getIsLimitUpdateConsignee() ? "是" : "否");
applyInfoVO.setNewValue(orderCargoControlApplyVO.getNewIsLimitUpdateConsignee() ? "是" : "否");
list.add(applyInfoVO);
}
if ((Objects.nonNull(orderCargoControlApplyVO.getLockConsigneeDay()) && Objects.nonNull(orderCargoControlApplyVO.getNewLockConsigneeDay())
&& !Objects.equals(orderCargoControlApplyVO.getLockConsigneeDay(), orderCargoControlApplyVO.getNewLockConsigneeDay()))
|| (Objects.isNull(orderCargoControlApplyVO.getLockConsigneeDay()) && Objects.nonNull(orderCargoControlApplyVO.getNewLockConsigneeDay()))
|| (Objects.nonNull(orderCargoControlApplyVO.getLockConsigneeDay()) && Objects.isNull(orderCargoControlApplyVO.getNewLockConsigneeDay()))) {
applyInfoVO = new ApplyInfoVO();
applyInfoVO.setName("锁定收货人天数");
applyInfoVO.setOrgValue(Objects.isNull(orderCargoControlApplyVO.getLockConsigneeDay()) ? "空" : orderCargoControlApplyVO.getLockConsigneeDay() + "天");
applyInfoVO.setNewValue(Objects.isNull(orderCargoControlApplyVO.getNewLockConsigneeDay()) ? "空" : orderCargoControlApplyVO.getNewLockConsigneeDay() + "天");
list.add(applyInfoVO);
}
} else if (orderCargoControlApplyVO.getApplyType() == 62) {
orderApprovalDO.setOrderId(orderCargoControlApplyVO.getOrderId());
orderApprovalDO.setType(62);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment