From 08095d9847f0cd612c3007f860e57e967278562e Mon Sep 17 00:00:00 2001
From: 李白 <7387820+wjli_13439841639@user.noreply.gitee.com>
Date: 星期二, 02 六月 2026 08:40:57 +0800
Subject: [PATCH] 修改bip提交和开票记录信息。
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/SaleCreditController.java | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/SaleCreditController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/SaleCreditController.java
index 2959929..fffadb8 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/SaleCreditController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/SaleCreditController.java
@@ -10,6 +10,9 @@
import com.by4cloud.platformx.admin.api.entity.SysDept;
import com.by4cloud.platformx.admin.api.feign.RemoteDeptService;
import com.by4cloud.platformx.business.entity.*;
+import com.by4cloud.platformx.business.entity.invoice.vo.BipResVo;
+import com.by4cloud.platformx.business.entity.invoice.vo.InvoicingVo;
+import com.by4cloud.platformx.business.invoice.service.BIPYsService;
import com.by4cloud.platformx.business.service.*;
import com.by4cloud.platformx.business.vo.ContractOutBoundVo;
import com.by4cloud.platformx.common.core.util.R;
@@ -27,6 +30,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
* 閿�鍞寕璐�
@@ -49,7 +53,8 @@
private final ContractSubjectMatterService contractSubjectMatterService;
private final RemoteDeptService remoteDeptService;
-
+ private final InvoiceService invoiceService;
+ private final BIPYsService bipYsService;
/**
@@ -136,9 +141,43 @@
contractOutBoundService.updateById(outBound);
}
saleCredit.setOutBoundIds(outBoundIds);
- saleCreditService.save(saleCredit);
+ saleCredit.setEntrustCode("JsNo"+System.currentTimeMillis());
+ saleCreditService.updateById(saleCredit);
- return R.ok("閿�鍞寕璐︾敓鎴愶紒");
+ //鐢熸垚vo
+ InvoicingVo invoicingVo = invoiceService.toGetByCompareByVo(saleCredit,contractOutBoundList);
+ try {
+ Map<String, Object> objectMap = invoiceService.toKaipiao(invoicingVo);
+ Boolean success = (Boolean) objectMap.get("success");
+ String message = (String) objectMap.get("message");
+ //System.out.println(saleCredit.getEntrustCode() + "鐨剅ailwayEntrust钃濆瓧寮�绁ㄧ粨鏋滀负锛�" + success + "------" + message);
+ if(success){
+ saleCredit.setBlueResultStatus(1);
+ saleCreditService.updateById(saleCredit);
+ //StringBuffer errMsg = new StringBuffer();
+ BipResVo bipResVo = bipYsService.sendBIPYs(saleCredit);
+ if (!bipResVo.getCode().equals("200")) {
+ /*if (StrUtil.isNotEmpty(errMsg)) {
+ errMsg.append(",");
+ }
+ errMsg.append(saleCredit.getCreditCodeB()+ "搴旀敹鍙戠エ鎺ㄩ�佸け璐�:" + bipResVo.getMessage());*/
+ return R.failed("寮�绁ㄦ垚鍔燂紝鎺ㄩ�乥ip澶辫触锛宔rr:" + bipResVo.getMessage());
+ }else{
+ return R.ok("寮�绁ㄦ垚鍔�,鎺ㄩ�乥ig鎴愬姛锛�");
+ }
+
+ }else{
+ saleCredit.setStatus(2);
+ saleCreditService.updateById(saleCredit);
+ return R.failed("寮�绁ㄥけ璐ワ紒鍘熷洜锛�" + message);
+ }
+
+ }catch (Exception e){
+ saleCredit.setStatus(3);
+ saleCreditService.updateById(saleCredit);
+ return R.failed("寮�绁ㄥけ璐ワ紒");
+ }
+ //return R.ok("閿�鍞寕璐︾敓鎴愶紒");
}
@@ -154,7 +193,6 @@
@SysLog("鎷兼帴閿�鍞寕璐�" )
@GetMapping("/generatorInvoice")
@PreAuthorize("@pms.hasPermission('business_saleCredit_view')" )
- @Inner(value = false)
public R generatorInvoice(@ParameterObject SaleCredit saleCredit) {
if(saleCredit.getContractId()==null){
return R.failed("鍚堝悓id涓嶈兘涓虹┖");
--
Gitblit v1.9.1