root
/
jianshui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature:不动产兼容多条

Browse Source
beta-prop-all
dfh 5 months ago
parent da93cab30e
commit 5e4a804908
4 changed files with 34 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/Qdtxx.java
  2. 2
      jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/addInvoice/Bdczlxx.java
  3. 17
      jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ByInspurServiceImpl.java
  4. 17
      jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java

4
jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/Qdtxx.java
Unescape View File

@ -46,8 +46,8 @@ public class Qdtxx {
// private List<Bdcxsxx> BDCXSXX; // 不动产销售信息
private List<Bdcxsxx> BDCXSXXLIST; // 不动产销售信息
private Jzfwxx JZFWXX; // 建筑服务信息
private Bdczlxx BDCZLXX; // 建筑服务信息
private Bdczlxx BDCZLXX; // 不动产租赁
private List<Bdczlxx> BDCZLXXLIST;//不动产租赁多条
private Jdcxx JDCXX; // 机动车信息
private String MTPZXX;//煤炭品质信息

2
jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/addInvoice/Bdczlxx.java
Unescape View File

@ -9,6 +9,8 @@ import lombok.Data;
@Data
public class Bdczlxx {
private String XH;//序号
private String BDCDZ; // 不动产地址
private String KDSBZ; // 跨地(市)标志

17
jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ByInspurServiceImpl.java
Unescape View File

@ -37,6 +37,7 @@ import com.jianshui.invoice.domain.dto.*;
import com.jianshui.invoice.domain.dto.api.*;
import com.jianshui.invoice.domain.dto.api.elephant.*;
import com.jianshui.invoice.domain.dto.api.elephant.addInvoice.Bdcxsxx;
import com.jianshui.invoice.domain.dto.api.elephant.addInvoice.Bdczlxx;
import com.jianshui.invoice.domain.dto.api.elephant.sd.GetRpaAuthStatusDTO;
import com.jianshui.invoice.domain.dto.api.elephant.sd.HZQRDMXLIST;
import com.jianshui.invoice.domain.dto.api.elephant.sd.RedDownload;
@ -243,7 +244,19 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi
qdtxx.setJZFWXX(billInfo.getJzfwList().get(0));// 建筑服务信息
}
if(billInfo.getBdczlxxList() != null && !billInfo.getBdczlxxList().isEmpty()){
qdtxx.setBDCZLXX(billInfo.getBdczlxxList().get(0));// 不动产租赁信息
if (billInfo.getBdczlxxList().size() == 1){
qdtxx.setBDCZLXX(billInfo.getBdczlxxList().get(0));// 不动产租赁信息
}else {
List<Bdczlxx> bdczlxxList = billInfo.getBdczlxxList();
boolean isXhBlank = bdczlxxList.stream().anyMatch(bdczlxx -> StringUtils.isBlank(bdczlxx.getXH()));
if (isXhBlank){
int xh = 1;
for (Bdczlxx bdczlxx : bdczlxxList) {
bdczlxx.setXH(String.valueOf(xh++));
}
}
qdtxx.setBDCZLXXLIST(bdczlxxList);
}
}
if(billInfo.getJDCXX() != null ){
@ -262,7 +275,7 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi
} else if (BeanUtil.isNotEmpty(qdtxx.getJZFWXX())) {
// GenerateQdJzfwInvoice 建筑服务信息
url = ElephantConstantsV6.GENERATE_QD_JZFW_INVOICE;
} else if (BeanUtil.isNotEmpty(qdtxx.getBDCZLXX())) {
} else if (BeanUtil.isNotEmpty(qdtxx.getBDCZLXX())||BeanUtil.isNotEmpty(qdtxx.getBDCZLXXLIST())) {
// GenerateQdBdczlInvoice 不动产租赁信息
url = ElephantConstantsV6.GENERATE_QD_BDXZL_INVOICE;
}else if( BeanUtil.isNotEmpty(qdtxx.getJDCXX()) ){

17
jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java
Unescape View File

@ -39,6 +39,7 @@ import com.jianshui.invoice.domain.dto.*;
import com.jianshui.invoice.domain.dto.api.*;
import com.jianshui.invoice.domain.dto.api.elephant.*;
import com.jianshui.invoice.domain.dto.api.elephant.addInvoice.Bdcxsxx;
import com.jianshui.invoice.domain.dto.api.elephant.addInvoice.Bdczlxx;
import com.jianshui.invoice.domain.dto.api.elephant.addInvoice.Jzfwxx;
import com.jianshui.invoice.domain.dto.api.elephant.sd.GetRpaAuthStatusDTO;
import com.jianshui.invoice.domain.dto.api.elephant.sd.HZQRDMXLIST;
@ -292,7 +293,19 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
}
if (billInfo.getBdczlxxList() != null && !billInfo.getBdczlxxList().isEmpty()) {
qdtxx.setBDCZLXX(billInfo.getBdczlxxList().get(0));// 不动产租赁信息
if (billInfo.getBdczlxxList().size() == 1){
qdtxx.setBDCZLXX(billInfo.getBdczlxxList().get(0));// 不动产租赁信息
}else {
List<Bdczlxx> bdczlxxList = billInfo.getBdczlxxList();
boolean isXhBlank = bdczlxxList.stream().anyMatch(bdczlxx -> StringUtils.isBlank(bdczlxx.getXH()));
if (isXhBlank){
int xh = 1;
for (Bdczlxx bdczlxx : bdczlxxList) {
bdczlxx.setXH(String.valueOf(xh++));
}
}
qdtxx.setBDCZLXXLIST(bdczlxxList);
}
}
if (billInfo.getJDCXX() != null) {
@ -311,7 +324,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
} else if (BeanUtil.isNotEmpty(qdtxx.getJZFWXX())) {
// GenerateQdJzfwInvoice 建筑服务信息
url = ElephantConstantsV6.GENERATE_QD_JZFW_INVOICE;
} else if (BeanUtil.isNotEmpty(qdtxx.getBDCZLXX())) {
} else if (BeanUtil.isNotEmpty(qdtxx.getBDCZLXX())|| BeanUtil.isNotEmpty(qdtxx.getBDCZLXXLIST())) {
// GenerateQdBdczlInvoice 不动产租赁信息
url = ElephantConstantsV6.GENERATE_QD_BDXZL_INVOICE;
} else if (BeanUtil.isNotEmpty(qdtxx.getJDCXX())) {

Write Preview
Loading…
Cancel
Save