From 2853811a1fdbc4e721b468b34c71f73a8f3b562f Mon Sep 17 00:00:00 2001 From: liufeilong Date: Fri, 10 Mar 2023 14:27:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=94=80=E6=96=B9=E7=BC=96=E7=A0=81+?= =?UTF-8?q?=E9=94=80=E6=96=B9=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thirdservice/user/service/impl/UserInfoServiceImpl.java | 3 +++ .../consumer/modules/smallapp/SmallAppQrcodeController.java | 2 +- .../order/consumer/openapi/protocol/v4/order/DdtxxBO.java | 4 ++++ .../service/impl/AllocateInvoiceInterfaceServiceImplV3.java | 1 + .../com/dxhy/order/consumer/utils/BeanTransitionUtils.java | 1 + .../src/main/resources/bootstrap-std.yaml | 2 +- 6 files changed, 11 insertions(+), 2 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java index d8ff9747..fd9d761d 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java @@ -284,6 +284,9 @@ public class UserInfoServiceImpl implements UserInfoService { r1.put(OrderManagementConstant.ALL_MESSAGE, "用户未完善企业信息"); return r1; } + taxPlayerCodeDeptListFilter.stream().forEach(f -> { + f.setName("("+f.getEnterpriseNumbers()+")"+f.getName()); + }); userEntity.setTaxplayercodeDeptList(taxPlayerCodeDeptListFilter); } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/smallapp/SmallAppQrcodeController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/smallapp/SmallAppQrcodeController.java index 21874270..d5e3b1d7 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/smallapp/SmallAppQrcodeController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/smallapp/SmallAppQrcodeController.java @@ -280,7 +280,7 @@ public class SmallAppQrcodeController { public R updateOrderStatus( @ApiParam(name = "pageRequestList", value = "需要同步数据数组") @RequestBody List pageRequestList) { - return orderInvoiceController.updateOrderStatus(pageRequestList); + return orderInvoiceController.updateOrderStatus(pageRequestList,null); } /** diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/order/DdtxxBO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/order/DdtxxBO.java index 1b061a4c..0d35f90f 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/order/DdtxxBO.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/order/DdtxxBO.java @@ -363,6 +363,10 @@ public class DdtxxBO implements Serializable { * 原始订单ID */ private String ORIGINORDERID; + /** + * 矿别 + */ + private String KB; } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java index cb7ffded..221a0468 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java @@ -857,6 +857,7 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt processInfo.setYzfp(ddtxx.getYZFP()); processInfo.setOriginDdh(ddtxx.getDDH()); processInfo.setOriginOrderId(processInfo.getOrderInfoId()); + processInfo.setKb(insertOrderItem.get(0).get(0).getKb()); } for(OrderItemInfo itemInfo:insertOrderItem.get(0)){ itemInfo.setPh(ddmxxx.get(0).getPH()); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index 65819df3..5b2f949c 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -3493,6 +3493,7 @@ public class BeanTransitionUtils { ddtxxBO.setPZGZRQ(req.getZGZRQ()); ddtxxBO.setYZFP(ConfigureConstant.STRING_0); ddtxxBO.setORIGINDDH(req.getZJSDH()); + ddtxxBO.setKB(req.getITITEM().get(0).getKTYPE()); //TODO lfl 清单标志怎么处理？ ddtxxBO.setQDBZ("0"); //明细信息 diff --git a/order-management-consumer/src/main/resources/bootstrap-std.yaml b/order-management-consumer/src/main/resources/bootstrap-std.yaml index 08db4069..1accef1d 100644 --- a/order-management-consumer/src/main/resources/bootstrap-std.yaml +++ b/order-management-consumer/src/main/resources/bootstrap-std.yaml @@ -54,7 +54,7 @@ spring: # Nacos discovery 配置 discovery: # Nacos discovery 服务地址 - server-addr: nacos-1.itax.local:33000 + server-addr: 172.31.36.147:33000 #sentinel配置相关 sentinel: #sentinel是否开启控制