From dd4284136cb12dc3c2e498e0f0ff002d553763af Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期二, 25 八月 2026 15:35:41 +0800
Subject: [PATCH] feat:feat:新增降点损 赊销业务均使用代储
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java | 1261 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 1,049 insertions(+), 212 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java
index d2bb434..9085c51 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java
@@ -1,18 +1,19 @@
package com.by4cloud.platformx.business.service.impl;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.StreamProgress;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpResponse;
import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -23,6 +24,7 @@
import com.by4cloud.platformx.business.dto.ContractInvoiceQueryDTO;
import com.by4cloud.platformx.business.dto.ContractQueryDTO;
import com.by4cloud.platformx.business.dto.GenInvoiceInfoDTO;
+import com.by4cloud.platformx.business.dto.InvoiceQueryDTO;
import com.by4cloud.platformx.business.entity.*;
import com.by4cloud.platformx.business.mapper.*;
import com.by4cloud.platformx.business.service.ContractInvoiceService;
@@ -30,20 +32,18 @@
import com.by4cloud.platformx.business.vo.*;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.data.datascope.DataScope;
-import com.by4cloud.platformx.common.data.mybatis.BaseModel;
import com.by4cloud.platformx.common.security.util.SecurityUtils;
import com.by4cloud.platformx.flow.task.dto.ProcessInstanceParamDto;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springdoc.core.annotations.ParameterObject;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.GetMapping;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
@@ -55,6 +55,7 @@
public class ContractInvoiceServiceImpl extends ServiceImpl<ContractInvoiceMapper, ContractInvoice> implements ContractInvoiceService {
private final ContractMapper contractMapper;
+ private final ContractSubjectMatterMapper contractSubjectMatterMapper;
private final BusinessCustomerMapper businessCustomerMapper;
private final ContractOutBoundMapper contractOutBoundMapper;
private final PaymentConfirmMapper paymentConfirmMapper;
@@ -67,7 +68,7 @@
private final RemoteDeptService remoteDeptService;
private final RemoteFlowProcessService remoteFlowProcessService;
private final PaymentConfirmService paymentConfirmService;
- private final RedisTemplate redisTemplate;
+ private final StringRedisTemplate redisTemplate;
@Value("${BWInvoice.url}")
@@ -85,6 +86,9 @@
@Value("${bip.appSecret}")
private String appSecret;
+ @Value("${file.path}")
+ private String localPath;
+
@Override
public R getContractOutBound(Long contractId) {
@@ -92,9 +96,35 @@
.selectAll(ContractOutBound.class)
.eq(ContractOutBound::getContractId, contractId);
List<ContractInvoiceOutBoundVo> invoiceOutBoundVoList = contractOutBoundMapper.selectJoinList(ContractInvoiceOutBoundVo.class, wrapper);
- if (ArrayUtil.isNotEmpty(invoiceOutBoundVoList.toArray())) {
+ if (CollUtil.isNotEmpty(invoiceOutBoundVoList)) {
invoiceOutBoundVoList.stream().forEach(contractInvoiceOutBoundVo -> {
+
contractInvoiceOutBoundVo.setInvoiceNum(contractInvoiceOutBoundVo.getOutBoundNum().subtract(contractInvoiceOutBoundVo.getInvoiceNum()));
+ ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId, contractId)
+ .eq(ContractSubjectMatter::getMaterialCode, contractInvoiceOutBoundVo.getSubjectMatterCode())
+ .eq(StrUtil.isNotBlank(contractInvoiceOutBoundVo.getLineNo()), ContractSubjectMatter::getLineNo, contractInvoiceOutBoundVo.getLineNo())
+ .last("limit 1"));
+ if (ObjUtil.isNotNull(subjectMatter) && subjectMatter.getAdvanceNum().compareTo(new BigDecimal("0")) > 0) {
+ contractInvoiceOutBoundVo.setInvoiceNum(contractInvoiceOutBoundVo.getOutBoundNum().subtract(subjectMatter.getAdvanceNum()));
+ }
+ contractInvoiceOutBoundVo.setToInvoiceNum(contractInvoiceOutBoundVo.getInvoiceNum());
+ });
+ }
+ return R.ok(invoiceOutBoundVoList);
+ }
+
+ @Override
+ public R getContractAdvance(Long contractId) {
+ MPJLambdaWrapper<ContractSubjectMatter> wrapper = new MPJLambdaWrapper<ContractSubjectMatter>()
+ .selectAll(ContractSubjectMatter.class)
+ .selectAs(ContractSubjectMatter::getMaterialCode, "subjectMatterCode")
+ .selectAs(ContractSubjectMatter::getMaterialName, "subjectMatterName")
+ .selectAs(ContractSubjectMatter::getQuantity, "outBoundNum")
+ .eq(ContractSubjectMatter::getContractId, contractId);
+ List<ContractInvoiceOutBoundVo> invoiceOutBoundVoList = contractSubjectMatterMapper.selectJoinList(ContractInvoiceOutBoundVo.class, wrapper);
+ if (ArrayUtil.isNotEmpty(invoiceOutBoundVoList)) {
+ invoiceOutBoundVoList.stream().forEach(contractInvoiceOutBoundVo -> {
+ contractInvoiceOutBoundVo.setInvoiceNum(contractInvoiceOutBoundVo.getOutBoundNum().subtract(contractInvoiceOutBoundVo.getAdvanceNum()));
contractInvoiceOutBoundVo.setToInvoiceNum(contractInvoiceOutBoundVo.getInvoiceNum());
});
}
@@ -113,14 +143,49 @@
@Override
public R genInvoiceInfo(GenInvoiceInfoDTO genInvoiceInfoDTO) {
- if (ArrayUtil.isEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList())) {
+ if (CollUtil.isEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList())) {
return R.failed("璇烽�夋嫨寮�绁ㄥ嚭搴撳崟鍚庡啀鎿嶄綔");
}
Long contractId = null;
- if (!StrUtil.equals(genInvoiceInfoDTO.getContractCategory(),"water_house")) {
+ //棰勬敹娆惧紑绁�
+ if (StrUtil.isNotBlank(genInvoiceInfoDTO.getContractId())) {
+ ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery()
+ .eq(ContractPaymentSchedule::getStageName, "鍚堝悓绛捐").eq(ContractPaymentSchedule::getContractId, genInvoiceInfoDTO.getContractId())
+ .last("limit 1"));
+ if (ObjUtil.isNull(schedule)) {
+ return R.failed("鍚堝悓棰勬敹娆鹃樁娈靛紓甯革紝璇疯仈绯绘妧鏈汉鍛�");
+ }
+ Contract contract = contractMapper.selectById(genInvoiceInfoDTO.getContractId());
+ if (ObjUtil.isNull(contract)) {
+ return R.failed("鍚堝悓淇℃伅寮傚父锛岃鑱旂郴鎶�鏈汉鍛�");
+ }
+ R<SysDept> r = remoteDeptService.getById(contract.getPartyBId());
+ if (!r.isOk()) {
+ return R.failed("鑾峰彇寮�绁ㄥ崟浣嶅紓甯�");
+ }
+ SysDept b = r.getData();
+ BigDecimal advanceAmount = new BigDecimal("0");
+ for (ContractOutBoundInvoiceVo contractOutBoundInvoiceVo : genInvoiceInfoDTO.getOutBoundInvoiceList()) {
+ ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
+ if (ObjUtil.isNotNull(subjectMatter)) {
+ advanceAmount = advanceAmount.add(contractOutBoundInvoiceVo.getInvoiceNum().multiply(subjectMatter.getUnitPrice()));
+ }
+ }
+ log.info("advanceAmount:{}", advanceAmount);
+ log.info("schedule.getPlannedAmount:{}", schedule.getPlannedAmount());
+ if (advanceAmount.compareTo(schedule.getPlannedAmount()) > 0) {
+ return R.failed("寮�绁ㄩ噾棰濊秴鍑哄悎鍚岀璁㈤樁娈靛簲鏀堕噾棰�:" + schedule.getPlannedAmount() + ",璇疯皟鏁村紑绁ㄦ暟閲�");
+ }
+ GenInvoiceInfoVo vo = genAdvanceInvoiceInfoVo(genInvoiceInfoDTO, contract, b);
+
+ return R.ok(vo);
+ }
+
+ //姝ｅ父浜у搧寮�绁�
+ if (!StrUtil.equals(genInvoiceInfoDTO.getContractCategory(), "water_house")) {
ContractOutBound outBound = contractOutBoundMapper.selectById(genInvoiceInfoDTO.getOutBoundInvoiceList().get(0).getContractOutBoundId());
contractId = outBound.getContractId();
- }else {
+ } else {
ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(genInvoiceInfoDTO.getOutBoundInvoiceList().get(0).getContractOutBoundId());
contractId = schedule.getContractId();
}
@@ -133,9 +198,91 @@
return R.failed("鑾峰彇寮�绁ㄥ崟浣嶅紓甯�");
}
SysDept b = r.getData();
+ //鏈哄姩杞﹀紑绁�
+ if (StrUtil.equals(genInvoiceInfoDTO.getInvoiceType(), "3") || StrUtil.equals(genInvoiceInfoDTO.getInvoiceType(), "4")) {
+ if (StrUtil.isBlank(genInvoiceInfoDTO.getVehicleNo())) {
+ return R.failed("鏈哄姩杞﹀紑绁ㄨ杈撳叆杞︽灦鍙�");
+ }
+ BigDecimal invoiceNumSum = genInvoiceInfoDTO.getOutBoundInvoiceList().stream().map(item -> item.getInvoiceNum()).reduce(BigDecimal.ZERO, BigDecimal::add);
+ if (invoiceNumSum.compareTo(new BigDecimal("1")) > 0) {
+ return R.failed("鏈哄姩杞﹀紑绁ㄥ彧鑳�1娆″紑1杈�");
+ }
+ JSONObject request = genQueryVinParam(genInvoiceInfoDTO.getVehicleNo(), b);
+ R r1 = requestQueryVehicleNo(request);
+ if (!r1.isOk()) {
+ return r1;
+ }
+ JSONObject request1 = genQueryVehDetailParam(genInvoiceInfoDTO.getVehicleNo(), b);
+ R r2 = requestQueryVehicleDetail(request1);
+ if (!r2.isOk()) {
+ return r2;
+ }
+ genInvoiceInfoDTO.setVehicleData(r2.getData().toString());
+ }
+
GenInvoiceInfoVo vo = genInvoiceInfoVo(genInvoiceInfoDTO, contract, b);
return R.ok(vo);
+ }
+
+ private R requestQueryVehicleDetail(JSONObject request) {
+ String requestId = IdUtil.fastUUID();
+
+ log.info("鏈哄姩杞﹀悎鏍艰瘉鏌ヨ鎺ュ彛鍏ュ弬锛歿},", request.toJSONString());
+ String result = HttpUtil.post(bwUrl + "method=baiwang.output.invoice.queryVinDetail&version=1.0&request_id=" + requestId, request.toJSONString());
+ log.info("鏈哄姩杞﹀悎鏍艰瘉鏌ヨ鎺ュ彛鍥炲弬锛歿},", result);
+ saveBwRequestRecord("baiwang.output.invoice.queryVinDetail", requestId, request.toJSONString(), result);
+ JSONObject resultObj = JSONObject.parseObject(result);
+ if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) &&
+ !resultObj.getBoolean("success")) {
+ return R.failed("鏈哄姩杞﹀悎鏍艰瘉鏌ヨ澶辫触", result);
+ }
+ JSONArray models = resultObj.getJSONArray("model");
+ if (CollUtil.isNotEmpty(models)) {
+ JSONObject model = (JSONObject) models.get(0);
+ return R.ok(model);
+ }
+ return R.failed("鏈哄姩杞﹀悎鏍艰瘉鏌ヨ寮傚父");
+ }
+
+ private JSONObject genQueryVehDetailParam(String vehicleNo, SysDept b) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("taxNo", b.getOrgCode());
+ JSONObject data = new JSONObject();
+ data.put("vehicleNo", vehicleNo);
+ jsonObject.put("data", data);
+ return jsonObject;
+ }
+
+ private R requestQueryVehicleNo(JSONObject request) {
+ String requestId = IdUtil.fastUUID();
+
+ log.info("鏌ヨ绋庡眬杞︽灦鍙风爜鍏ュ弬锛歿},", request.toJSONString());
+ String result = HttpUtil.post(bwUrl + "method=baiwang.output.einvoice.queryvinlist&version=1.0&request_id=" + requestId, request.toJSONString());
+ log.info("鏌ヨ绋庡眬杞︽灦鍙风爜鍥炲弬锛歿},", result);
+ saveBwRequestRecord("baiwang.output.einvoice.queryvinlist", requestId, request.toJSONString(), result);
+ JSONObject resultObj = JSONObject.parseObject(result);
+ if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) &&
+ !resultObj.getBoolean("success")) {
+ return R.failed("鏌ヨ绋庡眬杞︽灦鍙风爜澶辫触", result);
+ }
+ JSONArray models = resultObj.getJSONArray("model");
+ if (CollUtil.isNotEmpty(models)) {
+ JSONObject model = (JSONObject) models.get(0);
+ if (!model.getBoolean("isOpenInvoice")) {
+ return R.failed(model.getString("isNotOpenInvReason"));
+ }
+ }
+ return R.ok();
+ }
+
+ private JSONObject genQueryVinParam(String vehicleNo, SysDept b) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("taxNo", b.getOrgCode());
+ JSONObject data = new JSONObject();
+ data.put("vinList", new ArrayList<String>(Arrays.asList(vehicleNo)));
+ jsonObject.put("data", data);
+ return jsonObject;
}
private GenInvoiceInfoVo genInvoiceInfoVo(GenInvoiceInfoDTO genInvoiceInfoDTO, Contract contract, SysDept b) {
@@ -149,17 +296,30 @@
vo.setPartyBOrgCode(b.getOrgCode());
vo.setPartyBOpenBank(b.getOrgBank());
vo.setPartyBBankAccount(b.getOrgBankAccount());
+ vo.setInvoiceType(a.getInvoiceType());
+ if (StrUtil.isNotBlank(genInvoiceInfoDTO.getInvoiceType())) {
+ vo.setInvoiceVehicleType(genInvoiceInfoDTO.getInvoiceType());
+ }
+ if (StrUtil.isNotBlank(genInvoiceInfoDTO.getVehicleNo())) {
+ vo.setVehicleNo(genInvoiceInfoDTO.getVehicleNo());
+ }
+ if (StrUtil.isNotBlank(genInvoiceInfoDTO.getCertificateNo())) {
+ vo.setCertificateNo(genInvoiceInfoDTO.getCertificateNo());
+ }
+ if (StrUtil.isNotBlank(genInvoiceInfoDTO.getVehicleData())) {
+ vo.setVehicleData(genInvoiceInfoDTO.getVehicleData());
+ }
List<InvoiceItemVo> invoiceItemVoList = new ArrayList<>();
List<String> erpCode = new ArrayList<>();
List<ContractOutBoundMergeVo> mergeOutBounds = new ArrayList<>();
// List<ContractOutBound> outBounds = contractOutBoundMapper.selectList(Wrappers.<ContractOutBound>lambdaQuery()
// .in(ContractOutBound::getId, genInvoiceInfoDTO.getOutBoundInvoiceList().stream().map(item->item.getContractOutBoundId()).collect(Collectors.toList())));
- if (!StrUtil.equals(contract.getContractCategory(), "water_house")){
- if (ArrayUtil.isNotEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList().toArray())) {
+ if (!StrUtil.equals(contract.getContractCategory(), "water_house")) {
+ if (CollUtil.isNotEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList())) {
genInvoiceInfoDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
- if (!ArrayUtil.contains(erpCode.toArray(), contractOutBound.getSubjectMatterCode())) {
+ if (!CollUtil.contains(erpCode, contractOutBound.getSubjectMatterCode())) {
erpCode.add(contractOutBound.getSubjectMatterCode());
ContractOutBoundMergeVo mergeVo = new ContractOutBoundMergeVo();
mergeVo.setMaterialCode(contractOutBound.getSubjectMatterCode());
@@ -172,19 +332,6 @@
mergeVo.setSpecification(product.getProductType());
mergeVo.setTaxRate(new BigDecimal(product.getTaxRate()));
mergeVo.setTaxCode(product.getTaxCode());
- Product productClass = productMapper.selectById(product.getParentId());
- if (ObjUtil.isNotNull(product)) {
- if (StrUtil.equals(product.getErpCode(), "water_bill")) {
- mergeVo.setItemName("*" + product.getTaxClass() + "*姘磋垂");
- } else if (StrUtil.equals(product.getErpCode(), "electricity_bill")) {
- mergeVo.setItemName("*" + product.getTaxClass() + "*鐢佃垂");
- } else if (StrUtil.equals(product.getErpCode(), "house_rental")) {
- mergeVo.setItemName("*" + product.getTaxClass() + "*鎴垮眿绉熻祦");
- } else {
- mergeVo.setItemName("*" + product.getTaxClass() + "*" + productClass.getProductName());
- }
-
- }
}
ContractSubjectMatter subjectMatter = subjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
.eq(ContractSubjectMatter::getMaterialCode, contractOutBound.getSubjectMatterCode())
@@ -192,18 +339,27 @@
if (ObjUtil.isNotNull(subjectMatter)) {
mergeVo.setUnitPrice(subjectMatter.getUnitPrice());
mergeVo.setUnit(subjectMatter.getUnit());
+ if (StrUtil.equals(product.getErpCode(), "water_bill")) {
+ mergeVo.setItemName("*" + product.getTaxClass() + "*姘磋垂");
+ } else if (StrUtil.equals(product.getErpCode(), "electricity_bill")) {
+ mergeVo.setItemName("*" + product.getTaxClass() + "*鐢佃垂");
+ } else if (StrUtil.equals(product.getErpCode(), "house_rental")) {
+ mergeVo.setItemName("*" + product.getTaxClass() + "*鎴垮眿绉熻祦");
+ } else {
+ mergeVo.setItemName("*" + product.getTaxClass() + "*" + subjectMatter.getMaterialName());
+ }
}
mergeOutBounds.add(mergeVo);
} else {
List<ContractOutBoundMergeVo> filteredList = mergeOutBounds.stream()
.filter(item -> contractOutBound.getSubjectMatterCode().equals(item.getMaterialCode())) // 闃叉绌烘寚閽堬紝寤鸿甯搁噺鍦ㄥ墠
.collect(Collectors.toList());
- if (ArrayUtil.isNotEmpty(filteredList.toArray())) {
+ if (ArrayUtil.isNotEmpty(filteredList)) {
filteredList.get(0).setQuantity(filteredList.get(0).getQuantity().add(contractOutBound.getOutBoundNum()));
}
}
});
- if (ArrayUtil.isNotEmpty(mergeOutBounds.toArray())) {
+ if (ArrayUtil.isNotEmpty(mergeOutBounds)) {
invoiceItemVoList = BeanUtil.copyToList(mergeOutBounds, InvoiceItemVo.class);
invoiceItemVoList.stream().forEach(invoiceItemVo -> {
// for (InvoiceItemVo invoiceItemVo:invoiceItemVoList) {
@@ -211,23 +367,26 @@
BigDecimal itemPriceTax = itemPrice.divide(new BigDecimal("100").add(invoiceItemVo.getTaxRate()), 2, RoundingMode.HALF_UP).multiply(invoiceItemVo.getTaxRate());
invoiceItemVo.setPriceTax(itemPriceTax);
invoiceItemVo.setPriceNoTax(itemPrice.subtract(itemPriceTax));
+ invoiceItemVo.setPriceAndTax(itemPrice);
});
- vo.setTotalPrice(invoiceItemVoList.stream().map(item -> item.getPriceTax().add(item.getPriceNoTax())).reduce(BigDecimal.ZERO, BigDecimal::add));
+ vo.setTotalPrice(invoiceItemVoList.stream().map(item -> item.getPriceAndTax()).reduce(BigDecimal.ZERO, BigDecimal::add));
+ vo.setTotalTax(invoiceItemVoList.stream().map(item -> item.getPriceTax()).reduce(BigDecimal.ZERO, BigDecimal::add));
vo.setInvoiceItemList(invoiceItemVoList);
vo.setPriceWords(Convert.digitToChinese(vo.getTotalPrice()));
}
}
- }else {
- if (ArrayUtil.isNotEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList().toArray())) {
+ } else {
+ if (ArrayUtil.isNotEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList())) {
genInvoiceInfoDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
- if (!ArrayUtil.contains(erpCode.toArray(), schedule.getSubjectMatterCode())) {
+ if (!CollUtil.contains(erpCode, schedule.getSubjectMatterCode())) {
erpCode.add(schedule.getSubjectMatterCode());
ContractOutBoundMergeVo mergeVo = new ContractOutBoundMergeVo();
mergeVo.setMaterialCode(schedule.getSubjectMatterCode());
mergeVo.setMaterialInternalName(schedule.getSubjectMatterName());
mergeVo.setPriceAndTax(schedule.getPlannedAmount());
+ mergeVo.setQuantity(schedule.getInvoiceNum());
Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, schedule.getSubjectMatterCode())
.eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
if (ObjUtil.isNotNull(product)) {
@@ -239,8 +398,10 @@
if (ObjUtil.isNotNull(product)) {
if (StrUtil.equals(product.getErpCode(), "water_bill")) {
mergeVo.setItemName("*" + product.getTaxClass() + "*姘磋垂");
+ mergeVo.setUnit("鍚�");
} else if (StrUtil.equals(product.getErpCode(), "electricity_bill")) {
mergeVo.setItemName("*" + product.getTaxClass() + "*鐢佃垂");
+ mergeVo.setUnit("搴�");
} else if (StrUtil.equals(product.getErpCode(), "house_rental")) {
mergeVo.setItemName("*" + product.getTaxClass() + "*鎴垮眿绉熻祦");
} else {
@@ -256,15 +417,15 @@
mergeVo.setUnitPrice(subjectMatter.getUnitPrice());
}
mergeOutBounds.add(mergeVo);
- }else {
- List<ContractOutBoundMergeVo> filterMergeVo = mergeOutBounds.stream().filter(item->item.getMaterialCode()
+ } else {
+ List<ContractOutBoundMergeVo> filterMergeVo = mergeOutBounds.stream().filter(item -> item.getMaterialCode()
.equals(schedule.getSubjectMatterCode())).collect(Collectors.toList());
- if (ArrayUtil.isNotEmpty(filterMergeVo.toArray())){
+ if (ArrayUtil.isNotEmpty(filterMergeVo)) {
filterMergeVo.get(0).setPriceAndTax(schedule.getPlannedAmount().add(filterMergeVo.get(0).getPriceAndTax()));
}
}
});
- if (ArrayUtil.isNotEmpty(mergeOutBounds.toArray())) {
+ if (ArrayUtil.isNotEmpty(mergeOutBounds)) {
invoiceItemVoList = BeanUtil.copyToList(mergeOutBounds, InvoiceItemVo.class);
invoiceItemVoList.stream().forEach(invoiceItemVo -> {
// for (InvoiceItemVo invoiceItemVo:invoiceItemVoList) {
@@ -272,8 +433,10 @@
BigDecimal itemPriceTax = itemPrice.divide(new BigDecimal("100").add(invoiceItemVo.getTaxRate()), 2, RoundingMode.HALF_UP).multiply(invoiceItemVo.getTaxRate());
invoiceItemVo.setPriceTax(itemPriceTax);
invoiceItemVo.setPriceNoTax(itemPrice.subtract(itemPriceTax));
+
});
vo.setTotalPrice(invoiceItemVoList.stream().map(item -> item.getPriceAndTax()).reduce(BigDecimal.ZERO, BigDecimal::add));
+ vo.setTotalTax(invoiceItemVoList.stream().map(item -> item.getPriceTax()).reduce(BigDecimal.ZERO, BigDecimal::add));
vo.setInvoiceItemList(invoiceItemVoList);
vo.setPriceWords(Convert.digitToChinese(vo.getTotalPrice()));
}
@@ -282,16 +445,154 @@
return vo;
}
+ private GenInvoiceInfoVo genAdvanceInvoiceInfoVo(GenInvoiceInfoDTO genInvoiceInfoDTO, Contract contract, SysDept b) {
+ GenInvoiceInfoVo vo = new GenInvoiceInfoVo();
+ BusinessCustomer a = businessCustomerMapper.selectById(contract.getPartyAId());
+ vo.setAdvanceInvoice("111");
+ vo.setPartyA(a.getCompanyName());
+ vo.setPartyAOrgCode(a.getCreditCode());
+ vo.setPartyAOpenBank(a.getBankName());
+ vo.setPartyABankAccount(a.getBankAccount());
+ vo.setPartyB(b.getOrgName());
+ vo.setPartyBOrgCode(b.getOrgCode());
+ vo.setPartyBOpenBank(b.getOrgBank());
+ vo.setPartyBBankAccount(b.getOrgBankAccount());
+ List<InvoiceItemVo> invoiceItemVoList = new ArrayList<>();
+ List<String> erpCode = new ArrayList<>();
+ List<ContractOutBoundMergeVo> mergeOutBounds = new ArrayList<>();
+
+ if (CollUtil.isNotEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList())) {
+ genInvoiceInfoDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
+ ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
+ if (ObjUtil.isNotNull(subjectMatter)) {
+ if (!CollUtil.contains(erpCode, subjectMatter.getMaterialCode())) {
+ erpCode.add(subjectMatter.getMaterialCode());
+ ContractOutBoundMergeVo mergeVo = new ContractOutBoundMergeVo();
+ mergeVo.setMaterialCode(subjectMatter.getMaterialCode());
+ mergeVo.setMaterialInternalName(subjectMatter.getMaterialName());
+ mergeVo.setQuantity(contractOutBoundInvoiceVo.getInvoiceNum());
+ Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, subjectMatter.getMaterialCode())
+ .eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
+ if (ObjUtil.isNotNull(product)) {
+ mergeVo.setTaxClass(product.getTaxClass());
+ mergeVo.setSpecification(product.getProductType());
+ mergeVo.setTaxRate(new BigDecimal(product.getTaxRate()));
+ mergeVo.setTaxCode(product.getTaxCode());
+ Product productClass = productMapper.selectById(product.getParentId());
+ if (ObjUtil.isNotNull(product)) {
+ if (StrUtil.equals(product.getErpCode(), "water_bill")) {
+ mergeVo.setItemName("*" + product.getTaxClass() + "*姘磋垂");
+ mergeVo.setUnit("鍚�");
+ } else if (StrUtil.equals(product.getErpCode(), "electricity_bill")) {
+ mergeVo.setItemName("*" + product.getTaxClass() + "*鐢佃垂");
+ mergeVo.setUnit("搴�");
+ } else if (StrUtil.equals(product.getErpCode(), "house_rental")) {
+ mergeVo.setItemName("*" + product.getTaxClass() + "*鎴垮眿绉熻祦");
+ } else {
+ mergeVo.setItemName("*" + product.getTaxClass() + "*" + productClass.getProductName());
+ }
+
+ }
+ }
+ mergeVo.setUnitPrice(subjectMatter.getUnitPrice());
+ mergeVo.setUnit(subjectMatter.getUnit());
+ mergeOutBounds.add(mergeVo);
+ }
+
+ }
+ });
+ if (ArrayUtil.isNotEmpty(mergeOutBounds)) {
+ invoiceItemVoList = BeanUtil.copyToList(mergeOutBounds, InvoiceItemVo.class);
+ invoiceItemVoList.stream().forEach(invoiceItemVo -> {
+// for (InvoiceItemVo invoiceItemVo:invoiceItemVoList) {
+ BigDecimal itemPrice = invoiceItemVo.getUnitPrice().multiply(invoiceItemVo.getQuantity());
+ BigDecimal itemPriceTax = itemPrice.divide(new BigDecimal("100").add(invoiceItemVo.getTaxRate()), 2, RoundingMode.HALF_UP).multiply(invoiceItemVo.getTaxRate());
+ invoiceItemVo.setPriceTax(itemPriceTax);
+ invoiceItemVo.setPriceNoTax(itemPrice.subtract(itemPriceTax));
+ invoiceItemVo.setPriceAndTax(itemPrice);
+ });
+ vo.setTotalPrice(invoiceItemVoList.stream().map(item -> item.getPriceAndTax()).reduce(BigDecimal.ZERO, BigDecimal::add));
+ vo.setTotalTax(invoiceItemVoList.stream().map(item -> item.getPriceTax()).reduce(BigDecimal.ZERO, BigDecimal::add));
+ vo.setInvoiceItemList(invoiceItemVoList);
+ vo.setPriceWords(Convert.digitToChinese(vo.getTotalPrice()));
+ }
+ }
+
+ return vo;
+ }
+
@Override
public R toInvoice(GenInvoiceInfoDTO genInvoiceInfoDTO) {
- if (ArrayUtil.isEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList().toArray())) {
+ if (ArrayUtil.isEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList())) {
return R.failed("璇烽�夋嫨寮�绁ㄥ嚭搴撳崟鍚庡啀鎿嶄綔");
}
+ if (StrUtil.equals(genInvoiceInfoDTO.getInvoiceType(), "3") || StrUtil.equals(genInvoiceInfoDTO.getInvoiceType(), "4")) {
+ if (StrUtil.isBlank(genInvoiceInfoDTO.getVehicleNo())) {
+ return R.failed("鏈哄姩杞﹀紑绁ㄨ杈撳叆杞︽灦鍙�");
+ }
+ BigDecimal invoiceNumSum = genInvoiceInfoDTO.getOutBoundInvoiceList().stream().map(item -> item.getInvoiceNum()).reduce(BigDecimal.ZERO, BigDecimal::add);
+ if (invoiceNumSum.compareTo(new BigDecimal("1")) > 0) {
+ return R.failed("鏈哄姩杞﹀紑绁ㄥ彧鑳�1娆″紑1杈�");
+ }
+ }
Long contractId = null;
- if (!StrUtil.equals(genInvoiceInfoDTO.getContractCategory(),"water_house")) {
+ if (StrUtil.isNotBlank(genInvoiceInfoDTO.getContractId())) {
+
+ ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery()
+ .eq(ContractPaymentSchedule::getStageName, "鍚堝悓绛捐").eq(ContractPaymentSchedule::getContractId, genInvoiceInfoDTO.getContractId())
+ .last("limit 1"));
+ if (ObjUtil.isNull(schedule)) {
+ return R.failed("鍚堝悓棰勬敹娆鹃樁娈靛紓甯革紝璇疯仈绯绘妧鏈汉鍛�");
+ }
+ Contract contract = contractMapper.selectById(genInvoiceInfoDTO.getContractId());
+ if (ObjUtil.isNull(contract)) {
+ return R.failed("鍚堝悓淇℃伅寮傚父锛岃鑱旂郴鎶�鏈汉鍛�");
+ }
+ ContractInvoice lastInvoice = baseMapper.selectOne(Wrappers.<ContractInvoice>lambdaQuery().eq(ContractInvoice::getContractId, contract.getId())
+ .orderByDesc(ContractInvoice::getCreateTime).last("limit 1"));
+ if (ObjUtil.isNotNull(lastInvoice) && StrUtil.equals(lastInvoice.getApprovalStatus(), "0")) {
+ return R.failed("璇风瓑寰呮渶杩戠殑鍙戠エ瀹℃牳瀹屾垚鍚庡啀杩涜棰勬敹寮�绁�");
+ }
+ R<SysDept> r = remoteDeptService.getById(contract.getPartyBId());
+ if (!r.isOk()) {
+ return R.failed("鑾峰彇寮�绁ㄥ崟浣嶅紓甯�");
+ }
+ SysDept b = r.getData();
+ BigDecimal advanceAmount = new BigDecimal("0");
+ for (ContractOutBoundInvoiceVo contractOutBoundInvoiceVo : genInvoiceInfoDTO.getOutBoundInvoiceList()) {
+ ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
+ if (ObjUtil.isNotNull(subjectMatter)) {
+ advanceAmount = advanceAmount.add(contractOutBoundInvoiceVo.getInvoiceNum().multiply(subjectMatter.getUnitPrice()));
+ }
+ }
+
+ if (advanceAmount.compareTo(schedule.getPlannedAmount()) > 0) {
+ return R.failed("寮�绁ㄩ噾棰濊秴鍑哄悎鍚岀璁㈤樁娈靛簲鏀堕噾棰�:" + schedule.getPlannedAmount() + ",璇疯皟鏁村紑绁ㄦ暟閲�");
+ }
+ GenInvoiceInfoVo vo = genAdvanceInvoiceInfoVo(genInvoiceInfoDTO, contract, b);
+ //鍙戠エ淇濆瓨
+ ContractInvoice invoice = saveContractInvoice(vo, contract, genInvoiceInfoDTO.getOutBoundInvoiceList(), DateUtil.current() + "", "1");
+ //鍚姩娴佺▼
+ ProcessInstanceParamDto dto = new ProcessInstanceParamDto();
+ Map<String, Object> map = BeanUtil.beanToMap(invoice);
+ dto.setParamMap(map);
+ dto.setFlowName(FlowNameEnum.閿�鍞寕璐﹀鎵�.name());
+ R r1 = remoteFlowProcessService.startProcessInstance(dto);
+ if (r1.getCode() == 1) {
+ return R.failed("娴佺▼鍚姩澶辫触");
+ }
+ //鏇存柊鍚堝悓鍑哄簱鍗曠姸鎬�
+ genInvoiceInfoDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
+ ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
+ subjectMatter.setAdvanceNum(subjectMatter.getAdvanceNum().add(contractOutBoundInvoiceVo.getInvoiceNum()));
+ contractSubjectMatterMapper.updateById(subjectMatter);
+ });
+ return R.ok();
+ }
+ if (!StrUtil.equals(genInvoiceInfoDTO.getContractCategory(), "water_house")) {
ContractOutBound outBound = contractOutBoundMapper.selectById(genInvoiceInfoDTO.getOutBoundInvoiceList().get(0).getContractOutBoundId());
contractId = outBound.getContractId();
- }else {
+ } else {
ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(genInvoiceInfoDTO.getOutBoundInvoiceList().get(0).getContractOutBoundId());
contractId = schedule.getContractId();
}
@@ -304,14 +605,35 @@
return R.failed("鑾峰彇寮�绁ㄥ崟浣嶅紓甯�");
}
SysDept b = r.getData();
+ //鏈哄姩杞﹀紑绁�
+ if (StrUtil.equals(genInvoiceInfoDTO.getInvoiceType(), "3") || StrUtil.equals(genInvoiceInfoDTO.getInvoiceType(), "4")) {
+ if (StrUtil.isBlank(genInvoiceInfoDTO.getVehicleNo())) {
+ return R.failed("鏈哄姩杞﹀紑绁ㄨ杈撳叆杞︽灦鍙�");
+ }
+ BigDecimal invoiceNumSum = genInvoiceInfoDTO.getOutBoundInvoiceList().stream().map(item -> item.getInvoiceNum()).reduce(BigDecimal.ZERO, BigDecimal::add);
+ if (invoiceNumSum.compareTo(new BigDecimal("1")) > 0) {
+ return R.failed("鏈哄姩杞﹀紑绁ㄥ彧鑳�1娆″紑1杈�");
+ }
+ JSONObject request = genQueryVinParam(genInvoiceInfoDTO.getVehicleNo(), b);
+ R r1 = requestQueryVehicleNo(request);
+ if (!r1.isOk()) {
+ return r1;
+ }
+ JSONObject request1 = genQueryVehDetailParam(genInvoiceInfoDTO.getVehicleNo(), b);
+ R r2 = requestQueryVehicleDetail(request1);
+ if (!r2.isOk()) {
+ return r2;
+ }
+ genInvoiceInfoDTO.setVehicleData(r2.getData().toString());
+ }
GenInvoiceInfoVo vo = genInvoiceInfoVo(genInvoiceInfoDTO, contract, b);
//鍙戠エ淇濆瓨
- ContractInvoice invoice = saveContractInvoice(vo, contract, genInvoiceInfoDTO.getOutBoundInvoiceList(), DateUtil.current() + "");
+ ContractInvoice invoice = saveContractInvoice(vo, contract, genInvoiceInfoDTO.getOutBoundInvoiceList(), DateUtil.current() + "", "0");
//鍚姩娴佺▼
ProcessInstanceParamDto dto = new ProcessInstanceParamDto();
Map<String, Object> map = BeanUtil.beanToMap(invoice);
- if (StrUtil.equals(genInvoiceInfoDTO.getContractCategory(),"water_house")) {
- map.put("contractCategory","water_house");
+ if (StrUtil.equals(genInvoiceInfoDTO.getContractCategory(), "water_house")) {
+ map.put("contractCategory", "water_house");
}
dto.setParamMap(map);
dto.setFlowName(FlowNameEnum.閿�鍞寕璐﹀鎵�.name());
@@ -319,23 +641,23 @@
if (r1.getCode() == 1) {
return R.failed("娴佺▼鍚姩澶辫触");
}
- if (!StrUtil.equals(contract.getContractCategory(),"water_house")) {
+ if (!StrUtil.equals(contract.getContractCategory(), "water_house")) {
//鏇存柊鍚堝悓鍑哄簱鍗曠姸鎬�
genInvoiceInfoDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
contractOutBound.setInvoiceStatus("1");
- if (contractOutBoundInvoiceVo.getInvoiceNum().compareTo(contractOutBound.getOutBoundNum().subtract(contractOutBound.getInvoiceNum()))<=0) {
- contractOutBound.setInvoiceNum(contractOutBound.getInvoiceNum().subtract(contractOutBoundInvoiceVo.getInvoiceNum()));
+ if (contractOutBoundInvoiceVo.getInvoiceNum().compareTo(contractOutBound.getOutBoundNum().subtract(contractOutBound.getInvoiceNum())) <= 0) {
+ contractOutBound.setInvoiceNum(contractOutBound.getInvoiceNum().add(contractOutBoundInvoiceVo.getInvoiceNum()));
}
contractOutBoundMapper.updateById(contractOutBound);
});
- }else {
+ } else {
//鏇存柊鍚堝悓鎴跨 姘寸數 璐瑰紑绁ㄧ姸鎬�
genInvoiceInfoDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
- ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
- schedule.setInvoiceFlag("1");
- contractPaymentScheduleMapper.updateById(schedule);
- });
+ ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
+ schedule.setInvoiceFlag("1");
+ contractPaymentScheduleMapper.updateById(schedule);
+ });
}
return R.ok();
}
@@ -350,17 +672,16 @@
bwRequestRecordMapper.insert(bwRequestRecord);
}
- private JSONObject genBlueInvoice(GenInvoiceInfoVo vo, String serialNo) {
+ private JSONObject genBlueInvoice(GenInvoiceInfoVo vo, String serialNo, SysDept dept) {
JSONObject jsonObject = new JSONObject();
//閿�鏂�
jsonObject.put("taxNo", vo.getPartyBOrgCode());//绋庡彿
jsonObject.put("isSplit", false);//瓒呰繃鍙戠エ鍗曞紶闄愰鏄惁闇�瑕佹媶鍒嗗紑鍏凤紝榛樿涓嶆媶鍒嗭紙鎷嗗垎鍙敮鎸佸彂绁ㄧ被鍨嬩唬鐮佷负 涓撶エ 004 鏅エ 007 鐢靛瓙绁� 026鐨�
- jsonObject.put("taxUserName", "");//鐧诲綍鍚嶄负绋庡眬椤甸潰鐧� 褰曞悕
jsonObject.put("formatGenerate", false);//鏄惁闇�瑕佺敓鎴愮増寮忚繑鍥炵増寮忛摼鎺�(true / false)
jsonObject.put("formatPushType", false);//鐗堝紡鐢熸垚鏄惁鎺ㄩ��(true / false)
//data
JSONObject data = new JSONObject();
- data.put("invoiceTypeCode", "01");
+ data.put("invoiceTypeCode", vo.getInvoiceType());
data.put("serialNo", serialNo);
//data.invoiceDetailsList
JSONArray invoiceDetailsList = new JSONArray();
@@ -369,27 +690,34 @@
JSONObject invoiceDetail = new JSONObject();
invoiceDetail.put("goodsLineNo", lineNo);
+ invoiceDetail.put("goodsName", invoiceItemVo.getItemName());
+ invoiceDetail.put("projectName", invoiceItemVo.getItemName());
invoiceDetail.put("goodsCode", invoiceItemVo.getTaxCode());
invoiceDetail.put("goodsTaxRate", invoiceItemVo.getTaxRate().divide(new BigDecimal("100")));
invoiceDetail.put("goodsUnit", invoiceItemVo.getUnit());
invoiceDetail.put("goodsQuantity", invoiceItemVo.getQuantity());
- invoiceDetail.put("goodsPrice", invoiceItemVo.getUnitPrice());
- if (!StrUtil.equals(vo.getContractCategory(),"water_house")) {
- invoiceDetail.put("goodsTotalPrice", invoiceItemVo.getUnitPrice().multiply(invoiceItemVo.getQuantity()));
- }else {
- invoiceDetail.put("goodsTotalPrice", invoiceItemVo.getPriceAndTax());
+// invoiceDetail.put("goodsPrice", invoiceItemVo.getUnitPrice());
+ if (StrUtil.equals(vo.getInvoiceVehicleType(), "3")) {
+ invoiceDetail.put("goodsSpecification", vo.getVehicleNo());
+ } else {
+ invoiceDetail.put("goodsSpecification", invoiceItemVo.getSpecification());
+ }
+
+ if (!StrUtil.equals(vo.getContractCategory(), "water_house")) {
+ invoiceDetail.put("goodsTotalPrice", invoiceItemVo.getPriceNoTax());
+ } else {
+ invoiceDetail.put("goodsTotalPrice", invoiceItemVo.getPriceNoTax());
}
invoiceDetail.put("goodsTotalTax", invoiceItemVo.getPriceTax());
invoiceDetailsList.add(invoiceDetail);
lineNo++;
}
- jsonObject.put("invoiceDetailsList", invoiceDetailsList);
+ data.put("invoiceDetailsList", invoiceDetailsList);
//璐柟
data.put("buyerTaxNo", vo.getPartyAOrgCode());
data.put("buyerName", vo.getPartyA());
- data.put("invoiceTotalPrice", vo.getTotalPrice().subtract(vo.getInvoiceItemList().stream().map(item -> item.getPriceTax()).reduce(BigDecimal.ZERO, BigDecimal::add)));
- data.put("invoiceTotalTax", vo.getInvoiceItemList().stream().map(item -> item.getPriceTax()).reduce(BigDecimal.ZERO, BigDecimal::add));
+ data.put("drawer", dept.getInvoiceContact());// TODO 绋庡姟鎬诲眬绯荤粺鐧婚檰浜烘墜鏈哄彿
data.put("invoiceTotalPriceTax", vo.getTotalPrice());
data.put("buyerBankName", vo.getPartyAOpenBank());
data.put("buyerBankNumber", vo.getPartyABankAccount());
@@ -398,15 +726,17 @@
return jsonObject;
}
- private ContractInvoice saveContractInvoice(GenInvoiceInfoVo genInvoiceInfoVo, Contract contract, List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList, String serialNo) {
+ private ContractInvoice saveContractInvoice(GenInvoiceInfoVo genInvoiceInfoVo, Contract contract,
+ List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList, String serialNo, String advanceFlag) {
ContractInvoice invoice = new ContractInvoice();
invoice.setContractId(contract.getId());
invoice.setInvoiceCategory("1");
invoice.setRedReversal("0");
invoice.setSerialNo(serialNo);
- invoice.setTexNo(genInvoiceInfoVo.getPartyBOrgCode());
+ invoice.setTaxNo(genInvoiceInfoVo.getPartyBOrgCode());
invoice.setSellerTaxName(genInvoiceInfoVo.getPartyB());
invoice.setBuyerTaxName(genInvoiceInfoVo.getPartyA());
+ invoice.setBuyerTaxNo(genInvoiceInfoVo.getPartyAOrgCode());
invoice.setInvoiceTotalTax(genInvoiceInfoVo.getInvoiceItemList().stream().map(item -> item.getPriceTax()).reduce(BigDecimal.ZERO, BigDecimal::add));
invoice.setInvoiceTotalPrice(genInvoiceInfoVo.getTotalPrice().subtract(invoice.getInvoiceTotalTax()));
invoice.setInvoiceTotalPriceTax(genInvoiceInfoVo.getTotalPrice());
@@ -414,9 +744,10 @@
invoice.setInvoiceStatus("1");
invoice.setApprovalStatus("0");
invoice.setOutBoundId(outBoundInvoiceVoList.stream()
- .map(item-> String.valueOf(item.getContractOutBoundId())) // 鎴栬�� .map(Object::toString)
+ .map(item -> String.valueOf(item.getContractOutBoundId())) // 鎴栬�� .map(Object::toString)
.collect(Collectors.joining(",")));
invoice.setInvoicePreviewParam(JSONObject.toJSONString(outBoundInvoiceVoList));
+ invoice.setAdvanceFlag(advanceFlag);
baseMapper.insert(invoice);
return invoice;
}
@@ -438,9 +769,10 @@
Contract contract = contractMapper.selectById(blueInvoice.getContractId());
ContractInvoice invoice = new ContractInvoice();
invoice.setContractId(blueInvoice.getContractId());
- invoice.setTexNo(blueInvoice.getTexNo());
+ invoice.setTaxNo(blueInvoice.getTaxNo());
invoice.setSellerTaxName(blueInvoice.getSellerTaxName());
invoice.setBuyerTaxName(blueInvoice.getBuyerTaxName());
+ invoice.setBuyerTaxNo(blueInvoice.getBuyerTaxNo());
invoice.setInvoiceTotalTax(blueInvoice.getInvoiceTotalTax());
invoice.setInvoiceTotalPrice(blueInvoice.getInvoiceTotalPrice());
invoice.setInvoiceTotalPriceTax(blueInvoice.getInvoiceTotalPriceTax());
@@ -457,13 +789,14 @@
invoice.setBlueInvoiceId(invoiceId);
invoice.setApprovalStatus("0");
invoice.setInvoicePreviewParam(blueInvoice.getInvoicePreviewParam());
+ invoice.setAdvanceFlag(blueInvoice.getAdvanceFlag());
baseMapper.insert(invoice);
//鍚姩娴佺▼
ProcessInstanceParamDto dto = new ProcessInstanceParamDto();
Map<String, Object> map = BeanUtil.beanToMap(invoice);
dto.setParamMap(map);
- if (StrUtil.equals(contract.getContractCategory(),"water_house")) {
- map.put("contractCategory","water_house");
+ if (StrUtil.equals(contract.getContractCategory(), "water_house")) {
+ map.put("contractCategory", "water_house");
}
dto.setParamMap(map);
dto.setFlowName(FlowNameEnum.閿�鍞寕璐﹀鎵�.name());
@@ -475,42 +808,40 @@
return R.ok();
}
- private JSONObject genRedInvoice(Contract contract,ContractInvoice blueInvoice, String redConfirmSerialNo) {
+ private JSONObject genRedInvoice(Contract contract, ContractInvoice blueInvoice, String redConfirmSerialNo) {
JSONObject jsonObject = new JSONObject();
- jsonObject.put("taxNo", blueInvoice.getTexNo());
+ jsonObject.put("taxNo", blueInvoice.getTaxNo());
jsonObject.put("redConfirmSerialNo", redConfirmSerialNo);
jsonObject.put("entryIdentity", "01");
- jsonObject.put("sellerTaxNo", blueInvoice.getTexNo());
+ jsonObject.put("sellerTaxNo", blueInvoice.getTaxNo());
jsonObject.put("sellerTaxName", blueInvoice.getSellerTaxName());
jsonObject.put("buyerTaxName", blueInvoice.getBuyerTaxName());
- jsonObject.put("originalInvoiceNo", blueInvoice.getInvoiceNo());
- jsonObject.put("originInvoiceIsPaper", "N");
- jsonObject.put("originInvoiceDate", blueInvoice.getInvoiceTime());
+ jsonObject.put("buyerTaxNo", blueInvoice.getBuyerTaxNo());
+ jsonObject.put("originInvoiceDate", DateUtil.formatDateTime(blueInvoice.getInvoiceTime()));
jsonObject.put("originInvoiceTotalPrice", blueInvoice.getInvoiceTotalPrice());
- jsonObject.put("originInvoiceTotalTax", blueInvoice.getInvoiceTotalPrice());
+ jsonObject.put("originInvoiceTotalTax", blueInvoice.getInvoiceTotalTax());
+ jsonObject.put("invoiceTotalPrice", blueInvoice.getInvoiceTotalPrice().multiply(new BigDecimal("-1")));
+ jsonObject.put("invoiceTotalTax", blueInvoice.getInvoiceTotalTax().multiply(new BigDecimal("-1")));
+ jsonObject.put("originInvoiceIsPaper", "N");
jsonObject.put("originInvoiceType", "01");
- jsonObject.put("invoiceTotalPrice", blueInvoice.getInvoiceTotalPrice());
- jsonObject.put("invoiceTotalTax", blueInvoice.getInvoiceTotalPrice());
- jsonObject.put("redInvoiceLabel", "2");
+ jsonObject.put("redInvoiceLabel", "01");
+ jsonObject.put("invoiceSource", "2");
+ jsonObject.put("originalInvoiceNo", blueInvoice.getInvoiceNo());
GenInvoiceInfoVo vo = BeanUtil.copyProperties(JSONObject.parseObject(blueInvoice.getInvoicePreview()), GenInvoiceInfoVo.class);
JSONArray invoiceDetailsList = new JSONArray();
Integer lineNo = 1;
for (InvoiceItemVo invoiceItemVo : vo.getInvoiceItemList()) {
JSONObject invoiceDetail = new JSONObject();
invoiceDetail.put("originalInvoiceDetailNo", lineNo);
+ invoiceDetail.put("projectName", invoiceItemVo.getItemName());
invoiceDetail.put("goodsLineNo", lineNo);
invoiceDetail.put("goodsCode", invoiceItemVo.getTaxCode());
invoiceDetail.put("goodsTaxRate", invoiceItemVo.getTaxRate().divide(new BigDecimal("100")));
invoiceDetail.put("goodsUnit", invoiceItemVo.getUnit());
invoiceDetail.put("goodsQuantity", invoiceItemVo.getQuantity());
- invoiceDetail.put("goodsPrice", invoiceItemVo.getUnitPrice());
- if (!StrUtil.equals(contract.getContractCategory(),"water_house")) {
- invoiceDetail.put("goodsTotalPrice", invoiceItemVo.getUnitPrice().multiply(invoiceItemVo.getQuantity()));
- }else {
- invoiceDetail.put("goodsTotalPrice", invoiceItemVo.getPriceAndTax());
- }
- invoiceDetail.put("goodsTotalTax", invoiceItemVo.getPriceTax());
-
+// invoiceDetail.put("goodsPrice", invoiceItemVo.getUnitPrice());
+ invoiceDetail.put("goodsTotalPrice", invoiceItemVo.getPriceNoTax().multiply(new BigDecimal("-1")));
+ invoiceDetail.put("goodsTotalTax", invoiceItemVo.getPriceTax().multiply(new BigDecimal("-1")));
invoiceDetailsList.add(invoiceDetail);
lineNo++;
}
@@ -523,32 +854,125 @@
public R queryBlueInvoice() {
if (bwFlag) {
List<ContractInvoice> contractInvoices = baseMapper.selectList(Wrappers.<ContractInvoice>lambdaQuery()
- .eq(ContractInvoice::getInvoiceCategory, "1").eq(ContractInvoice::getInvoiceStatus, "1"));
- if (ArrayUtil.isNotEmpty(contractInvoices.toArray())) {
+ .eq(ContractInvoice::getApprovalStatus, "1")
+ .eq(ContractInvoice::getBwRequestResult, "1")
+ .isNull(ContractInvoice::getInvoicePath));
+ if (ArrayUtil.isNotEmpty(contractInvoices)) {
contractInvoices.stream().forEach(contractInvoice -> {
JSONObject request = new JSONObject();
- request.put("tax_no", contractInvoice.getTexNo());
+ request.put("taxNo", contractInvoice.getTaxNo());
JSONObject data = new JSONObject();
- data.put("serial_no", contractInvoice.getSerialNo());
- data.put("return_type", "1");
+ data.put("serialNo", contractInvoice.getSerialNo());
+ data.put("returnType", "3");
+ data.put("invoiceIssueMode", "1");
+ request.put("data", data);
String requestId = IdUtil.fastUUID();
+
log.info("serial_no:{},鍙戠エ鏌ヨ鍏ュ弬锛歿},", contractInvoice.getSerialNo(), request.toJSONString());
- String result = HttpUtil.post("method=baiwang.output.format.query&version=1.0&request_id=" + requestId, request.toJSONString());
+ String result = HttpUtil.post(bwUrl + "method=baiwang.output.format.query&version=1.0&request_id=" + requestId, request.toJSONString());
log.info("serial_no:{},鍙戠エ鏌ヨ鍥炲弬锛歿},", contractInvoice.getSerialNo(), result);
saveBwRequestRecord("baiwang.output.format.query", requestId, request.toJSONString(), result);
JSONObject resultObj = JSONObject.parseObject(result);
if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) && resultObj.getBoolean("success")) {
JSONObject model = resultObj.getJSONObject("model");
- contractInvoice.setInvoicePath(model.getString("query_data"));
+ contractInvoice.setInvoicePath(model.getString("queryData"));
contractInvoice.setInvoiceStatus("2");
baseMapper.updateById(contractInvoice);
+ //浼犺緭闄勪欢
+ pushBipInvoicePdf(contractInvoice);
}
- //鎺ㄩ�丅IP
- pushBipInvoice(contractInvoice);
});
}
}
return R.ok();
+ }
+
+ private void pushBipInvoicePdf(ContractInvoice contractInvoice) {
+ String accessToken = "";
+ if (redisTemplate.hasKey("BIP_TOKEN")) {
+ accessToken = (String) redisTemplate.opsForValue().get("BIP_TOKEN");
+ } else {
+ accessToken = paymentConfirmService.getAccessToken(accessToken);
+ }
+ if (StrUtil.isEmpty(accessToken)) {
+ log.error("bip accessToken 鑾峰彇寮傚父");
+ return;
+ }
+ String finalAccessToken = accessToken;
+ String requestId = IdUtil.fastUUID();
+ JSONObject request = new JSONObject();
+ request.put("taxNo", contractInvoice.getTaxNo());
+ JSONObject data = new JSONObject();
+ data.put("serialNo", contractInvoice.getSerialNo());
+ data.put("returnType", "2");
+ data.put("invoiceIssueMode", "1");
+ request.put("data", data);
+ log.info("serial_no:{},鍙戠エ鏌ヨ鍏ュ弬锛歿},", contractInvoice.getSerialNo(), request.toJSONString());
+ String result = HttpUtil.post(bwUrl + "method=baiwang.output.format.query&version=1.0&request_id=" + requestId, request.toJSONString());
+ log.info("serial_no:{},鍙戠エ鏌ヨ鍥炲弬锛歿},", contractInvoice.getSerialNo(), result);
+ JSONObject resultObj = JSONObject.parseObject(result);
+ String filePath = localPath + File.separator + DateUtil.today() + File.separator + IdUtil.fastUUID() + ".pdf";
+ if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) && resultObj.getBoolean("success")) {
+ JSONObject model = resultObj.getJSONObject("model");
+ saveBase64ToFile(model.getString("queryData"), filePath);
+
+ }
+ File file = new File(filePath);
+ if (file.exists()) {
+ log.info("搴旀敹鍙戠エ闄勪欢涓婁紶鍏ュ弬:{}", url + "/yonbip/uspace/iuap-apcom-file/rest/v1/file?access_token="
+ + finalAccessToken + "&businessType=yonbip-fi-earapbill&businessId=" + contractInvoice.getBipId());
+ HttpResponse response = HttpUtil.createPost(url + "/yonbip/uspace/iuap-apcom-file/rest/v1/file?access_token="
+ + finalAccessToken + "&businessType=yonbip-fi-earapbill&businessId=" + contractInvoice.getBipId())
+ .header("Content-Type", "multipart/form-data")
+ // 璁剧疆琛ㄥ崟鍙傛暟锛堟枃浠讹級锛岀涓�涓弬鏁颁负鎺ュ彛鎺ユ敹鐨勫弬鏁板悕锛堝"file"锛�
+ .form("files", file)
+ // 鎵ц璇锋眰
+ .execute();
+ log.info("搴旀敹鍙戠エ闄勪欢涓婁紶鍥炲弬:{}", response.body());
+ //淇濆瓨璇锋眰璁板綍
+ paymentConfirmService.saveBipRequestRecord(request, "搴旀敹鍙戠エ闆嗘垚鎺ュ彛", response.body());
+ JSONObject resultJson = JSONObject.parseObject(response.body());
+ if (resultJson.containsKey("code") && resultJson.getString("code").equals("200")) {
+ JSONObject datas = resultJson.getJSONObject("data");
+ JSONArray arr = datas.getJSONArray("data");
+ if (CollUtil.isNotEmpty(arr)) {
+ JSONObject data0 = (JSONObject) arr.get(0);
+ contractInvoice.setBipFileId(data0.getString("id"));
+ baseMapper.updateById(contractInvoice);
+ }
+ }
+ }
+
+ }
+
+ /**
+ * 灏� Base64 瀛楃涓茶浆鎹负鏈湴鏂囦欢
+ *
+ * @param base64Str Base64 缂栫爜鐨勫瓧绗︿覆
+ * @param targetPath 鐩爣鏂囦欢璺緞锛堝寘鍚枃浠跺悕鍜屽悗缂�锛屽 "D:/test.pdf"锛�
+ */
+ public static void saveBase64ToFile(String base64Str, String targetPath) {
+ if (base64Str == null || base64Str.isEmpty()) {
+ throw new IllegalArgumentException("Base64 瀛楃涓蹭笉鑳戒负绌�");
+ }
+
+ // 1. 澶勭悊鍙兘瀛樺湪鐨� Data URI 鍓嶇紑 (濡�: "data:application/pdf;base64,JVBERi...")
+ if (base64Str.contains(",")) {
+ base64Str = base64Str.split(",")[1];
+ }
+
+ // 2. 瑙ｇ爜 Base64 涓哄瓧鑺傛暟缁�
+ byte[] fileBytes = Base64.getDecoder().decode(base64Str);
+
+ // 3. 灏嗗瓧鑺傛暟缁勫啓鍏ユ枃浠�
+ try (FileOutputStream fos = new FileOutputStream(new File(targetPath))) {
+ fos.write(fileBytes);
+ fos.flush();
+ System.out.println("鏂囦欢淇濆瓨鎴愬姛: " + targetPath);
+ } catch (IOException e) {
+ e.printStackTrace();
+ throw new RuntimeException("鏂囦欢淇濆瓨澶辫触", e);
+ }
}
private void pushBipInvoice(ContractInvoice contractInvoice) {
@@ -556,22 +980,45 @@
if (redisTemplate.hasKey("BIP_TOKEN")) {
accessToken = (String) redisTemplate.opsForValue().get("BIP_TOKEN");
} else {
- paymentConfirmService.getAccessToken(accessToken);
+ accessToken = paymentConfirmService.getAccessToken(accessToken);
}
if (StrUtil.isEmpty(accessToken)) {
log.error("bip accessToken 鑾峰彇寮傚父");
return;
}
+ Contract contract = contractMapper.selectById(contractInvoice.getContractId());
+ if (ObjUtil.isNull(contract)) {
+ log.error("鏌ヨ鍚堝悓淇℃伅寮傚父");
+ return;
+ }
+ BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+ if (ObjUtil.isNull(customer) || StrUtil.isEmpty(customer.getBipCode())) {
+ log.error("鏌ヨ鍚堝悓淇℃伅寮傚父");
+ return;
+ }
+ R<SysDept> r = remoteDeptService.getById(contract.getPartyBId());
+ if (!r.isOk()) {
+ log.error("鏌ヨ鍗曚綅淇℃伅寮傚父");
+ return;
+ }
+ SysDept comp = r.getData();
+ R<SysDept> rDept = remoteDeptService.getById(SecurityUtils.getUser().getDeptId());
+ if (!r.isOk()) {
+ log.error("鏌ヨ鍗曚綅淇℃伅寮傚父");
+ return;
+ }
+ SysDept dept = rDept.getData();
//钃濈エ
- if (StrUtil.equals(contractInvoice.getInvoiceCategory(),"1")) {
- JSONObject params = genBlueReceiveParams(contractInvoice);
+ if (StrUtil.equals(contractInvoice.getInvoiceCategory(), "1")) {
+
+ JSONObject params = genBlueReceiveParams(contractInvoice, contract, customer, comp, dept);
String finalAccessToken = accessToken;
- log.info("XSJZ_YS_DJ_INSERT Request:", params.toJSONString());
- String result = HttpUtil.post(url + "/yonbip/EFI/receivable/save?access_token=" + finalAccessToken, params.toJSONString());
- log.info("XSJZ_YS_DJ_INSERT Response:{}", result);
+ log.info("搴旀敹鍙戠エ闆嗘垚鍏ュ弬:{}", params.toJSONString());
+ String result = HttpUtil.post(url + "/yonbip/EFI/receivable/saveandsubmit?access_token=" + finalAccessToken, params.toJSONString());
+ log.info("搴旀敹鍙戠エ闆嗘垚鍥炲弬:{}", result);
//淇濆瓨璇锋眰璁板綍
- paymentConfirmService.saveBipRequestRecord(params, "< XSJZ_YS_DJ_001>-搴旀敹鍙戠エ淇濆瓨鎺ュ彛", result);
+ paymentConfirmService.saveBipRequestRecord(params, "搴旀敹鍙戠エ闆嗘垚鎺ュ彛", result);
JSONObject resultJson = JSONObject.parseObject(result);
if (resultJson.containsKey("code") && resultJson.getString("code").equals("200")) {
JSONObject data = resultJson.getJSONObject("data");
@@ -582,66 +1029,70 @@
}
}
//绾㈢エ
- if (StrUtil.equals(contractInvoice.getInvoiceCategory(),"2")) {
+ if (StrUtil.equals(contractInvoice.getInvoiceCategory(), "2")) {
JSONObject params = genRedReceiveParams(contractInvoice);
String finalAccessToken = accessToken;
- log.info("XSJZ_YS_DJ_DELETE Request:", params.toJSONString());
+ log.info("搴旀敹鍙戠エ鍒犻櫎鍏ュ弬:{}", params.toJSONString());
String result = HttpUtil.post(url + "/yonbip/EFI/receivable/delete?access_token=" + finalAccessToken, params.toJSONString());
- log.info("XSJZ_YS_DJ_DELETE Response:{}", result);
+ log.info("搴旀敹鍙戠エ鍒犻櫎鍥炲弬:{}", result);
//淇濆瓨璇锋眰璁板綍
- paymentConfirmService.saveBipRequestRecord(params, "< XSJZ_YS_DJ_002>-搴旀敹鍙戠エ鍒犻櫎鎺ュ彛", result);
+ paymentConfirmService.saveBipRequestRecord(params, "搴旀敹鍙戠エ鍒犻櫎鎺ュ彛", result);
JSONObject resultJson = JSONObject.parseObject(result);
if (resultJson.containsKey("code") && resultJson.getString("code").equals("200")) {
contractInvoice.setBipPush("1");
+ contractInvoice.setBipBody(resultJson.getString("data"));
baseMapper.updateById(contractInvoice);
}
}
}
private JSONObject genRedReceiveParams(ContractInvoice contractInvoice) {
+ ContractInvoice blue = contractInvoice.selectById(contractInvoice.getBlueInvoiceId());
JSONObject jsonObject = new JSONObject();
JSONObject data = new JSONObject();
- data.put("id",contractInvoice.getBipId());
- jsonObject.put("data",data);
- return jsonObject;
+ data.put("id", blue.getBipId());
+ jsonObject.put("data", data);
+ return jsonObject;
}
- private JSONObject genBlueReceiveParams(ContractInvoice contractInvoice) {
+ private JSONObject genBlueReceiveParams(ContractInvoice contractInvoice, Contract contract, BusinessCustomer customer
+ , SysDept comp, SysDept dept) {
JSONObject jsonObject = new JSONObject();
JSONObject data = new JSONObject();
- if (contractInvoice.getInvoiceCategory().equals("1")){
- data.put("direction","1");
- }else {
- data.put("direction","-1");
+ if (contractInvoice.getInvoiceCategory().equals("1")) {
+ data.put("direction", "1");
+ } else {
+ data.put("direction", "-1");
}
- data.put("billDate",DateUtil.format(contractInvoice.getInvoiceTime(),DatePattern.NORM_DATETIME_FORMAT));
- data.put("objectType","1");
- data.put("exchangeRate","1");
- data.put("exchangeRateDate",DateUtil.now());
- data.put("_status","Insert");
+ data.put("billDate", DateUtil.format(contractInvoice.getInvoiceTime(), DatePattern.NORM_DATETIME_FORMAT));
+ data.put("exchangeRate", "1");//姹囩巼
+ data.put("exchangeRateDate", DateUtil.now());//姹囩巼鏃堕棿
+ data.put("objectType", "1");//寰�鏉ュ璞＄被鍨�(鏋氫妇鍊� 1:瀹㈡埛; 2:鍛樺伐;3:璧勯噾涓氬姟瀵硅薄)
+ data.put("deptCode", dept.getOrgCode());//閮ㄩ棬缂栫爜 SS2
+ data.put("staffCode", SecurityUtils.getUser().getNickname());//涓氬姟鍛樼紪鐮�
+ data.put("customerCode", customer.getBipCode());//瀹㈡埛缂栫爜
+ data.put("financeOrgCode", comp.getBipCode());//寮�绁ㄧ粍缁囩紪鐮�
+ data.put("orgCode", comp.getBipCode());//涓氬姟缁勭粐缂栫爜
+ data.put("bustypeCode", "ZBYXGLXT");//浜ゆ槗绫诲瀷缂栫爜 鏆備及榛樿ZGYSFP锛岄攢鍞粯璁BYXGLXT
+ data.put("contractNo", contract.getContractNo());
+ data.put("oriCurrencyCode", "CNY");//甯佺
+ data.put("_status", "Insert");
GenInvoiceInfoVo vo = BeanUtil.copyProperties(JSONObject.parseObject(contractInvoice.getInvoicePreview()), GenInvoiceInfoVo.class);
JSONArray bodyItem = new JSONArray();
for (InvoiceItemVo invoiceItemVo : vo.getInvoiceItemList()) {
JSONObject item = new JSONObject();
-
- JSONObject freeCh = new JSONObject();
- freeCh.put("JT32","");
- item.put("freeChId",freeCh);
-
- item.put("invoiceNo",contractInvoice.getInvoiceNo());
- item.put("materialCode",invoiceItemVo.getErpCode());
+ item.put("invoiceNo", contractInvoice.getInvoiceNo());
item.put("taxRate", invoiceItemVo.getTaxRate());
item.put("oriTaxAmount", invoiceItemVo.getPriceTax());
- item.put("oriTaxExcludedAmount", invoiceItemVo.getPriceNoTax());
- item.put("oriTaxIncludedAmount", invoiceItemVo.getUnitPrice().multiply(invoiceItemVo.getQuantity()));
- item.put("_status","Insert");
+ item.put("oriTaxIncludedAmount", invoiceItemVo.getPriceAndTax());
+ item.put("_status", "Insert");
bodyItem.add(item);
}
- data.put("bodyItem",bodyItem);
- jsonObject.put("data",data);
- return jsonObject;
+ data.put("bodyItem", bodyItem);
+ jsonObject.put("data", data);
+ return jsonObject;
}
@Override
@@ -649,25 +1100,36 @@
if (bwFlag) {
List<ContractInvoice> contractInvoices = baseMapper.selectList(Wrappers.<ContractInvoice>lambdaQuery()
.eq(ContractInvoice::getInvoiceCategory, "2").eq(ContractInvoice::getInvoiceStatus, "3"));
- if (ArrayUtil.isNotEmpty(contractInvoices.toArray())) {
+ if (ArrayUtil.isNotEmpty(contractInvoices)) {
contractInvoices.stream().forEach(contractInvoice -> {
JSONObject request = new JSONObject();
- request.put("taxNo", contractInvoice.getTexNo());
- JSONObject data = new JSONObject();
- data.put("redConfirmSerialNo", contractInvoice.getSerialNo());
- data.put("buySelSelector", "1");
+ request.put("taxNo", contractInvoice.getTaxNo());
+ request.put("redConfirmSerialNo", contractInvoice.getSerialNo());
+ request.put("buySelSelector", "0");
+ request.put("invoiceStartDate", DateUtil.formatDate(DateUtil.beginOfYear(new Date())));
+ request.put("invoiceEndDate", DateUtil.formatDate(DateUtil.endOfYear(new Date())));
String requestId = IdUtil.fastUUID();
log.info("serial_no:{},绾㈠瓧纭鍗曟煡璇㈠叆鍙傦細{},", contractInvoice.getSerialNo(), request.toJSONString());
String result = HttpUtil.post("method=baiwang.output.redinvoice.formlist&&version=1.0&request_id=" + requestId, request.toJSONString());
log.info("serial_no:{},绾㈠瓧纭鍗曟煡璇㈠洖鍙傦細{},", contractInvoice.getSerialNo(), result);
JSONObject resultObj = JSONObject.parseObject(result);
saveBwRequestRecord("baiwang.output.redinvoice.formlist", requestId, request.toJSONString(), result);
- if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) && resultObj.getBoolean("success")) {
- JSONArray models = JSONArray.parseArray(resultObj.getString("model"));
- if (ArrayUtil.isNotEmpty(models.toArray())) {
- contractInvoice.setInvoiceStatus("2");
+ if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) &&
+ !resultObj.getBoolean("success")) {
+ log.error("绾㈠瓧纭鍗曞け璐ワ紒锛侊紒");
+ return;
+ }
+ JSONArray models = resultObj.getJSONArray("model");
+ if (ArrayUtil.isNotEmpty(models)) {
+ JSONObject model = (JSONObject) models.get(0);
+
+ if (StrUtil.isEmpty(model.getString("confirmBillingMark")) || StrUtil.equals(model.getString("confirmBillingMark"), "N")) {
+ //绾㈠啿澶辫触
+ contractInvoice.setRedReversal("2");
+ } else if (StrUtil.equals(model.getString("confirmBillingMark"), "Y")) {
+ //纭鍗冲紑
+ contractInvoice.setInvoiceNo(model.getString("redInvoiceNo"));
contractInvoice.setRedReversal("1");
- baseMapper.updateById(contractInvoice);
//鎺ㄩ�丅IP
pushBipInvoice(contractInvoice);
}
@@ -681,139 +1143,225 @@
@Override
public void takeEffect(Long id) {
ContractInvoice invoice = baseMapper.selectById(id);
+ R<SysDept> r = remoteDeptService.getById(SecurityUtils.getUser().getCompId());
+ if (!r.isOk()) {
+ log.error("鍗曚綅淇℃伅鏌ヨ寮傚父");
+ return;
+ }
+ SysDept dept = r.getData();
Contract contract = contractMapper.selectById(invoice.getContractId());
GenInvoiceInfoVo vo = BeanUtil.copyProperties(JSONObject.parseObject(invoice.getInvoicePreview()), GenInvoiceInfoVo.class);
vo.setContractCategory(contract.getContractCategory());
+ invoice.setApprovalStatus("1");
+ baseMapper.updateById(invoice);
+ invoice.setBwRequestResult("0");
+
//钃濈エ
if (invoice.getInvoiceCategory().equals("1")) {
- // TODO 寮�钃濈エ鎺ュ彛
- JSONObject request = genBlueInvoice(vo, invoice.getSerialNo());
+ // TODO 寮�钃濈エ鎺ュ彛鏈哄姩杞�
+ if (StrUtil.equals(vo.getInvoiceVehicleType(), "3")) {
+ JSONObject request = genBlueInvoiceVehicle(vo, invoice.getSerialNo(), dept);
+ String requestId = IdUtil.fastUUID();
+ invoice.setBwRequestId(requestId);
+ invoice.setBwRequestParam(request.toJSONString());
+ log.info("鏈哄姩杞﹀彂绁ㄥ紑鍏疯姹傛帴鍙ｅ叆鍙�:{}", request.toJSONString());
+ String result = HttpUtil.post(bwUrl + "method=baiwang.output.invoice.vehicleissue&version=1.0&requestId=" + requestId, request.toJSONString());
+ log.info("鏈哄姩杞﹀彂绁ㄥ紑鍏疯姹傛帴鍙ｅ洖鍙�:{}", result);
+ saveBwRequestRecord("baiwang.output.invoice.vehicleissue", requestId, request.toJSONString(), result);
+ JSONObject resultObj = JSONObject.parseObject(result);
+ if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) &&
+ resultObj.getBoolean("success")) {
+ log.info("寮�绁ㄦ垚鍔燂紒锛侊紒");
+ invoice.setBwRequestResult("1");
+ }
+ JSONObject modelJson = resultObj.getJSONObject("model");
+ if (ObjUtil.isNotNull(modelJson)) {
+ Date invoiceDate = DateUtil.parse(modelJson.getString("invoiceDate"), DatePattern.PURE_DATETIME_PATTERN);
+ invoice.setInvoiceTime(invoiceDate);
+ invoice.setInvoiceNo(modelJson.getString("invoiceNo"));
+ //鎺ㄩ�丅IP
+ pushBipInvoice(invoice);
+ }
+ }
+
+ // TODO 寮�钃濈エ鎺ュ彛 闈炴満鍔ㄨ溅
+ JSONObject request = genBlueInvoice(vo, invoice.getSerialNo(), dept);
if (bwFlag) {
String requestId = IdUtil.fastUUID();
- log.info("钃濈エ璇锋眰鎺ュ彛鍏ュ弬", request.toJSONString());
+ invoice.setBwRequestId(requestId);
+ invoice.setBwRequestParam(request.toJSONString());
+ log.info("钃濈エ璇锋眰鎺ュ彛鍏ュ弬:{}", request.toJSONString());
String result = HttpUtil.post(bwUrl + "method=baiwang.output.invoice.issue&version=1.0&requestId=" + requestId, request.toJSONString());
- log.info("钃濈エ璇锋眰鎺ュ彛鍥炲弬", result);
+ log.info("钃濈エ璇锋眰鎺ュ彛鍥炲弬:{}", result);
saveBwRequestRecord("baiwang.output.invoice.issue", requestId, request.toJSONString(), result);
JSONObject resultObj = JSONObject.parseObject(result);
if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) &&
- !resultObj.getBoolean("success")) {
+ resultObj.getBoolean("success")) {
+ log.info("寮�绁ㄦ垚鍔燂紒锛侊紒");
+ invoice.setBwRequestResult("1");
}
- JSONArray models = JSONArray.parseArray(resultObj.getString("success"));
- if (ArrayUtil.isNotEmpty(models.toArray())) {
- JSONObject model = (JSONObject) models.get(0);
- Date invoiceDate = DateUtil.parse(model.getString("invoiceDate"), DatePattern.PURE_DATETIME_PATTERN);
- invoice.setInvoiceTime(invoiceDate);
- invoice.setInvoiceNo(model.getString("invoiceNo"));
+ JSONObject modelJson = resultObj.getJSONObject("model");
+ if (ObjUtil.isNotNull(modelJson)) {
+ JSONArray models = modelJson.getJSONArray("success");
+ if (CollUtil.isNotEmpty(models)) {
+ JSONObject model = (JSONObject) models.get(0);
+ Date invoiceDate = DateUtil.parse(model.getString("invoiceDate"), DatePattern.PURE_DATETIME_PATTERN);
+ invoice.setInvoiceTime(invoiceDate);
+ invoice.setInvoiceNo(model.getString("invoiceNo"));
+ //鎺ㄩ�丅IP
+ pushBipInvoice(invoice);
+ }
}
}
- if (!StrUtil.equals(contract.getContractCategory(),"water_house")) {
+ if (StrUtil.isNotBlank(vo.getAdvanceInvoice())) {
+ contract.setBillingAmout(vo.getTotalPrice().add(contract.getBillingAmout()));
+ contractMapper.updateById(contract);
+ return;
+ }
+ if (!StrUtil.equals(contract.getContractCategory(), "water_house")) {
//鍚堝悓鐘舵��
if (StrUtil.equals(contract.getBillingStatus(), "2")) {
contract.setBillingAmout(vo.getTotalPrice().add(contract.getBillingAmout()));
- if (contract.getBillingAmout().compareTo(contract.getAmount()) == 0) {
+ if (contract.getBillingAmout().compareTo(contract.getAmount()) == 0 &&
+ contract.getPaidAmount().compareTo(contract.getAmount().subtract(contract.getDropAmount())) == 0) {
contract.setBillingStatus("3");
+ contract.setContractStatus(3);
}
if (contract.getBillingAmout().compareTo(contract.getAmount()) < 0) {
contract.setBillingStatus("1");
+ List<ContractOutBound> outBoundList = contractOutBoundMapper.selectList(Wrappers.<ContractOutBound>lambdaQuery()
+ .eq(ContractOutBound::getContractId, contract.getId())
+ .apply("invoice_num < out_bound_num"));
+ if (CollUtil.isNotEmpty(outBoundList)) {
+ contract.setBillingStatus("2");
+ }
+
}
//闃叉閲嶅瀹″紑绁ㄥ鏍搁�氳繃鍚� 寮�绁ㄩ噾棰濊秴鍑哄悎鍚岄噾棰�
- if (contract.getBillingAmout().compareTo(contract.getAmount())>0){
+ if (contract.getBillingAmout().compareTo(contract.getAmount()) > 0) {
contract.setBillingAmout(contract.getAmount());
}
contractMapper.updateById(contract);
}
- }else {
+ } else {
//鍒ゆ柇 寰幆鏄惁瀹屾垚
- List<ContractExecDate> execDateList = contractExecDateMapper.selectList(Wrappers.<ContractExecDate>lambdaQuery().eq(ContractExecDate::getContractId,contract.getId())
- .eq(ContractExecDate::getGenFlag,"0"));
- List<MeterReadRecord> recordList = meterReadRecordMapper.selectList(Wrappers.<MeterReadRecord>lambdaQuery()
- .eq(MeterReadRecord::getContractId,contract.getId())
- .isNull(MeterReadRecord::getMeterReadNum));
- if (ArrayUtil.isEmpty(execDateList.toArray())&&ArrayUtil.isEmpty(recordList.toArray())) {
+ List<ContractExecDate> execDateList = contractExecDateMapper.selectList(Wrappers.<ContractExecDate>lambdaQuery().eq(ContractExecDate::getContractId, contract.getId())
+ .eq(ContractExecDate::getGenFlag, "0"));
+ if (CollUtil.isEmpty(execDateList)) {
//鍒ゆ柇鏄惁鏈夊彲寮�绁ㄨ褰�
List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
- .eq(ContractPaymentSchedule::getContractId,contract.getId()).eq(ContractPaymentSchedule::getInvoiceFlag,"0"));
- if (ArrayUtil.isEmpty(scheduleList.toArray())){
+ .eq(ContractPaymentSchedule::getContractId, contract.getId()).eq(ContractPaymentSchedule::getInvoiceFlag, "0"));
+ if (ArrayUtil.isEmpty(scheduleList)) {
contract.setBillingStatus("3");
- }else {
+ } else {
contract.setBillingStatus("2");
}
-
- }else {
+ contract.setBillingAmout(vo.getTotalPrice().add(contract.getBillingAmout()));
+ if (contract.getBillingAmout().compareTo(contract.getAmount()) == 0 &&
+ contract.getPaidAmount().compareTo(contract.getAmount().subtract(contract.getDropAmount())) == 0) {
+ contract.setBillingStatus("3");
+ contract.setContractStatus(3);
+ }
+ //闃叉閲嶅瀹″紑绁ㄥ鏍搁�氳繃鍚� 寮�绁ㄩ噾棰濊秴鍑哄悎鍚岄噾棰�
+ if (contract.getBillingAmout().compareTo(contract.getAmount()) > 0) {
+ contract.setBillingAmout(contract.getAmount());
+ }
+ } else {
//鍒ゆ柇鏄惁鏈夊彲寮�绁ㄨ褰�
List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
- .eq(ContractPaymentSchedule::getContractId,contract.getId()));
- if (ArrayUtil.isEmpty(scheduleList.toArray())){
+ .eq(ContractPaymentSchedule::getContractId, contract.getId()));
+ if (ArrayUtil.isEmpty(scheduleList)) {
contract.setBillingStatus("1");
- }else {
+ } else {
contract.setBillingStatus("2");
}
}
- contract.setBillingAmout(vo.getTotalPrice().add(contract.getBillingAmout()));
- //闃叉閲嶅瀹″紑绁ㄥ鏍搁�氳繃鍚� 寮�绁ㄩ噾棰濊秴鍑哄悎鍚岄噾棰�
- if (contract.getBillingAmout().compareTo(contract.getAmount())>0){
- contract.setBillingAmout(contract.getAmount());
- }
+
contractMapper.updateById(contract);
}
+ baseMapper.updateById(invoice);
}
//绾㈢エ
if (invoice.getInvoiceCategory().equals("2")) {
// TODO 寮�绾㈢エ鎺ュ彛
ContractInvoice blueInvoice = baseMapper.selectById(invoice.getBlueInvoiceId());
- JSONObject request = genRedInvoice(contract,blueInvoice, invoice.getSerialNo());
+ JSONObject request = genRedInvoice(contract, blueInvoice, invoice.getSerialNo());
String requestId = IdUtil.fastUUID();
+ invoice.setBwRequestId(requestId);
+ invoice.setBwRequestParam(request.toJSONString());
if (bwFlag) {
- log.info("绾㈠瓧纭鍗曡姹傛帴鍙ｅ叆鍙�", request.toJSONString());
+ log.info("绾㈠瓧纭鍗曡姹傛帴鍙ｅ叆鍙�:{}", request.toJSONString());
String result = HttpUtil.post(bwUrl + "method=baiwang.output.redinvoice.add&version=1.0&requestId=" + requestId, request.toJSONString());
- log.info("绾㈠瓧纭鍗曡姹傛帴鍙ｅ洖鍙�", result);
+ log.info("绾㈠瓧纭鍗曡姹傛帴鍙ｅ洖鍙�:{}", result);
saveBwRequestRecord("baiwang.output.redinvoice.add", requestId, request.toJSONString(), result);
JSONObject resultObj = JSONObject.parseObject(result);
if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) &&
- !resultObj.getBoolean("success")) {
- JSONArray models = JSONArray.parseArray(resultObj.getString("success"));
- if (ArrayUtil.isNotEmpty(models.toArray())) {
- JSONObject model = (JSONObject) models.get(0);
+ resultObj.getBoolean("success")) {
+ log.info("绾㈠瓧纭鍗曟垚鍔燂紒锛侊紒");
+ invoice.setBwRequestResult("1");
- if (StrUtil.isEmpty(model.getString("confirmBillingMark"))||StrUtil.equals(model.getString("confirmBillingMark"),"N")) {
- //绛夊緟纭
- invoice.setRedReversal("3");
- }else if (StrUtil.equals(model.getString("confirmBillingMark"),"Y")) {
- //纭鍗冲紑
- invoice.setInvoiceNo(model.getString("redInvoiceNo"));
- invoice.setRedReversal("1");
- //鎺ㄩ�丅IP
- pushBipInvoice(invoice);
- }
+ }
+ JSONArray models = resultObj.getJSONArray("model");
+ if (CollUtil.isNotEmpty(models)) {
+ JSONObject model = (JSONObject) models.get(0);
+
+ if (StrUtil.isEmpty(model.getString("confirmBillingMark")) || StrUtil.equals(model.getString("confirmBillingMark"), "N")) {
+ //绛夊緟纭
+ invoice.setRedReversal("3");
+ } else if (StrUtil.equals(model.getString("confirmBillingMark"), "Y")) {
+ //纭鍗冲紑
+ invoice.setInvoiceNo(model.getString("redInvoiceNo"));
+ invoice.setRedReversal("1");
+ //鎺ㄩ�丅IP
+ pushBipInvoice(invoice);
}
}
}
+ baseMapper.updateById(invoice);
contract.setBillingAmout(contract.getBillingAmout().subtract(invoice.getInvoiceTotalPriceTax()));
//闃叉閲嶅瀹″紑绁ㄥ鏍搁�氳繃鍚� 寮�绁ㄩ噾棰濅负璐�
- if (contract.getBillingAmout().compareTo(new BigDecimal("0"))<0){
+ if (contract.getBillingAmout().compareTo(new BigDecimal("0")) < 0) {
contract.setBillingAmout(new BigDecimal("0"));
+ }
+ contractMapper.updateById(contract);
+ blueInvoice.setRedReversal("1");
+ baseMapper.updateById(blueInvoice);
+ if (StrUtil.isNotBlank(vo.getAdvanceInvoice())) {
+ //杩樺師棰勫紑鏁伴噺
+ List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList = BeanUtil.copyToList(JSONArray.parseArray(blueInvoice.getInvoicePreviewParam()), ContractOutBoundInvoiceVo.class);
+ if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList)) {
+ outBoundInvoiceVoList.stream().forEach(contractOutBoundInvoiceVo -> {
+ ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
+ if (ObjUtil.isNotNull(subjectMatter)) {
+ subjectMatter.setAdvanceNum(subjectMatter.getAdvanceNum().subtract(contractOutBoundInvoiceVo.getInvoiceNum()));
+ if (subjectMatter.getAdvanceNum().compareTo(new BigDecimal("0")) <= 0) {
+ subjectMatter.setAdvanceNum(new BigDecimal("0"));
+ }
+ contractSubjectMatterMapper.updateById(subjectMatter);
+ }
+ });
+ }
+ return;
}
//鏇存柊鍚堝悓寮�绁ㄧ姸鎬� 鍓嶆彁鍑哄簱瀹屾垚
contract.setBillingStatus("2");
contractMapper.updateById(contract);
- blueInvoice.setRedReversal("1");
- baseMapper.updateById(blueInvoice);
- if (!StrUtil.equals(contract.getContractCategory(),"water_house")) {
+ if (!StrUtil.equals(contract.getContractCategory(), "water_house")) {
//鏇存柊鍚堝悓鍑哄簱鍗曠姸鎬�
List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList = BeanUtil.copyToList(JSONArray.parseArray(blueInvoice.getInvoicePreviewParam()), ContractOutBoundInvoiceVo.class);
- if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList.toArray())) {
+ if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList)) {
outBoundInvoiceVoList.stream().forEach(contractOutBoundInvoiceVo -> {
ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
- if (contractOutBoundInvoiceVo.getInvoiceNum().compareTo(contractOutBound.getOutBoundNum().subtract(contractOutBound.getInvoiceNum()))<=0) {
+ if (contractOutBoundInvoiceVo.getInvoiceNum().compareTo(contractOutBound.getOutBoundNum().subtract(contractOutBound.getInvoiceNum())) <= 0) {
contractOutBound.setInvoiceNum(contractOutBound.getInvoiceNum().subtract(contractOutBoundInvoiceVo.getInvoiceNum()));
contractOutBoundMapper.updateById(contractOutBound);
}
});
}
- }else {
+ } else {
//鏇存柊鍚堝悓鎴跨 姘寸數 璐瑰紑绁ㄧ姸鎬�
List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList = BeanUtil.copyToList(JSONArray.parseArray(blueInvoice.getInvoicePreviewParam()), ContractOutBoundInvoiceVo.class);
- if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList.toArray())) {
+ if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList)) {
outBoundInvoiceVoList.stream().forEach(contractOutBoundInvoiceVo -> {
ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
schedule.setInvoiceFlag("0");
@@ -822,8 +1370,57 @@
}
}
}
- invoice.setApprovalStatus("1");
- baseMapper.updateById(invoice);
+
+ }
+
+ private JSONObject genBlueInvoiceVehicle(GenInvoiceInfoVo vo, String serialNo, SysDept dept) {
+ JSONObject vechicleData = JSONObject.parseObject(vo.getVehicleData());
+ JSONObject jsonObject = new JSONObject();
+ //閿�鏂�
+ jsonObject.put("taxNo", vo.getPartyBOrgCode());//绋庡彿
+ jsonObject.put("invoiceTerminalCode", "JDCwxj");//瓒呰繃鍙戠エ鍗曞紶闄愰鏄惁闇�瑕佹媶鍒嗗紑鍏凤紝榛樿涓嶆媶鍒嗭紙鎷嗗垎鍙敮鎸佸彂绁ㄧ被鍨嬩唬鐮佷负 涓撶エ 004 鏅エ 007 鐢靛瓙绁� 026鐨�
+ jsonObject.put("formatGenerate", false);//鏄惁闇�瑕佺敓鎴愮増寮忚繑鍥炵増寮忛摼鎺�(true / false)
+ jsonObject.put("formatPushType", false);//鐗堝紡鐢熸垚鏄惁鎺ㄩ��(true / false)
+ jsonObject.put("taxUserName", dept.getInvoiceContact());
+ //data
+ JSONObject data = new JSONObject();
+ data.put("invoiceTypeCode", "03");
+ data.put("invoiceType", "0");
+ data.put("serialNo", serialNo);
+ //data.invoiceDetailsList
+ Integer lineNo = 1;
+ JSONObject invoiceDetail = new JSONObject();
+
+ invoiceDetail.put("vehicleNo", vo.getVehicleNo());
+ invoiceDetail.put("manufacturingEnterprise", "03");
+ invoiceDetail.put("originPlace", vechicleData.getString("originPlace"));
+ invoiceDetail.put("certificateNo", vo.getCertificateNo());
+ invoiceDetail.put("engineNo", vechicleData.getString("engineNo"));
+ invoiceDetail.put("tonnage", vechicleData.getString("tonnage"));
+ invoiceDetail.put("passengersLimited", vechicleData.getString("passengersLimited"));
+ invoiceDetail.put("brandModel", vechicleData.getString("brandModel"));
+
+ invoiceDetail.put("goodsCode", vo.getInvoiceItemList().get(0).getTaxCode());
+ invoiceDetail.put("goodsTaxRate", vo.getInvoiceItemList().get(0).getTaxRate().divide(new BigDecimal("100")));
+ if (!StrUtil.equals(vo.getContractCategory(), "water_house")) {
+ invoiceDetail.put("goodsTotalPrice", vo.getInvoiceItemList().get(0).getPriceNoTax());
+ } else {
+ invoiceDetail.put("goodsTotalPrice", vo.getInvoiceItemList().get(0).getPriceNoTax());
+ }
+ invoiceDetail.put("goodsTotalTax", vo.getInvoiceItemList().get(0).getPriceTax());
+ data.put("invoiceVehicleInfo", invoiceDetail);
+ //璐柟
+ data.put("buyerTaxNo", vo.getPartyAOrgCode());
+ data.put("buyerName", vo.getPartyA());
+ data.put("sellerTaxNo", vo.getPartyBOrgCode());// TODO 绋庡姟鎬诲眬绯荤粺鐧婚檰浜烘墜鏈哄彿
+ data.put("invoiceTotalPrice", vo.getTotalPrice().subtract(vo.getTotalTax()));
+ data.put("invoiceTotalPriceTax", vo.getTotalPrice());
+ data.put("invoiceTotalTax", vo.getTotalTax());
+ data.put("buyerBankName", vo.getPartyAOpenBank());
+ data.put("buyerBankNumber", vo.getPartyABankAccount());
+
+ jsonObject.put("data", data);
+ return jsonObject;
}
@Override
@@ -834,22 +1431,22 @@
Contract contract = contractMapper.selectById(invoice.getContractId());
//钃濈エ
if (invoice.getInvoiceCategory().equals("1")) {
- if (!StrUtil.equals(contract.getContractCategory(),"water_house")) {
+ if (!StrUtil.equals(contract.getContractCategory(), "water_house")) {
//鏇存柊鍚堝悓鍑哄簱鍗曠姸鎬�
List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList = BeanUtil.copyToList(JSONArray.parseArray(invoice.getInvoicePreviewParam()), ContractOutBoundInvoiceVo.class);
- if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList.toArray())) {
+ if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList)) {
outBoundInvoiceVoList.stream().forEach(contractOutBoundInvoiceVo -> {
ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
- if (contractOutBoundInvoiceVo.getInvoiceNum().compareTo(contractOutBound.getOutBoundNum().subtract(contractOutBound.getInvoiceNum()))<=0) {
+ if (contractOutBoundInvoiceVo.getInvoiceNum().compareTo(contractOutBound.getOutBoundNum().subtract(contractOutBound.getInvoiceNum())) <= 0) {
contractOutBound.setInvoiceNum(contractOutBound.getInvoiceNum().subtract(contractOutBoundInvoiceVo.getInvoiceNum()));
contractOutBoundMapper.updateById(contractOutBound);
}
});
}
- }else {
+ } else {
//鏇存柊鍚堝悓鎴跨 姘寸數 璐瑰紑绁ㄧ姸鎬�
List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList = BeanUtil.copyToList(JSONArray.parseArray(invoice.getInvoicePreviewParam()), ContractOutBoundInvoiceVo.class);
- if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList.toArray())) {
+ if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList)) {
outBoundInvoiceVoList.stream().forEach(contractOutBoundInvoiceVo -> {
ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
schedule.setInvoiceFlag("0");
@@ -870,11 +1467,251 @@
@Override
public Page pageInvoice(Page page, ContractInvoiceQueryDTO queryDTO) {
- return baseMapper.pageInvoice(page,queryDTO, DataScope.of("comp_id"));
+ return baseMapper.pageInvoice(page, queryDTO, DataScope.of("comp_id"));
}
@Override
public Page pageScope(Page page, ContractQueryDTO queryDTO) {
- return baseMapper.pageScope(page,queryDTO, DataScope.of("comp_id"));
+ return baseMapper.pageScope(page, queryDTO, DataScope.of("comp_id"));
+ }
+
+ @Override
+ public R refresh(Long invoiceId) {
+ ContractInvoice invoice = baseMapper.selectById(invoiceId);
+ //钃濈エ
+ if (invoice.getInvoiceCategory().equals("1")) {
+ // TODO 寮�钃濈エ鎺ュ彛
+ if (bwFlag) {
+ String requestId = IdUtil.fastUUID();
+ invoice.setBwRequestId(requestId);
+ invoice.setBwRequestResult("1");
+ invoice.setBwRequestParam(invoice.getBwRequestParam());
+ log.info("钃濈エ璇锋眰鎺ュ彛鍏ュ弬:{}", invoice.getBwRequestParam());
+ String result = HttpUtil.post(bwUrl + "method=baiwang.output.invoice.issue&version=1.0&requestId=" + requestId, invoice.getBwRequestParam());
+ log.info("钃濈エ璇锋眰鎺ュ彛鍥炲弬:{}", result);
+ saveBwRequestRecord("baiwang.output.invoice.issue", requestId, invoice.getBwRequestParam(), result);
+ JSONObject resultObj = JSONObject.parseObject(result);
+ if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) &&
+ !resultObj.getBoolean("success")) {
+ log.error("寮�绁ㄥけ璐ワ紒锛侊紒");
+ return R.failed(resultObj.getString("message"));
+ }
+ invoice.setBwRequestResult("1");
+ JSONObject modelJson = resultObj.getJSONObject("model");
+ JSONArray models = modelJson.getJSONArray("success");
+ if (CollUtil.isNotEmpty(models)) {
+ JSONObject model = (JSONObject) models.get(0);
+ Date invoiceDate = DateUtil.parse(model.getString("invoiceDate"), DatePattern.PURE_DATETIME_PATTERN);
+ invoice.setInvoiceTime(invoiceDate);
+ invoice.setInvoiceNo(model.getString("invoiceNo"));
+ //鎺ㄩ�丅IP
+ pushBipInvoice(invoice);
+ }
+ }
+ }
+ //绾㈢エ
+ if (invoice.getInvoiceCategory().equals("2")) {
+ // TODO 寮�绾㈢エ鎺ュ彛
+ String requestId = IdUtil.fastUUID();
+ invoice.setBwRequestId(requestId);
+ invoice.setBwRequestParam(invoice.getBwRequestParam());
+ if (bwFlag) {
+ log.info("绾㈠瓧纭鍗曡姹傛帴鍙ｅ叆鍙�:{}", invoice.getBwRequestParam());
+ String result = HttpUtil.post(bwUrl + "method=baiwang.output.redinvoice.add&version=1.0&requestId=" + requestId, invoice.getBwRequestParam());
+ log.info("绾㈠瓧纭鍗曡姹傛帴鍙ｅ洖鍙�:{}", result);
+ saveBwRequestRecord("baiwang.output.redinvoice.add", requestId, invoice.getBwRequestParam(), result);
+ JSONObject resultObj = JSONObject.parseObject(result);
+ if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) &&
+ !resultObj.getBoolean("success")) {
+ log.error("绾㈠瓧纭鍗曞け璐ワ紒锛侊紒");
+
+ return R.failed(resultObj.getString("message"));
+ }
+ invoice.setBwRequestResult("1");
+ JSONArray models = resultObj.getJSONArray("model");
+ if (ArrayUtil.isNotEmpty(models)) {
+ JSONObject model = (JSONObject) models.get(0);
+ if (StrUtil.isEmpty(model.getString("confirmBillingMark")) || StrUtil.equals(model.getString("confirmBillingMark"), "N")) {
+ //绛夊緟纭
+ invoice.setRedReversal("3");
+ } else if (StrUtil.equals(model.getString("confirmBillingMark"), "Y")) {
+ //纭鍗冲紑
+ invoice.setInvoiceNo(model.getString("redInvoiceNo"));
+ invoice.setRedReversal("1");
+ //鎺ㄩ�丅IP
+ pushBipInvoice(invoice);
+ }
+ }
+ }
+ }
+ baseMapper.updateById(invoice);
+ return R.ok();
+ }
+
+ @Override
+ public R bipPush(Long invoiceId) {
+ ContractInvoice contractInvoice = baseMapper.selectById(invoiceId);
+ String accessToken = "";
+ if (redisTemplate.hasKey("BIP_TOKEN")) {
+ accessToken = (String) redisTemplate.opsForValue().get("BIP_TOKEN");
+ } else {
+ accessToken = paymentConfirmService.getAccessToken(accessToken);
+ }
+ if (StrUtil.isEmpty(accessToken)) {
+ log.error("bip accessToken 鑾峰彇寮傚父");
+ return R.failed("bip accessToken 鑾峰彇寮傚父");
+ }
+ Contract contract = contractMapper.selectById(contractInvoice.getContractId());
+ if (ObjUtil.isNull(contract)) {
+ log.error("鏌ヨ鍚堝悓淇℃伅寮傚父");
+ return R.failed("鏌ヨ鍚堝悓淇℃伅寮傚父");
+ }
+ BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+ if (ObjUtil.isNull(customer) || StrUtil.isEmpty(customer.getBipCode())) {
+ log.error("鏌ヨ鍚堝悓淇℃伅寮傚父");
+ return R.failed("鏌ヨ鍚堝悓淇℃伅寮傚父");
+ }
+ R<SysDept> r = remoteDeptService.getById(contract.getPartyBId());
+ if (!r.isOk()) {
+ log.error("鏌ヨ鍗曚綅淇℃伅寮傚父");
+ return R.failed("鏌ヨ鍗曚綅淇℃伅寮傚父");
+ }
+ SysDept comp = r.getData();
+
+ R<SysDept> rDept = remoteDeptService.getById(SecurityUtils.getUser().getDeptId());
+ if (!r.isOk()) {
+ log.error("鏌ヨ閮ㄩ棬淇℃伅寮傚父");
+ return R.failed("鏌ヨ閮ㄩ棬淇℃伅寮傚父");
+ }
+ SysDept dept = rDept.getData();
+
+ //钃濈エ
+ if (StrUtil.equals(contractInvoice.getInvoiceCategory(), "1")) {
+ JSONObject params = genBlueReceiveParams(contractInvoice, contract, customer, comp, dept);
+ String finalAccessToken = accessToken;
+
+ log.info("搴旀敹鍙戠エ闆嗘垚鍏ュ弬:{}", params.toJSONString());
+ String result = HttpUtil.post(url + "/yonbip/EFI/receivable/saveandsubmit?access_token=" + finalAccessToken, params.toJSONString());
+ log.info("搴旀敹鍙戠エ闆嗘垚鍥炲弬:{}", result);
+ //淇濆瓨璇锋眰璁板綍
+ paymentConfirmService.saveBipRequestRecord(params, "搴旀敹鍙戠エ闆嗘垚鎺ュ彛", result);
+ JSONObject resultJson = JSONObject.parseObject(result);
+ if (resultJson.containsKey("code") && resultJson.getString("code").equals("200")) {
+ JSONObject data = resultJson.getJSONObject("data");
+ contractInvoice.setBipPush("1");
+ contractInvoice.setBipId(data.getLong("id"));
+ contractInvoice.setBipBody(resultJson.getString("data"));
+ baseMapper.updateById(contractInvoice);
+ return R.ok();
+ }
+ return R.failed(resultJson, "搴旀敹鍙戠エ闆嗘垚澶辫触");
+ }
+ //绾㈢エ
+ if (StrUtil.equals(contractInvoice.getInvoiceCategory(), "2")) {
+ JSONObject params = genRedReceiveParams(contractInvoice);
+ String finalAccessToken = accessToken;
+
+ log.info("搴旀敹鍙戠エ鍒犻櫎鍏ュ弬:{}", params.toJSONString());
+ String result = HttpUtil.post(url + "/yonbip/EFI/receivable/delete?access_token=" + finalAccessToken, params.toJSONString());
+ log.info("搴旀敹鍙戠エ鍒犻櫎鍥炲弬:{}", result);
+ //淇濆瓨璇锋眰璁板綍
+ paymentConfirmService.saveBipRequestRecord(params, "搴旀敹鍙戠エ鍒犻櫎鎺ュ彛", result);
+ JSONObject resultJson = JSONObject.parseObject(result);
+ if (resultJson.containsKey("code") && resultJson.getString("code").equals("200")) {
+ contractInvoice.setBipPush("1");
+ contractInvoice.setBipBody(resultJson.getString("data"));
+ baseMapper.updateById(contractInvoice);
+ return R.ok();
+ }
+ return R.failed(resultJson, "搴旀敹鍙戠エ鍒犻櫎澶辫触");
+ }
+ return R.ok();
+ }
+
+ @Override
+ public R queryInvoice(Page page, InvoiceQueryDTO queryDTO) {
+ R<SysDept> r = remoteDeptService.getById(SecurityUtils.getUser().getCompId());
+ if (!r.isOk()) {
+ log.error("鏌ヨ鍗曚綅淇℃伅寮傚父");
+ return R.failed("鏌ヨ鍗曚綅淇℃伅寮傚父");
+ }
+ SysDept comp = r.getData();
+
+ JSONObject request = genQueryInvoiceParam(page, queryDTO, comp);
+ String requestId = IdUtil.fastUUID();
+
+ log.info("宸插紑鍙戠エ鏌ヨ鎺ュ彛鍏ュ弬锛歿},", request.toJSONString());
+ String result = HttpUtil.post(bwUrl + "method=baiwang.output.invoice.query&version=1.0&request_id=" + requestId, request.toJSONString());
+ log.info("宸插紑鍙戠エ鏌ヨ鎺ュ彛鍥炲弬锛歿},", result);
+ saveBwRequestRecord("baiwang.output.invoice.query", requestId, request.toJSONString(), result);
+ JSONObject resultObj = JSONObject.parseObject(result);
+ if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) &&
+ !resultObj.getBoolean("success")) {
+ return R.failed("宸插紑鍙戠エ鏌ヨ", result);
+ }
+ JSONArray models = resultObj.getJSONArray("model");
+ if (CollUtil.isNotEmpty(models)) {
+ page.setRecords(models);
+ page.setTotal(resultObj.getInteger("total"));
+ return R.ok(page);
+ }
+ page.setTotal(0);
+ page.setRecords(null);
+ return R.ok(page);
+ }
+
+ private JSONObject genQueryInvoiceParam(Page page, InvoiceQueryDTO queryDTO, SysDept comp) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("taxNo", comp.getOrgCode());
+ JSONObject data = new JSONObject();
+ data.put("serialNo", StrUtil.isNotBlank(queryDTO.getSerialNo()) ? queryDTO.getSerialNo() : "");
+ data.put("invoiceCode", StrUtil.isNotBlank(queryDTO.getInvoiceCode()) ? queryDTO.getInvoiceCode() : "");
+ data.put("invoiceNo", StrUtil.isNotBlank(queryDTO.getInvoiceNo()) ? queryDTO.getInvoiceNo() : "");
+ data.put("invoiceTypeCode", StrUtil.isNotBlank(queryDTO.getInvoiceTypeCode()) ? queryDTO.getInvoiceTypeCode() : "");
+ data.put("invoiceTerminalCode", StrUtil.isNotBlank(queryDTO.getInvoiceTerminalCode()) ? queryDTO.getInvoiceTerminalCode() : "");
+ data.put("sourceMark", StrUtil.isNotBlank(queryDTO.getSourceMark()) ? queryDTO.getSourceMark() : "");
+ data.put("invoiceSpecialMark", StrUtil.isNotBlank(queryDTO.getInvoiceSpecialMark()) ? queryDTO.getInvoiceSpecialMark() : "");
+ data.put("buyerTaxNo", StrUtil.isNotBlank(queryDTO.getBuyerTaxNo()) ? queryDTO.getBuyerTaxNo() : "");
+ data.put("buyerName", StrUtil.isNotBlank(queryDTO.getBuyerName()) ? queryDTO.getBuyerName() : "");
+ data.put("invoiceStatus", StrUtil.isNotBlank(queryDTO.getInvoiceStatus()) ? queryDTO.getInvoiceStatus() : "");
+ data.put("invoiceType", StrUtil.isNotBlank(queryDTO.getInvoiceType()) ? queryDTO.getInvoiceType() : "");
+ data.put("invoiceStartDate", StrUtil.isNotBlank(queryDTO.getInvoiceStartDate()) ? queryDTO.getInvoiceStartDate() : "");
+ data.put("invoiceEndDate", StrUtil.isNotBlank(queryDTO.getInvoiceEndDate()) ? queryDTO.getInvoiceEndDate() : "");
+ data.put("machineNo", StrUtil.isNotBlank(queryDTO.getMachineNo()) ? queryDTO.getMachineNo() : "");
+ data.put("systemName", StrUtil.isNotBlank(queryDTO.getSystemName()) ? queryDTO.getSystemName() : "");
+ data.put("systemId", StrUtil.isNotBlank(queryDTO.getSystemId()) ? queryDTO.getSystemId() : "");
+ data.put("pageSize", page.getSize());
+ data.put("pageNo", page.getCurrent());
+ jsonObject.put("data", data);
+ return jsonObject;
+ }
+
+ @Override
+ public R add(ContractInvoice contractInvoice) {
+ Contract contract = contractMapper.selectById(contractInvoice.getContractId());
+ if (ObjUtil.isNull(contract)) {
+ return R.failed("鍚堝悓淇℃伅寮傚父");
+ }
+ List<ContractInvoice> invoiceList = baseMapper.selectList(Wrappers.<ContractInvoice>lambdaQuery()
+ .eq(ContractInvoice::getInvoiceNo, contractInvoice.getInvoiceNo()));
+ if (CollUtil.isNotEmpty(invoiceList)) {
+ return R.failed("鍙戠エ宸插瓨鍦紝璇峰嬁閲嶅鎿嶄綔");
+ }
+ contractInvoice.setInvoiceStatus("2");
+ contractInvoice.setInvoiceSource("1");
+ contractInvoice.setRedReversal("0");
+ contractInvoice.setApprovalStatus("1");
+ baseMapper.insert(contractInvoice);
+ contract.setBillingAmout(contract.getBillingAmout().add(contractInvoice.getInvoiceTotalPriceTax()));
+ if (contract.getBillingAmout().compareTo(contract.getAmount()) >= 0) {
+ contract.setBillingStatus("3");
+ }
+ contractMapper.updateById(contract);
+ return R.ok();
+ }
+
+ public static void main(String[] args) {
+ File file = new File("d://tmp//" + IdUtil.fastUUID() + ".pdf");
+ HttpUtil.downloadFile("http://fp.baiwang.com/format/d?d=BB99645F8ED2AE7D2055E7D29330D366B7CAE92C278C6BB84D222610CEC2118D", file);
}
}
--
Gitblit v1.9.1