diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/vo/jcsk/AddInvoiceTWOVO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/vo/jcsk/AddInvoiceTWOVO.java new file mode 100644 index 0000000..d386009 --- /dev/null +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/vo/jcsk/AddInvoiceTWOVO.java @@ -0,0 +1,53 @@ +package com.jianshui.invoice.domain.vo.jcsk; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; + +/** + * 蓝字发票开具VO + * @author kk + * @date 2022年12月13日 11:35 + */ +@Data +public class AddInvoiceTWOVO { + + @NotEmpty + @ApiModelProperty(value = "全电发票号码") + private String fphm; + + @NotEmpty + @ApiModelProperty(value = "开票日期") + private String kprq; + + @NotEmpty + @ApiModelProperty(value = "全电纸质发票代码") + private String zzfpdm; + + @NotEmpty + @ApiModelProperty(value = "全电纸质发票号码") + private String zzfphm; + + @ApiModelProperty(value = "二维码下载地址") + private String ewmUrl; + + @ApiModelProperty(value = "PDF格式下载地址") + private String pdfUrl; + + @ApiModelProperty(value = "OFD格式下载地址") + private String ofdUrl; + + @ApiModelProperty(value = "XML格式下载地址") + private String xmlUrl; + + + + + + + + + + +} diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/vo/jcsk/AddRedInvoiceTWOVO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/vo/jcsk/AddRedInvoiceTWOVO.java new file mode 100644 index 0000000..fd8f1a5 --- /dev/null +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/vo/jcsk/AddRedInvoiceTWOVO.java @@ -0,0 +1,17 @@ +package com.jianshui.invoice.domain.vo.jcsk; + +import lombok.Data; + +@Data +public class AddRedInvoiceTWOVO { + + private String fphm; // 发票号码 + private String kprq; // 开票日期 + private String zzfpdm; // 全电纸票发票必填 + private String zzfphm; // 全电纸票发票必填 + private String ewmUrl; // zdhqbsdz为1时必填 + private String pdfUrl; // zdhqbsdz为1时必填 + private String ofdUrl; // zdhqbsdz为1时必填 + private String xmlUrl; // zdhqbsdz为1时必填下载后是zip格式压缩包,需要自行解压 + +} diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/vo/jcsk/KschTWOVO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/vo/jcsk/KschTWOVO.java new file mode 100644 index 0000000..22d6372 --- /dev/null +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/vo/jcsk/KschTWOVO.java @@ -0,0 +1,68 @@ +package com.jianshui.invoice.domain.vo.jcsk; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 金四-快速冲红对象 invoice_all_yhdj + * + * @author jianshui + * @date 2022-12-13 + */ +@Data +public class KschTWOVO implements Serializable +{ + + @ApiModelProperty(value = "全电发票号码") + private String fphm; + + + @ApiModelProperty(value = "购买方税号") + private String gmfnsrsbh; + + + @ApiModelProperty(value = "购买方名称") + private String gmfmc; + + + @ApiModelProperty(value = "开票日期") + private String kprq; + + + @ApiModelProperty(value = "销售方名称") + private String xsfmc; + + + @ApiModelProperty(value = "销售方税号") + private String xsfnsrsbh; + + + @ApiModelProperty(value = "全电纸票发票代码") + private String zzfpdm; + + + @ApiModelProperty(value = "全电纸票发票号码") + private String zzfphm; + + + @ApiModelProperty(value = "发票二维码下载地址") + private String ewmUrl; + + + @ApiModelProperty(value = "PDF下载地址") + private String pdfUrl; + + + @ApiModelProperty(value = "OFD下载地址") + private String ofdUrl; + + + @ApiModelProperty(value = "XML下载地址") + private String xmlUrl; + + + + +} diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiServiceImpl.java index 3439758..986d6f8 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiServiceImpl.java @@ -1,6 +1,5 @@ package com.jianshui.invoice.service.impl.api; -import cn.hutool.core.codec.Base64; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; @@ -9,24 +8,17 @@ import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.jianshui.common.constant.Constants; import com.jianshui.common.core.domain.AjaxResult; import com.jianshui.common.core.domain.entity.Companyservice; import com.jianshui.common.enums.ErrorCode; -import com.jianshui.common.exception.jianshui.JianshiSystemErrorException; import com.jianshui.common.exception.jianshui.JianshuiParamErrorException; import com.jianshui.common.exception.jianshui.JianshuiServiceException; import com.jianshui.common.utils.*; import com.jianshui.common.utils.uuid.IdUtils; import com.jianshui.invoice.constant.aisino.console.AisinoConsoleConstants; -import com.jianshui.invoice.constant.elephant.ElephantConstants; import com.jianshui.invoice.domain.*; import com.jianshui.invoice.domain.dto.*; import com.jianshui.invoice.domain.dto.api.aisino.console.*; -import com.jianshui.invoice.domain.dto.api.elephant.DDFPXX; -import com.jianshui.invoice.domain.dto.api.elephant.DDFPZXX; -import com.jianshui.invoice.domain.dto.api.elephant.DDMXXX; -import com.jianshui.invoice.domain.dto.api.elephant.ElephantInvoiceQueryResultDTO; import com.jianshui.invoice.domain.vo.api.aisino.console.AisinoConsoleInvoiceAddVO; import com.jianshui.invoice.mapper.BillInfoMapper; import com.jianshui.invoice.mapper.InvoiceMapper; @@ -35,22 +27,14 @@ import com.jianshui.invoice.mapper.SkDyjMapper; import com.jianshui.invoice.service.IInvoiceApiService; import com.jianshui.invoice.utils.BillInfoUtils; import com.jianshui.invoice.utils.aisino.console.AisinoConsoleUtil; -import com.jianshui.invoice.utils.elephant.ElephantUtils; -import com.jianshui.storage.domain.StorageUrlDTO; -import com.jianshui.storage.service.IStorageService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.jta.atomikos.AtomikosDependsOnBeanFactoryPostProcessor; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletRequest; -import java.io.UnsupportedEncodingException; import java.math.BigDecimal; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; -import java.text.ParseException; import java.util.*; /** diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java index b2b69f0..39a7a93 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java @@ -22,9 +22,11 @@ import com.jianshui.invoice.constant.aisino.console.AisinoConsoleConstants; import com.jianshui.invoice.domain.*; import com.jianshui.invoice.domain.dto.*; import com.jianshui.invoice.domain.dto.api.aisino.console.*; +import com.jianshui.invoice.domain.dto.api.jcsk.QueryTwoDTO; import com.jianshui.invoice.domain.dto.api.jcsk.add.InvoiceAllAddInfoTwoDTO; import com.jianshui.invoice.domain.dto.api.jcsk.add.InvoiceAllAddTwoDTO; import com.jianshui.invoice.domain.dto.api.jcsk.add.InvoiceAllAddmxListTwoDTO; +import com.jianshui.invoice.domain.vo.jcsk.AddInvoiceTWOVO; import com.jianshui.invoice.mapper.*; import com.jianshui.invoice.service.IInvoiceApiService; import com.jianshui.invoice.utils.aisino.console.AisinoConsoleUtil; @@ -213,7 +215,11 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService { String systemOrderNo = billInfo.getSystemOrderno(); BillInfo billInfoResult = billInfoMapper.selectBySystemOrderNo(companyservice.getCompanyid(),systemOrderNo); - QueryDTO queryDTO = BeanUtil.copyProperties(invoiceAllQueryDTO, QueryDTO.class); + QueryTwoDTO queryDTO = new QueryTwoDTO(); + // TODO: 2023/3/28 ... + + + ValidateUtils.validate(queryDTO); String requestId = queryDTO.getRequestId(); @@ -244,7 +250,7 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService { String finalServiceId = serviceId; if (WebServiceConstant.LZFPKJ.equals(finalServiceId)) { // 蓝字发票开具 - AddInvoiceVO addInvoiceVO = BeanUtil.copyProperties(data, AddInvoiceVO.class); + AddInvoiceTWOVO addInvoiceVO = BeanUtil.copyProperties(data, AddInvoiceTWOVO.class); if(BeanUtil.isNotEmpty(addInvoiceVO)){ QueryWrapper billInfoQueryWrapper = new QueryWrapper<>();