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/InvoiceResultController.java | 100 ++++++++++++++++++++++++++++++-------------------
1 files changed, 61 insertions(+), 39 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/InvoiceResultController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/InvoiceResultController.java
index 3bf5bd6..90f3dfd 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/InvoiceResultController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/InvoiceResultController.java
@@ -1,12 +1,15 @@
package com.by4cloud.platformx.business.controller;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.by4cloud.platformx.business.entity.ContractOutBound;
import com.by4cloud.platformx.business.entity.SaleCredit;
import com.by4cloud.platformx.business.entity.invoice.InvoiceResult;
import com.by4cloud.platformx.business.entity.invoice.InvoiceResultItem;
-import com.by4cloud.platformx.business.entity.invoice.InvoicingVo;
+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.invoice.service.FpInvoiceResultItemService;
import com.by4cloud.platformx.business.service.ContractOutBoundService;
import com.by4cloud.platformx.business.service.InvoiceService;
@@ -42,6 +45,7 @@
private final InvoiceService invoiceService;
private final SaleCreditService saleCreditService;
private final ContractOutBoundService contractOutBoundService;
+ private final BIPYsService bipYsService;
@Operation(summary = "鎺ㄩ�佸簲浠樿摑绁�" , description = "鎺ㄩ�佸簲浠樿摑绁�" )
@GetMapping("/pushYfBlue" )
@@ -103,15 +107,26 @@
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);
+ //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.ok("寮�绁ㄦ垚鍔燂紒");
- }else{
- saleCredit.setStatus(3);
- saleCreditService.updateById(saleCredit);
- return R.failed("寮�绁ㄥけ璐ワ紒");
+ return R.failed("寮�绁ㄥけ璐ワ紒鍘熷洜锛�" + message);
}
}catch (Exception e){
@@ -124,47 +139,49 @@
@Operation(summary = "鍙戠エ鏌ョ湅" , description = "鍙戠エ鏌ョ湅" )
@GetMapping("/downInvoice" )
public R downInvoice(String code) {
+ SaleCredit saleCredit = saleCreditService.getOne(new LambdaQueryWrapper<SaleCredit>()
+ .eq(SaleCredit::getEntrustCode, code)
+ .last("limit 1")
+ );
QueryWrapper<InvoiceResult> invoiceResultQueryWrapper = new QueryWrapper<>();
invoiceResultQueryWrapper.lambda()
- .eq(InvoiceResult::getEntrustCode,code)
- .eq(InvoiceResult::getMethodName,"钃濆瓧寮�绁ㄦ帴鍙�")
- .eq(InvoiceResult::getSuccess,1)
+ .eq(InvoiceResult::getEntrustCode, code)
+ .eq(InvoiceResult::getMethodName, "钃濆瓧寮�绁ㄦ帴鍙�")
+ .eq(InvoiceResult::getSuccess, 1)
.orderByDesc(InvoiceResult::getCreateTime);
List<InvoiceResult> list = invoiceService.list(invoiceResultQueryWrapper);
- if(list !=null && list.size()>0){
+ if (list != null && list.size() > 0) {
InvoiceResult result = list.get(0);
Map<String, Object> objectMap = invoiceService.downInvoiceMethod(result);
Boolean success = (Boolean) objectMap.get("success");
String message = (String) objectMap.get("message");
- if(success){
-// if(result.getPushBip()==null||result.getPushBip()!=1){
-// QueryWrapper<RailwayEntrust> wrapper = new QueryWrapper<>();
-// wrapper.lambda()
-// .eq(RailwayEntrust::getEntrustCode,code);
-// List<RailwayEntrust> railwayEntrusts = railwayEntrustService.list(wrapper);
-// if(railwayEntrusts !=null && railwayEntrusts.size()>0){
-// RailwayEntrust railwayEntrust = railwayEntrusts.get(0);
-// System.out.println(railwayEntrust.getEntrustCode()+"寮�濮嬫帹閫乥ip钃濈エ");
-// try {
-// pushBip(railwayEntrust.getId(),railwayEntrust.getInvoicUrl());
-// System.out.println(railwayEntrust.getEntrustCode()+"鎺ㄩ�乥ip钃濈エ鎴愬姛");
-// result.setPushBip(1);
-// result.setPushBipyf(1);
-// invoiceResultService.updateById(result);
-// }catch (Exception e){
-// e.printStackTrace();
-// }
-// }
-// }
- return R.ok(objectMap);
- }else {
- return R.failed(message);
+ if (success) {
+ if (result.getPushBip() == null || result.getPushBip() != 1) {
+ try {
+ boolean b = invoiceService.pushBlue(saleCredit.getId(), 1);
+ if (b) {
+ //System.out.println(railwayEntrust.getEntrustCode() + "鎺ㄩ�乥ip钃濈エ鎴愬姛");
+ result.setPushBip(1);
+ result.setPushBipyf(1);
+ invoiceService.updateById(result);
+ return R.ok("鏌ョ湅钃濈エ鎴愬姛锛屾帹閫乥ip钃濈エ鎴愬姛锛�");
+ }else{
+ return R.failed("鏌ョ湅钃濈エ鎴愬姛锛屾帹閫乥ip钃濈エ澶辫触锛�");
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ return R.failed("鏌ョ湅钃濈エ鎴愬姛锛屾帹閫乥ip钃濈エ澶辫触锛�");
+ }
+ }
+ return R.ok("鏌ョ湅钃濈エ鎴愬姛锛�");
+
+ } else{
+ return R.failed("鏌ョ湅钃濈エ澶辫触锛乪rr:" + message);
}
}else {
return R.failed("鏈煡璇㈠埌寮�绁ㄨ褰�");
}
}
-
/**
* 鍘诲紑绾㈢エ
@@ -236,7 +253,7 @@
}
}
- /* @Operation(summary = "绾㈠啿纭鍗�" , description = "绾㈠啿纭鍗�" )
+ @Operation(summary = "绾㈠啿纭鍗�" , description = "绾㈠啿纭鍗�" )
@PostMapping("/redConfirm" )
public R redConfirm(@RequestBody InvoicingVo vo) {
@@ -253,16 +270,21 @@
Boolean success = (Boolean) objectMap.get("success");
String message = (String) objectMap.get("message");
if(success){
- return R.ok(null,message);
+ BipResVo bipResVo = bipYsService.removeBipInvoice(saleCredit.getBlueInvoiceResultId().toString(),saleCredit.getEntrustCode(),6);
+ if(bipResVo.getCode().equals("200")){
+ return R.ok("寮�绾㈢エ鎴愬姛锛宐ip鍒犻櫎鎴愬姛锛�");
+ }else{
+ return R.ok("寮�绾㈢エ鎴愬姛锛宐ip鍒犻櫎澶辫触,err:" + bipResVo.getMessage());
+ }
}else {
- return R.failed(null,message);
+ return R.failed(null,"寮�绁ㄥけ璐ワ紝err:" + message);
}
}catch (Exception e){
e.printStackTrace();
return R.failed("寮�绾㈢エ澶辫触");
}
- }*/
+ }
//鍙戠孩鍐蹭箣鍓嶏紝鍏堣繘琛岀孩绁ㄧ‘璁ゃ��
@Operation(summary = "绾㈠啿鍙戠エform" , description = "绾㈠啿鍙戠エform" )
--
Gitblit v1.9.1