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

feature: 不动产销售改为多行明细

Browse Source
beta-prop-all
dongxiaoke 7 months ago
parent 4913051196
commit f6b74473b9
3 changed files with 14 additions and 13 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. 5
      jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/Qdtxx.java
  2. 8
      jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ByInspurServiceImpl.java
  3. 14
      jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java

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

@ -43,11 +43,12 @@ public class Qdtxx {
private List<Fjys> FJYSLIST; // 附加要素列表 private List<Fjys> FJYSLIST; // 附加要素列表
private List<Hwys> HWYSLIST; // 货物运输 private List<Hwys> HWYSLIST; // 货物运输
private Bdcxsxx BDCXSXX; // 不动产销售信息 // private List<Bdcxsxx> BDCXSXX; // 不动产销售信息
private List<Bdcxsxx> BDCXSXXLIST; // 不动产销售信息
private Jzfwxx JZFWXX; // 建筑服务信息 private Jzfwxx JZFWXX; // 建筑服务信息
private Bdczlxx BDCZLXX; // 建筑服务信息 private Bdczlxx BDCZLXX; // 建筑服务信息
private Jdcxx JDCXX; // 机动车信息 private Jdcxx JDCXX; // 机动车信息
} }

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

@ -224,7 +224,7 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi
if(billInfo.getBdcxsxxList() != null && !billInfo.getBdcxsxxList().isEmpty()){ if(billInfo.getBdcxsxxList() != null && !billInfo.getBdcxsxxList().isEmpty()){
qdtxx.setBDCXSXX(billInfo.getBdcxsxxList().get(0)); // 不动产销售信息 qdtxx.setBDCXSXXLIST(billInfo.getBdcxsxxList()); // 不动产销售信息
} }
if(billInfo.getJzfwList() != null && !billInfo.getJzfwList().isEmpty()){ if(billInfo.getJzfwList() != null && !billInfo.getJzfwList().isEmpty()){
qdtxx.setJZFWXX(billInfo.getJzfwList().get(0));// 建筑服务信息 qdtxx.setJZFWXX(billInfo.getJzfwList().get(0));// 建筑服务信息
@ -243,7 +243,7 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi
if (CollectionUtils.isNotEmpty(qdtxx.getHWYSLIST())) { if (CollectionUtils.isNotEmpty(qdtxx.getHWYSLIST())) {
//GenerateQdHwysInvoice 货物运输 //GenerateQdHwysInvoice 货物运输
url = ElephantConstantsV6.GENERATE_QD_HWYS_INVOICE; url = ElephantConstantsV6.GENERATE_QD_HWYS_INVOICE;
} else if (BeanUtil.isNotEmpty(qdtxx.getBDCXSXX())) { } else if (BeanUtil.isNotEmpty(qdtxx.getBDCXSXXLIST())) {
// GenerateQdBdcxsInvoice 不动产销售信息 // GenerateQdBdcxsInvoice 不动产销售信息
url = ElephantConstantsV6.GENERATE_QD_BDCXS_INVOICE; url = ElephantConstantsV6.GENERATE_QD_BDCXS_INVOICE;
} else if (BeanUtil.isNotEmpty(qdtxx.getJZFWXX())) { } else if (BeanUtil.isNotEmpty(qdtxx.getJZFWXX())) {
@ -3645,7 +3645,7 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi
qdtxx.setHWYSLIST(billInfo.getHwysList()); // 货物运输 qdtxx.setHWYSLIST(billInfo.getHwysList()); // 货物运输
if(billInfo.getBdcxsxxList() != null && !billInfo.getBdcxsxxList().isEmpty()){ if(billInfo.getBdcxsxxList() != null && !billInfo.getBdcxsxxList().isEmpty()){
qdtxx.setBDCXSXX(billInfo.getBdcxsxxList().get(0)); // 不动产销售信息 qdtxx.setBDCXSXXLIST(billInfo.getBdcxsxxList()); // 不动产销售信息
} }
if(billInfo.getJzfwList() != null && !billInfo.getJzfwList().isEmpty()){ if(billInfo.getJzfwList() != null && !billInfo.getJzfwList().isEmpty()){
qdtxx.setJZFWXX(billInfo.getJzfwList().get(0));// 建筑服务信息 qdtxx.setJZFWXX(billInfo.getJzfwList().get(0));// 建筑服务信息
@ -3665,7 +3665,7 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi
if (CollectionUtils.isNotEmpty(qdtxx.getHWYSLIST())) { if (CollectionUtils.isNotEmpty(qdtxx.getHWYSLIST())) {
//GenerateQdHwysInvoice 货物运输 //GenerateQdHwysInvoice 货物运输
url = ElephantConstantsV6.GENERATE_QD_HWYS_INVOICE; url = ElephantConstantsV6.GENERATE_QD_HWYS_INVOICE;
} else if (BeanUtil.isNotEmpty(qdtxx.getBDCXSXX())) { } else if (BeanUtil.isNotEmpty(qdtxx.getBDCXSXXLIST())) {
// GenerateQdBdcxsInvoice 不动产销售信息 // GenerateQdBdcxsInvoice 不动产销售信息
url = ElephantConstantsV6.GENERATE_QD_BDCXS_INVOICE; url = ElephantConstantsV6.GENERATE_QD_BDCXS_INVOICE;
} else if (BeanUtil.isNotEmpty(qdtxx.getJZFWXX())) { } else if (BeanUtil.isNotEmpty(qdtxx.getJZFWXX())) {

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

@ -265,7 +265,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
qdtxx.setHWYSLIST(billInfo.getHwysList()); // 货物运输 qdtxx.setHWYSLIST(billInfo.getHwysList()); // 货物运输
if (billInfo.getBdcxsxxList() != null && !billInfo.getBdcxsxxList().isEmpty()) { if (billInfo.getBdcxsxxList() != null && !billInfo.getBdcxsxxList().isEmpty()) {
qdtxx.setBDCXSXX(billInfo.getBdcxsxxList().get(0)); // 不动产销售信息 qdtxx.setBDCXSXXLIST(billInfo.getBdcxsxxList()); // 不动产销售信息
} }
if (billInfo.getJzfwList() != null && !billInfo.getJzfwList().isEmpty()) { if (billInfo.getJzfwList() != null && !billInfo.getJzfwList().isEmpty()) {
qdtxx.setJZFWXX(billInfo.getJzfwList().get(0));// 建筑服务信息 qdtxx.setJZFWXX(billInfo.getJzfwList().get(0));// 建筑服务信息
@ -288,7 +288,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
if (CollectionUtils.isNotEmpty(qdtxx.getHWYSLIST())) { if (CollectionUtils.isNotEmpty(qdtxx.getHWYSLIST())) {
//GenerateQdHwysInvoice 货物运输 //GenerateQdHwysInvoice 货物运输
url = ElephantConstantsV6.GENERATE_QD_HWYS_INVOICE; url = ElephantConstantsV6.GENERATE_QD_HWYS_INVOICE;
} else if (BeanUtil.isNotEmpty(qdtxx.getBDCXSXX())) { } else if (BeanUtil.isNotEmpty(qdtxx.getBDCXSXXLIST())) {
// GenerateQdBdcxsInvoice 不动产销售信息 // GenerateQdBdcxsInvoice 不动产销售信息
url = ElephantConstantsV6.GENERATE_QD_BDCXS_INVOICE; url = ElephantConstantsV6.GENERATE_QD_BDCXS_INVOICE;
} else if (BeanUtil.isNotEmpty(qdtxx.getJZFWXX())) { } else if (BeanUtil.isNotEmpty(qdtxx.getJZFWXX())) {
@ -384,7 +384,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
queryBody.put("DDRQQ", "0"); queryBody.put("DDRQQ", "0");
// 订单日期止 // 订单日期止
queryBody.put("DDRQZ", "0");*/ queryBody.put("DDRQZ", "0");*/
// queryResult = ElephantUtils.sendRequest(ElephantConstantsV6.ADD_INVOICE_RESULT, JSONUtil.parse(queryBody)); // queryResult = ElephantUtils.sendRequest(ElephantConstantsV6.ADD_INVOICE_RESULT, JSONUtil.parse(queryBody));
try { try {
queryResult = ElephantUtils.sendRequestWithoutTokenV6New(ElephantConstantsV6.ADD_INVOICE_RESULT_LOCALHOST, ElephantConstantsV6.ADD_INVOICE_RESULT_METHOD, JSONUtil.parse(queryBody), companyservice); queryResult = ElephantUtils.sendRequestWithoutTokenV6New(ElephantConstantsV6.ADD_INVOICE_RESULT_LOCALHOST, ElephantConstantsV6.ADD_INVOICE_RESULT_METHOD, JSONUtil.parse(queryBody), companyservice);
@ -517,7 +517,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
queryBody.put("NSRSBH", companyservice.getSellertax()); queryBody.put("NSRSBH", companyservice.getSellertax());
queryBody.put("DDQQLSH", originBillInfo.getSystemOrderno()); queryBody.put("DDQQLSH", originBillInfo.getSystemOrderno());
debugLog("断点4", uuid, timestamp); debugLog("断点4", uuid, timestamp);
@ -3734,7 +3734,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
qdtxx.setHWYSLIST(billInfo.getHwysList()); // 货物运输 qdtxx.setHWYSLIST(billInfo.getHwysList()); // 货物运输
if (billInfo.getBdcxsxxList() != null && !billInfo.getBdcxsxxList().isEmpty()) { if (billInfo.getBdcxsxxList() != null && !billInfo.getBdcxsxxList().isEmpty()) {
qdtxx.setBDCXSXX(billInfo.getBdcxsxxList().get(0)); // 不动产销售信息 qdtxx.setBDCXSXXLIST(billInfo.getBdcxsxxList()); // 不动产销售信息
} }
if (billInfo.getJzfwList() != null && !billInfo.getJzfwList().isEmpty()) { if (billInfo.getJzfwList() != null && !billInfo.getJzfwList().isEmpty()) {
qdtxx.setJZFWXX(billInfo.getJzfwList().get(0));// 建筑服务信息 qdtxx.setJZFWXX(billInfo.getJzfwList().get(0));// 建筑服务信息
@ -3752,7 +3752,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
if (CollectionUtils.isNotEmpty(qdtxx.getHWYSLIST())) { if (CollectionUtils.isNotEmpty(qdtxx.getHWYSLIST())) {
//GenerateQdHwysInvoice 货物运输 //GenerateQdHwysInvoice 货物运输
url = ElephantConstantsV6.GENERATE_QD_HWYS_INVOICE; url = ElephantConstantsV6.GENERATE_QD_HWYS_INVOICE;
} else if (BeanUtil.isNotEmpty(qdtxx.getBDCXSXX())) { } else if (BeanUtil.isNotEmpty(qdtxx.getBDCXSXXLIST())) {
// GenerateQdBdcxsInvoice 不动产销售信息 // GenerateQdBdcxsInvoice 不动产销售信息
url = ElephantConstantsV6.GENERATE_QD_BDCXS_INVOICE; url = ElephantConstantsV6.GENERATE_QD_BDCXS_INVOICE;
} else if (BeanUtil.isNotEmpty(qdtxx.getJZFWXX())) { } else if (BeanUtil.isNotEmpty(qdtxx.getJZFWXX())) {
@ -3849,7 +3849,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
queryBody.put("DDRQQ", "0"); queryBody.put("DDRQQ", "0");
// 订单日期止 // 订单日期止
queryBody.put("DDRQZ", "0");*/ queryBody.put("DDRQZ", "0");*/
// queryResult = ElephantUtils.sendRequest(ElephantConstantsV6.ADD_INVOICE_RESULT, JSONUtil.parse(queryBody)); // queryResult = ElephantUtils.sendRequest(ElephantConstantsV6.ADD_INVOICE_RESULT, JSONUtil.parse(queryBody));
try { try {
queryResult = ElephantUtils.sendRequestWithoutTokenV6New(ElephantConstantsV6.ADD_INVOICE_RESULT_LOCALHOST, ElephantConstantsV6.ADD_INVOICE_RESULT_METHOD, JSONUtil.parse(queryBody), companyservice); queryResult = ElephantUtils.sendRequestWithoutTokenV6New(ElephantConstantsV6.ADD_INVOICE_RESULT_LOCALHOST, ElephantConstantsV6.ADD_INVOICE_RESULT_METHOD, JSONUtil.parse(queryBody), companyservice);

Write Preview
Loading…
Cancel
Save