Skip to content

J
jiedao-api-boot-master
Commit e6281777 authored by 332784038@qq.com's avatar 332784038@qq.com
Browse files
Options

Merge branch 'master-fix' into release

parents d3d79bf1 14e7e9f8
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @ e6281777
...@@ -4414,7 +4414,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -4414,7 +4414,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
|| Objects.equals(auditResult,order_update_pass.getDesc()) || Objects.equals(auditResult,order_update_pass.getDesc())
|| Objects.equals(auditResult,order_update_reject.getDesc()) || Objects.equals(auditResult,order_update_reject.getDesc())
|| Objects.equals(auditResult,order_update_cancel.getDesc())) || Objects.equals(auditResult,order_update_cancel.getDesc()))
&& currentOrderDO.getShipmentState() > 0) ? OrderStatusEnum.valueOf(status).getNameZh().concat("-"): "").concat(I18nMessage.getZhMessage(auditResult)); && currentOrderDO.getShipmentState() > 0) ? OrderStatusEnum.valueOf(currentOrderDO.getStatus()).getNameZh().concat("-"): "").concat(I18nMessage.getZhMessage(auditResult));
} }
if (auditType == 0) { if (auditType == 0) {
this.checkOrderProcessingApprovalType(currentOrderDO, auditType, auditResult); this.checkOrderProcessingApprovalType(currentOrderDO, auditType, auditResult);
......
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