feature：批量合并明细

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<TaxPlayerCodeDept> taxplayercodeDeptList = userEntity.getTaxplayercodeDeptList();
+                List<TaxPlayerCodeDept> taxplayercodeDeptList = userEntity.getTaxplayercodeDeptList();
                 if(ObjectUtil.isNotEmpty(taxplayercodeDeptList)){
-            //同步大B或用户中心实体组织信息到发票组织管理表
+                    //同步大B或用户中心实体组织信息到发票组织管理表
-            syncPhysicalGroupManagement(taxplayercodeDeptList);
+                    syncPhysicalGroupManagement(taxplayercodeDeptList);
-            }
+                }
             }
 
         }

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));
             }
         }