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

查验bug修复

Browse Source
beta-enc
kane 2 years ago
parent b726c4467a
commit 55fe025a64
4 changed files with 93 additions and 30 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. 116
      jianshui-admin/src/main/java/com/jianshui/api/controller/webservice/income/v1/impl/InvoiceCheckWebServiceImpl.java
  2. 1
      jianshui-income/src/main/java/com/jianshui/income/domain/entity/InvoiceCheck.java
  3. 4
      jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceSphVO.java
  4. 2
      jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceVO.java

116
jianshui-admin/src/main/java/com/jianshui/api/controller/webservice/income/v1/impl/InvoiceCheckWebServiceImpl.java
Unescape View File

@ -8,8 +8,10 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
// import com.jianshui.api.controller.webservice.income.v1.InvoiceCheckWebService;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.jianshui.api.exception.JianshuiExceptionHandler;
import com.jianshui.common.core.domain.AjaxResult;
import com.jianshui.common.core.domain.entity.Companyservice;
import com.jianshui.common.exception.jianshui.JianshuiServiceException;
import com.jianshui.common.utils.DateUtils;
import com.jianshui.common.utils.StringUtils;
import com.jianshui.common.utils.ToLowerBeanUtil;
@ -38,6 +40,7 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -304,30 +307,68 @@ public class InvoiceCheckWebServiceImpl {
InvoiceCheck invoiceCheck = new InvoiceCheck();
invoiceCheck = EleCheckInvoiceImpl.handelCheckResult(invoiceCheck, resultContent);
GetInvoiceVO getInvoiceVO = new GetInvoiceVO();
//二手车相关结果
getInvoiceVO.setGfdz(invoiceCheck.getInvoiceCheckUsedCar().getMfdwgrdz());
getInvoiceVO.setGfdh(invoiceCheck.getInvoiceCheckUsedCar().getMfdh());
getInvoiceVO.setXfdz(invoiceCheck.getInvoiceCheckUsedCar().getSmfdwgrzz());
getInvoiceVO.setCjh(invoiceCheck.getInvoiceCheckUsedCar().getClsbh());
getInvoiceVO.setZrdclglsmc(invoiceCheck.getInvoiceCheckUsedCar().getZrdcgsmc());
getInvoiceVO.setNsrsbh(invoiceCheck.getInvoiceCheckUsedCar().getJypmdwzsbh());
//机动车相关结果
getInvoiceVO.setHgzh(invoiceCheck.getInvoiceCheckCar().getHgzs());
getInvoiceVO.setJkzmsh(invoiceCheck.getInvoiceCheckCar().getJszmsh());
getInvoiceVO.setZh(invoiceCheck.getInvoiceCheckCar().getKhzh());
getInvoiceVO.setDh(invoiceCheck.getInvoiceCheckCar().getSmfdh());
//通用结果
getInvoiceVO.setXfmc(invoiceCheck.getXhfmc());
getInvoiceVO.setXfsbh(invoiceCheck.getXhfsbh());
getInvoiceVO.setXfdzdh(invoiceCheck.getXhfdzdh());
getInvoiceVO.setXfyhzh(invoiceCheck.getXhfyhzh());
BeanUtils.copyProperties(invoiceCheck, getInvoiceVO);
BeanUtils.copyProperties(invoiceCheck.getInvoiceCheckCar(),getInvoiceVO);
BeanUtils.copyProperties(invoiceCheck.getInvoiceCheckUsedCar(),getInvoiceVO);
BeanUtils.copyProperties(invoiceCheck.getInvoiceCheckToll(),getInvoiceVO);
BeanUtils.copyProperties(invoiceCheck.getInvoiceCheckFreight(),getInvoiceVO);
BeanUtils.copyProperties(invoiceCheck.getInvoiceCheckHangkong(),getInvoiceVO);
BeanUtils.copyProperties(invoiceCheck.getInvoiceCheckTielu(),getInvoiceVO);
//日期格式化
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
String newKprq = "";
try {
Date parseKprq = simpleDateFormat.parse(invoiceCheck.getKprq());
simpleDateFormat.applyPattern("yyyy-MM-dd");
newKprq = simpleDateFormat.format(parseKprq);
} catch (ParseException e) {
new JianshuiServiceException("日期转换错误");
}
if ("15".equals(invoiceCheck.getFpzl())){
//二手车相关结果
getInvoiceVO.setGfdz(invoiceCheck.getInvoiceCheckUsedCar().getMfdwgrdz());
getInvoiceVO.setGfdh(invoiceCheck.getInvoiceCheckUsedCar().getMfdh());
getInvoiceVO.setXfdz(invoiceCheck.getInvoiceCheckUsedCar().getSmfdwgrzz());
getInvoiceVO.setCjh(invoiceCheck.getInvoiceCheckUsedCar().getClsbh());
getInvoiceVO.setZrdclglsmc(invoiceCheck.getInvoiceCheckUsedCar().getZrdcgsmc());
getInvoiceVO.setNsrsbh(invoiceCheck.getInvoiceCheckUsedCar().getJypmdwzsbh());
BeanUtils.copyProperties(invoiceCheck.getInvoiceCheckUsedCar(),getInvoiceVO);
getInvoiceVO.setKprq(newKprq);
}else if ("03".equals(invoiceCheck.getFpzl())){
//机动车相关结果
getInvoiceVO.setHgzh(invoiceCheck.getInvoiceCheckCar().getHgzs());
getInvoiceVO.setJkzmsh(invoiceCheck.getInvoiceCheckCar().getJszmsh());
getInvoiceVO.setZh(invoiceCheck.getInvoiceCheckCar().getKhzh());
getInvoiceVO.setDh(invoiceCheck.getInvoiceCheckCar().getSmfdh());
BeanUtils.copyProperties(invoiceCheck.getInvoiceCheckCar(),getInvoiceVO);
getInvoiceVO.setKprq(newKprq);
}else if ("11".equals(invoiceCheck.getFpzl())){
//卷票
getInvoiceVO.setFpdm(invoiceCheck.getFpdm());
getInvoiceVO.setFphm(invoiceCheck.getFphm());
getInvoiceVO.setKprq(newKprq);
getInvoiceVO.setGmfmc(invoiceCheck.getGmfmc());
getInvoiceVO.setGmfsbh(invoiceCheck.getGmfsbh());
getInvoiceVO.setGmfdzdh(invoiceCheck.getGmfdzdh());
getInvoiceVO.setGmfyhzh(invoiceCheck.getGmfyhzh());
getInvoiceVO.setXfmc(invoiceCheck.getXhfmc());
getInvoiceVO.setXfsbh(invoiceCheck.getXhfsbh());
getInvoiceVO.setXfdzdh(invoiceCheck.getXhfdzdh());
getInvoiceVO.setXfyhzh(invoiceCheck.getXhfyhzh());
getInvoiceVO.setBz(invoiceCheck.getBz());
getInvoiceVO.setJqbh(invoiceCheck.getJqbh());
getInvoiceVO.setFpzl(invoiceCheck.getFpzl());
getInvoiceVO.setJym(invoiceCheck.getJym());
getInvoiceVO.setFpje(invoiceCheck.getFpje());
getInvoiceVO.setFpse(invoiceCheck.getFpse());
getInvoiceVO.setJshj(invoiceCheck.getJshj());
getInvoiceVO.setZfbz(invoiceCheck.getZfbz());
}else {
//通用结果
getInvoiceVO.setXfmc(invoiceCheck.getXhfmc());
getInvoiceVO.setXfsbh(invoiceCheck.getXhfsbh());
getInvoiceVO.setXfdzdh(invoiceCheck.getXhfdzdh());
getInvoiceVO.setXfyhzh(invoiceCheck.getXhfyhzh());
BeanUtils.copyProperties(invoiceCheck, getInvoiceVO);
BeanUtils.copyProperties(invoiceCheck.getInvoiceCheckToll(),getInvoiceVO);
BeanUtils.copyProperties(invoiceCheck.getInvoiceCheckFreight(),getInvoiceVO);
BeanUtils.copyProperties(invoiceCheck.getInvoiceCheckHangkong(),getInvoiceVO);
BeanUtils.copyProperties(invoiceCheck.getInvoiceCheckTielu(),getInvoiceVO);
getInvoiceVO.setKprq(newKprq);
}
String zfbz = getInvoiceVO.getZfbz();
if (StringUtils.equals(zfbz, "Y")) {
@ -347,12 +388,33 @@ public class InvoiceCheckWebServiceImpl {
if (CollectionUtil.isNotEmpty(details)) {
for (InvoiceCheckDetail detail : details) {
GetInvoiceSphVO getInvoiceSphVO = new GetInvoiceSphVO();
getInvoiceSphVO.setSsflbm(detail.getSpbmjc());
BeanUtils.copyProperties(detail, getInvoiceSphVO);
getInvoiceSphVOList.add(getInvoiceSphVO);
if ("11".equals(invoiceCheck.getFpzl())){
getInvoiceSphVO.setHwmc(detail.getHwmc());
getInvoiceSphVO.setGgxh(detail.getGgxh());
getInvoiceSphVO.setJldw(detail.getJldw());
getInvoiceSphVO.setSl(detail.getSl());
getInvoiceSphVO.setBhsdj(detail.getBhsdj());
getInvoiceSphVO.setHsje(detail.getHsje());
getInvoiceSphVO.setBhsje(detail.getJe());
getInvoiceSphVO.setSe(detail.getSe());
getInvoiceSphVO.setSl(detail.getSl());
getInvoiceSphVO.setLx(detail.getLx());
getInvoiceSphVO.setTxrqz(detail.getTxrqz());
getInvoiceSphVO.setTxrqq(detail.getTxrqq());
getInvoiceSphVO.setCph(detail.getCph());
getInvoiceSphVOList.add(getInvoiceSphVO);
}else {
getInvoiceSphVO.setSsflbm(detail.getSpbmjc());
BeanUtils.copyProperties(detail, getInvoiceSphVO);
getInvoiceSphVO.setBhsje(detail.getJe());
getInvoiceSphVO.setHsje(detail.getHsje());
getInvoiceSphVOList.add(getInvoiceSphVO);
}
}
}
// getInvoiceVO转成JSONObject
// JSONObject getInvoiceVOJson = (JSONObject) JSONObject.toJSON(getInvoiceVO);
String getInvoiceVOJsonStr = JSON.toJSONString(getInvoiceVO,SerializerFeature.WriteSlashAsSpecial);

1
jianshui-income/src/main/java/com/jianshui/income/domain/entity/InvoiceCheck.java
Unescape View File

@ -133,6 +133,7 @@ public class InvoiceCheck extends BaseEntity
// 处理电子发票（铁路电子客票）
private InvoiceCheckTielu invoiceCheckTielu;
@Override
public String toString() {
return "InvoiceCheck{" +

4
jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceSphVO.java
Unescape View File

@ -19,8 +19,8 @@ public class GetInvoiceSphVO {
// 货物名称
@JSONField(name = "Spmc")
private String hwmc;
// 金额
private String je;
// 不含税金额
private String bhsje;
// 数量
@JSONField(name = "Sl")
private String spsl;

2
jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceVO.java
Unescape View File

@ -46,7 +46,7 @@ public class GetInvoiceVO {
@JSONField(name = "cycs")
private String cycs;
// 销售方名称
@JSONField(name = "Xfmc")
@JSONField(name = "Xhfmc")
private String xfmc;
// 销售方识别号
@JSONField(name = "Xfsh")

Write Preview
Loading…
Cancel
Save