From aa4a9c1aa4d6d0f986b108c20aee53e1dbae6183 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 26 一月 2026 14:17:06 +0800
Subject: [PATCH] 修改新增科目代码
---
service/src/main/java/com/ruoyi/cwgl/service/impl/InvoiceManageServiceImpl.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/InvoiceManageServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/InvoiceManageServiceImpl.java
index f70fb1d..68258df 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/InvoiceManageServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/InvoiceManageServiceImpl.java
@@ -15,6 +15,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.cwgl.domain.*;
import com.ruoyi.cwgl.domain.dto.CallbackReceiptDto;
+import com.ruoyi.cwgl.service.IInvoiceBillDetailService;
import com.ruoyi.cwgl.service.IInvoiceBusinessService;
import com.ruoyi.system.service.ISystemDataNoService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +54,9 @@
private InvoiceBillDetailMapper invoiceBillDetailMapper;
@Resource
+ private IInvoiceBillDetailService invoiceBillDetailService;
+
+ @Resource
private IInvoiceManageLogService invoiceManageLogService;
@Autowired
@@ -69,7 +73,8 @@
private String invoicingAddress;
@Value("${custom.gdpaasApi.returnAddress}")
private String returnAddress;
-
+ @Autowired
+ private IInvoiceBusinessService invoiceBusinessService;
/**
* 鏌ヨ鍙戠エ绠＄悊
*
@@ -176,7 +181,11 @@
@Override
public int updateInvoiceManage(InvoiceManage invoiceManage) {
invoiceManage.setUpdateTime(DateUtils.getNowDate());
+ // 鍒犻櫎鍘熸湁鐨勫彂绁ㄦ槑缁�
invoiceManageMapper.deleteInvoiceDetailByInvoiceManageId(invoiceManage.getId());
+ // 鍒犻櫎鍘熸湁鐨勫彂绁ㄤ笟鍔″晢鍝佹槑缁�
+ invoiceBillDetailService.deleteInvoiceBillDetailByInvoiceManageId(invoiceManage.getId());
+ // 鎻掑叆鏂扮殑鏄庣粏璁板綍
insertInvoiceDetail(invoiceManage);
int rows = invoiceManageMapper.updateInvoiceManage(invoiceManage);
@@ -377,8 +386,8 @@
for (InvoiceBillDetail billingDetail : invoiceBillDetails) {
InvoiceDetailApi invoiceDetail = new InvoiceDetailApi();
-
- invoiceDetail.setGoodsName(invoiceDetail.getGoodsName());
+ invoiceDetail.setGoodsCode(billingDetail.getGoodsCode());
+ invoiceDetail.setGoodsName(billingDetail.getGoodsName());
invoiceDetail.setWithTaxFlag(billingDetail.getWithTaxFlag().toString());
invoiceDetail.setTaxRate("0.06");
@@ -392,7 +401,10 @@
order.setInvoiceDetail(invoiceDetailList);
invoicingVo.setOrder(order);
String body = JSONObject.toJSONString(invoicingVo);
- String json = HttpUtil.post(invoicingAddress + "?businessType=" + businessType + "&returnUrl=" + returnAddress, body);
+ String urlString = invoicingAddress + "?businessType=" + businessType + "&returnUrl=" + returnAddress;
+ logger.info("璇锋眰body{}",body);
+ logger.info("璇锋眰鍦板潃{}",urlString);
+ String json = HttpUtil.post(urlString, body);
if (json == null) {
logger.info("寮�绁ㄥけ璐�");
@@ -400,7 +412,7 @@
}
JSONObject jsonObject = JSONObject.parseObject(json);
String code = jsonObject.getString("code");
-
+ logger.info("寮�绁ㄨ繑鍥瀧}",jsonObject);
String invoiceSerialNum = null;
InvoiceBusiness record = new InvoiceBusiness();
record.setReqData(JSONObject.toJSONString(invoicingVo));
@@ -414,8 +426,11 @@
logger.info("寮�绁ㄦ垚鍔熷彂绁ㄥ簭鍒楀彿涓簕}", invoiceSerialNum);
record.setInvoiceSerialNum(invoiceSerialNum);
record.setInvoiceManageId(invoiceManage.getId());
+ invoiceBusinessService.insertInvoiceBusiness(record);
return AjaxResult.success();
}
+
+
return AjaxResult.error("寮�绁ㄥけ璐�");
}
--
Gitblit v1.8.0