From 7ff3054dc95e5b303238c498b69d3372194e8008 Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Sat, 6 Dec 2025 08:58:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=97=E6=AD=A7nc65=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RemoteUserFeignFallbackFactory.java | 7 ++++ .../user/interfaces/dto/addDTO/UserDTO.java | 4 +-- .../interfaces/dto/addDTO/UserShipperDTO.java | 2 +- .../src/main/resources/bootstrap.yml | 6 ++-- .../src/main/resources/mapper/UserMapper.xml | 2 +- .../resources/mapper/UserShipperMapper.xml | 2 +- .../persistence/ReconciliationImpl.java | 36 +++++++++++-------- .../repository/po/ReconciliationPO.java | 23 ++++++++++++ .../repository/todo/ReconciliationDO.java | 24 +++++++++++++ .../reconciliation/ReconciliationMapper.xml | 4 +++ .../src/main/resources/bootstrap.yml | 8 ++--- 11 files changed, 93 insertions(+), 25 deletions(-) diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java index b684711fa..77bfe8859 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java @@ -162,6 +162,13 @@ public class RemoteUserFeignFallbackFactory implements FallbackFactory getUserByTopOrganizationUserPhone(@RequestBody UserDTO userDTO, String source) { return R.fail("获取组织用户失败:" + throwable.getMessage()); } + + @Override + public AjaxResult getShipperSummaryData(Long userId) { + return AjaxResult.error("查询失败" + throwable.getMessage()); + + + } }; } } diff --git a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java index 31b0bd748..39e50a0e9 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java +++ b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java @@ -236,9 +236,9 @@ public class UserDTO extends BaseVOEntity { @ApiModelProperty(name = "有效期管理 0-否 1-是") private Integer validityPeriodManagement; - @ApiModelProperty(name = "业务员nc编码") + @ApiModelProperty("业务员nc编码") private String salespersonNcCode; - @ApiModelProperty(name = "制单员nc编码") + @ApiModelProperty( "制单员nc编码") private String documentPreparerNcCode; } diff --git a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserShipperDTO.java b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserShipperDTO.java index 20b19ea1c..2a62458b4 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserShipperDTO.java +++ b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserShipperDTO.java @@ -191,7 +191,7 @@ public class UserShipperDTO extends UserDTO { @ApiModelProperty(name = "备注信息") private String remark; - @ApiModelProperty(name = "客户nc编码") + @ApiModelProperty("客户nc编码") private String customerNcCode; } diff --git a/mhd-user-center/src/main/resources/bootstrap.yml b/mhd-user-center/src/main/resources/bootstrap.yml index 05d2b28f9..611627ee0 100644 --- a/mhd-user-center/src/main/resources/bootstrap.yml +++ b/mhd-user-center/src/main/resources/bootstrap.yml @@ -18,13 +18,15 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 #server-addr: mhd-nacos:8848 + server-addr: 116.204.23.92:8848 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 #server-addr: mhd-nacos:8848 + server-addr: 116.204.23.92:8848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd-user-center/src/main/resources/mapper/UserMapper.xml b/mhd-user-center/src/main/resources/mapper/UserMapper.xml index 3fa3eb134..5a9bf9cae 100644 --- a/mhd-user-center/src/main/resources/mapper/UserMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserMapper.xml @@ -75,7 +75,7 @@ a.department_id, a.ding_user_id, a.ding_dept_id, - a.validity_period_management + a.validity_period_management,a.salesperson_nc_code,a.document_preparer_nc_code FROM `user` a where a.del_flag = 1 diff --git a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml index 52a0030e3..a1dd77223 100644 --- a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml @@ -139,7 +139,7 @@ b.monthly_settlement_flag, a.user_auth_status, b.original_receipt_flag, - b.freight_node + b.freight_node,b.customer_nc_code FROM `user` a LEFT JOIN `user_shipper` b ON a.user_id = b.user_id left join (select user_id, GROUP_CONCAT(r.role_name separator '&') roleName diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java index 70a1477aa..ce0d48350 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java @@ -38,6 +38,7 @@ import com.mhd.common.core.web.domain.AjaxResult; import com.mhd.common.security.utils.SecurityUtils; import com.mhd.system.api.UserServiceFeign; import com.mhd.system.api.WlhyServiceFeign; +import com.mhd.system.api.domain.TmsTransportNote; import com.mhd.system.api.model.LoginUser; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; @@ -409,6 +410,12 @@ public class ReconciliationImpl extends ServiceImpl list=result.getData(); if(ObjectUtil.isNotNull(list)){ for(TmsOrder tmsOrder:list){ + R ajaxResult1=wlhyServiceFeign.selectByOrderNum(tmsOrder.getGoodsNumber()); + if(ajaxResult1.getCode()==200){ + TmsTransportNote tmsTransportNote= ajaxResult1.getData(); + date=tmsTransportNote.getPaperReceiptTime(); + dateString = sdf.format(date); + } AjaxResult ajaxResult=userServiceFeign.getShipperSummaryData(Long.valueOf(reconciliation.getSettlementPartyId())); if(ajaxResult.get("code").equals("200")){ UserShipperPo userShipperPo= (UserShipperPo) ajaxResult.get("data"); @@ -488,6 +495,19 @@ public class ReconciliationImpl extends ServiceImpl and a.invoice_apply_status = #{invoiceApplyStatus} + + and a.synchronous_status = #{synchronousStatus} + + and a.sk_synchronous_status = #{skSynchronousStatus} and a.verification_money = #{verificationMoney} diff --git a/mhd_transport/src/main/resources/bootstrap.yml b/mhd_transport/src/main/resources/bootstrap.yml index 8599d2f67..45d645557 100644 --- a/mhd_transport/src/main/resources/bootstrap.yml +++ b/mhd_transport/src/main/resources/bootstrap.yml @@ -18,13 +18,13 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置使用ip+端口号 - #server-addr: 10.33.0.129:6000 + server-addr: 10.33.0.129:6010 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置使用ip+端口号 - #server-addr: 10.33.0.129:6000 + server-addr: 10.33.0.129:6010 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置