From 238ad8112dc926eeaad8e327607eeba7858b8a48 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期二, 14 一月 2025 21:31:31 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java index 68e163e..9c40947 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java @@ -251,7 +251,7 @@ @Override @Transactional(rollbackFor = Exception.class) - public void writeOff(String id,Integer shopId, Integer technicianId) { + public void writeOff(String id,Integer shopId, String technicianId) { LoginUser loginUserApplet = tokenService.getLoginUserApplet(); Order order = orderMapper.selectById(id); boolean check = check(order, shopId, loginUserApplet.getUserid()); @@ -276,7 +276,9 @@ order.setAfterSaleTime(LocalDateTime.now().plusDays(days)); order.setEndTime(LocalDateTime.now()); order.setCancellerAppUserId(loginUserApplet.getUserid()); - order.setTechnicianId(technicianId); + if(StringUtils.isNotEmpty(technicianId) && !"null".equals(technicianId)){ + order.setTechnicianId(Integer.valueOf(technicianId)); + } orderMapper.updateById(order); } -- Gitblit v1.7.1