From 8dbfe9877e0b597ec35ac6809e4941aa5596e375 Mon Sep 17 00:00:00 2001 From: yefei Date: Thu, 27 Apr 2023 15:55:25 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E6=9B=B4=E6=96=B0=E5=BD=B1=E5=93=8D?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap-dev.yaml | 20 ++++++++++--------- .../controller/SDNYMainProcessController.java | 17 ++++++++++++---- .../src/main/resources/bootstrap-dev.yaml | 20 ++++++++++--------- 3 files changed, 35 insertions(+), 22 deletions(-) diff --git a/dxhy-core/src/main/resources/bootstrap-dev.yaml b/dxhy-core/src/main/resources/bootstrap-dev.yaml index 1ccc7858..8b249614 100644 --- a/dxhy-core/src/main/resources/bootstrap-dev.yaml +++ b/dxhy-core/src/main/resources/bootstrap-dev.yaml @@ -4,22 +4,24 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 10.1.2.202:8848 + server-addr: 172.31.36.147:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c + namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6 # Nacos config 分组 group: dxhy-core-group # Nacos config 登录用户名 - username: dxhy-jxpt + username: nacos # Nacos config 登录密码 - password: dxhy-jxpt + password: Invoice.nacos.!1 # Nacos config 配置文件前缀 - prefix: dxhy-core + prefix: dxhy-erp # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 10.1.2.202:8848 - username: dxhy-jxpt - password: dxhy-jxpt - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file + server-addr: 172.31.36.147:33000 + # Nacos config 登录用户名 + username: nacos + # Nacos config 登录密码 + password: Invoice.nacos.!1 + namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6 \ No newline at end of file diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index ebc31dca..799d86aa 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -16,10 +16,7 @@ import com.dxhy.common.utils.Base64Encoding; import com.dxhy.common.utils.R; import com.dxhy.common.vo.Tax; import com.dxhy.common.vo.TaxOrgCode; -import com.dxhy.erp.dao.CustomsRecordDao; -import com.dxhy.erp.dao.GsClientMapper; -import com.dxhy.erp.dao.RecordInvoiceDao; -import com.dxhy.erp.dao.TdxSaleRecordInvoiceDao; +import com.dxhy.erp.dao.*; import com.dxhy.erp.entity.*; import com.dxhy.erp.entity.sdny.*; import com.dxhy.erp.service.*; @@ -84,6 +81,9 @@ public class SDNYMainProcessController extends AbstractController { @Resource private CustomsRecordDao customsRecordDao; + @Resource + private BaseTDxRecordInvoiceDao baseTDxRecordInvoiceDao; + @Resource private RecordInvoiceDao recordInvoiceDao; @@ -480,6 +480,15 @@ public class SDNYMainProcessController extends AbstractController { return ResponseEntity.ok(JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_PUSH_SDNY))); } } else { + DynamicContextHolder.push(dbName + DbConstant.BUSINESS_WRITE); + //删除对应的影像号 + QueryWrapper recordWrapper = new QueryWrapper<>(); + recordWrapper.eq("image_id", imageId); + BaseTDxRecordInvoice recordInvoice = new BaseTDxRecordInvoice(); + recordInvoice.setImageId(""); + recordInvoice.setCompCode(""); + baseTDxRecordInvoiceDao.update(recordInvoice, recordWrapper); + R data = new R(1000, "default success"); data.put("data", result); return ResponseEntity.ok(JSONObject.toJSONString(data)); diff --git a/dxhy-operation-flow/src/main/resources/bootstrap-dev.yaml b/dxhy-operation-flow/src/main/resources/bootstrap-dev.yaml index 780b661c..88b7634e 100644 --- a/dxhy-operation-flow/src/main/resources/bootstrap-dev.yaml +++ b/dxhy-operation-flow/src/main/resources/bootstrap-dev.yaml @@ -4,22 +4,24 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 10.1.2.202:8848 + server-addr: 172.31.36.147:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c + namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6 # Nacos config 分组 group: dxhy-flow-group # Nacos config 登录用户名 - username: dxhy-jxpt + username: nacos # Nacos config 登录密码 - password: dxhy-jxpt + password: Invoice.nacos.!1 # Nacos config 配置文件前缀 - prefix: dxhy-flow + prefix: dxhy-erp # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 10.1.2.202:8848 - username: dxhy-jxpt - password: dxhy-jxpt - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file + server-addr: 172.31.36.147:33000 + # Nacos config 登录用户名 + username: nacos + # Nacos config 登录密码 + password: Invoice.nacos.!1 + namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6 \ No newline at end of file