Commit 9eecacee authored by 332784038@qq.com's avatar 332784038@qq.com

批量订单费用申请审批结果更新问题修复

parent a2f2baf3
DROP TABLE IF EXISTS `ecw_batch_order_fee_apply`;
CREATE TABLE `ecw_batch_order_fee_apply` (
`id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
`no` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号',
`order_ids` varchar(512) NOT NULL COMMENT '订单ids(逗号连接)',
`details` json NOT NULL COMMENT '申请详情',
`reason` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '原因',
`state` tinyint DEFAULT 1 COMMENT '状态:0 已取消 1 申请中 2 已通过 3 已驳回',
......
......@@ -28,6 +28,10 @@ public class BatchOrderFeeApplyDO extends BaseDO {
* 编号
*/
private String no;
/**
* 订单ids字符串,多个订单id使用","连接,以方便查询使用
*/
private String orderIds;
/**
* 申请详情
*/
......
......@@ -6,6 +6,7 @@ import javax.annotation.Resource;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.generator.SnowflakeGenerator;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.apollo.core.event.Order.OrderApprovalTypeCheckEvent;
import cn.iocoder.yudao.framework.apollo.core.event.Order.OrderNumberLogEvent;
import cn.iocoder.yudao.framework.common.util.code.CodeUtils;
......@@ -77,15 +78,18 @@ public class BatchOrderFeeApplyServiceImpl extends AbstractService<BatchOrderFee
if (Objects.isNull(createReqVO.getBatchApplyDetailsInfoVO()) || CollectionUtil.isEmpty(createReqVO.getBatchApplyDetailsInfoVO().getOrderFeeDetailsVOList())) {
throw exception(BATCH_ORDER_FEE_APPLY_INFO_NOT_EXISTS);
}
List<Long> orderIds = new ArrayList<>();
for (BatchOrderFeeDetailsVO batchOrderFeeDetailsVO : createReqVO.getBatchApplyDetailsInfoVO().getOrderFeeDetailsVOList()) {
OrderApprovalTypeCheckEvent approvalTypeCheckEvent = new OrderApprovalTypeCheckEvent(batchOrderFeeDetailsVO.getOrderId(), null, expense_apply.getValue(), null, false);
applicationContext.publishEvent(approvalTypeCheckEvent);
if (approvalTypeCheckEvent.getResult()) {
throw exception(ORDER_IS_APPROVAL_IN_PROCESS);
}
orderIds.add(batchOrderFeeDetailsVO.getOrderId());
}
// 插入
BatchOrderFeeApplyDO batchOrderFeeApply = BatchOrderFeeApplyConvert.INSTANCE.convert(createReqVO);
batchOrderFeeApply.setOrderIds(orderIds.stream().map(String::valueOf).collect(Collectors.joining(StrUtil.COMMA)));
batchOrderFeeApply.setDetails(JsonUtils.toJsonString(createReqVO.getBatchApplyDetailsInfoVO()));
// 批量费用申请编号BFA+年份+月份+五位数;BFA240100001
String no = this.generateNo();
......@@ -215,6 +219,8 @@ public class BatchOrderFeeApplyServiceImpl extends AbstractService<BatchOrderFee
batchOrderFeeApply.setAuditTime(now);
batchOrderFeeApply.setUpdater(audit);
batchOrderFeeApply.setUpdateTime(now);
// 通用订单批量费用申请
OrderApprovalTypeResultEnum orderApprovalTypeResultEnum = OrderApprovalTypeResultEnum.typeAndResultOf(42, result);
if (result == 3 || result == 4) {
batchOrderFeeApply.setState(result);
batchOrderFeeApplyMapper.updateById(batchOrderFeeApply);
......@@ -237,7 +243,8 @@ public class BatchOrderFeeApplyServiceImpl extends AbstractService<BatchOrderFee
list.add(applyInfoVO);
}
orderBusinessService.addOrderOperateLog(batchOrderFeeDetailsVO.getOrderId(), "", "批量提交费用申请", list);
orderService.updateStatus(batchOrderFeeDetailsVO.getOrderId(), null, null, null, null, null, OrderApprovalTypeResultEnum.expense_apply_batch_order_processing.getType(), OrderApprovalTypeResultEnum.expense_apply_batch_order_processing.getDesc());
orderService.updateStatus(batchOrderFeeDetailsVO.getOrderId(), null, null, null, null, null, orderApprovalTypeResultEnum.getType(), orderApprovalTypeResultEnum.getDesc());
}
}
return;
......@@ -271,7 +278,7 @@ public class BatchOrderFeeApplyServiceImpl extends AbstractService<BatchOrderFee
list.add(applyInfoVO);
}
orderBusinessService.addOrderOperateLog(batchOrderFeeDetailsVO.getOrderId(), "", "批量提交费用申请", list);
orderService.updateStatus(batchOrderFeeDetailsVO.getOrderId(), null, null, null, null, null, OrderApprovalTypeResultEnum.expense_apply_batch_order_processing.getType(), OrderApprovalTypeResultEnum.expense_apply_batch_order_processing.getDesc());
orderService.updateStatus(batchOrderFeeDetailsVO.getOrderId(), null, null, null, null, null, orderApprovalTypeResultEnum.getType(), orderApprovalTypeResultEnum.getDesc());
}
}
}
......
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