From a8127afa0987448e30ada337bd80fece4889310b Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 26 May 2023 16:47:22 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E6=89=B9=E9=87=8F=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thirdservice/user/controller/UserController.java | 8 ++++---- .../modules/order/service/impl/OrderInfoServiceImpl.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java index 8083bae0..a8dd2157 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java @@ -65,11 +65,11 @@ public class UserController { if(ConfigureConstant.STRING_0000.equals(r.get(OrderManagementConstant.CODE))){ UserEntity userEntity = (UserEntity) r.get(OrderManagementConstant.DATA); if(ObjectUtil.isNotNull(userEntity)){ - List taxplayercodeDeptList = userEntity.getTaxplayercodeDeptList(); + List taxplayercodeDeptList = userEntity.getTaxplayercodeDeptList(); if(ObjectUtil.isNotEmpty(taxplayercodeDeptList)){ - //同步大B或用户中心实体组织信息到发票组织管理表 - syncPhysicalGroupManagement(taxplayercodeDeptList); - } + //同步大B或用户中心实体组织信息到发票组织管理表 + syncPhysicalGroupManagement(taxplayercodeDeptList); + } } } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index 6c702886..fb086c14 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -1943,11 +1943,11 @@ public class OrderInfoServiceImpl implements OrderInfoService { try { R r = mergeOrderItem(orderInfoId, entId, null); if(!ConfigureConstant.STRING_0000.equals(r.getCode())){ - return R.error("结算单号{}明细行合并失败",ddh); + return R.error(String.format("结算单号%s明细行合并失败",ddh)); } } catch (Exception e) { log.error("批量合并报错orderInfoId:{},entId:{},报错信息:{}",orderInfoId,entId,e.getMessage()); - return R.error("结算单号{}明细行合并失败",ddh); + return R.error(String.format("结算单号%s明细行合并失败",ddh)); } }