Merge branch 'master-fix' into release

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java

@@ -2199,12 +2199,12 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                     throw exception(ORDER_UPDATE_APPROVAL_MUST_BE_WAREHOUSE_IN);
                 }
             }
-            if (isShipment) {
-                //  出货阶段的修改，需要将当前订单状态值标出，放首位
-                ApplyInfoVO applyInfoVO = new ApplyInfoVO();
-                applyInfoVO.setName(statusName);
-                applyInfoList.addFirst(applyInfoVO);
-            }
+//            if (isShipment) {
+//                //  出货阶段的修改，需要将当前订单状态值标出，放首位
+//                ApplyInfoVO applyInfoVO = new ApplyInfoVO();
+//                applyInfoVO.setName(statusName);
+//                applyInfoList.addFirst(applyInfoVO);
+//            }
             // 订单有修改则执行修改审批任务
             vo.setApplyInfoList(applyInfoList);
             orderApprovalDO = new OrderApprovalDO();
@@ -4409,7 +4409,12 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
             currentOrderDO.setAuditResult(auditResult);
             if (StringUtils.isNotBlank(auditResult)) {
                 // 获取固定中文说明描述
-                msg = I18nMessage.getZhMessage(auditResult);
+                // 这里针对订单修改审批业务需要补充，当订单在出货阶段进行编辑审批时，需要
+                msg = (((Objects.equals(auditResult,order_update_processing.getDesc())
+                        || Objects.equals(auditResult,order_update_pass.getDesc())
+                        || Objects.equals(auditResult,order_update_reject.getDesc())
+                        || Objects.equals(auditResult,order_update_cancel.getDesc()))
+                        && currentOrderDO.getShipmentState() > 0) ? OrderStatusEnum.valueOf(status).getNameZh().concat("-"): "").concat(I18nMessage.getZhMessage(auditResult));
             }
             if (auditType == 0) {
                 this.checkOrderProcessingApprovalType(currentOrderDO, auditType, auditResult);