diff --git a/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java b/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java index 16aff67..b35f438 100644 --- a/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java +++ b/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java @@ -18,10 +18,6 @@ import com.jianshui.invoice.factory.IInvoiceResponseFactory; import com.jianshui.invoice.factory.IInvoiceServiceFactory; import com.jianshui.invoice.service.IInvoiceResponseService; import com.jianshui.invoice.utils.ApiRequestUtils; -import com.jianshui.invoiceall.domain.dto.*; -import com.jianshui.invoiceall.service.IInvoiceAll; -import com.jianshui.invoiceall.service.IInvoiceAllRequestService; -import com.jianshui.invoiceall.service.IInvoiceAllResponseService; import com.jianshui.system.service.ICompanyserviceService; import com.jianshui.system.service.IServiceManageService; import io.swagger.annotations.*; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzJsonDataTwoDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzJsonDataTwoDTO.java index 8edc6b9..8f72f02 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzJsonDataTwoDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzJsonDataTwoDTO.java @@ -41,6 +41,7 @@ public class SqhzJsonDataTwoDTO { private String tdyslxdm; @Alias("sellerTaxnum") + @NotEmpty @ApiModelProperty(value = "销售方纳税人识别号") private String xsfnsrsbh; 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 832f603..2ca628f 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 @@ -393,6 +393,7 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService { */ @Override public HXResponse uploadRedInfo(Redinfo redinfo, Companyservice companyservice) { + // 金财数科数据处理 start // 查询用户登记参数 QueryWrapper yhdjQueryWrapper = new QueryWrapper<>(); @@ -446,7 +447,7 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService { cn.hutool.json.JSONObject result = null; try { - result = ApiHttp.request(WebServiceConstant.SQHZFPXXQRD, WebServiceConstant.URL, sqhzDTO, companyservice); + result = ApiHttp.request(WebServiceConstant.SQHZFPXXQRD, WebServiceConstant.URL, JSONUtil.parseObj(BeanToMapUtils.fastJsonBean2Map(sqhzDTO)), companyservice); String code = result.get("code") != null ? result.get("code").toString() : ""; String msg = result.get("msg") != null ? result.get("msg").toString() : "";