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 0024359..00c4369 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 @@ -9,6 +9,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONUtil; +import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.api.R; @@ -51,6 +52,7 @@ import com.jianshui.system.service.ICompanyserviceService; import com.jianshui.system.service.IServiceManageService; import io.swagger.annotations.*; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.annotations.Param; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.rendering.PDFRenderer; import org.springframework.beans.factory.annotation.Autowired; @@ -2264,10 +2266,10 @@ public class InvoiceController { @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "java.lang.Void", example = "1130", required = true), @ApiImplicitParam(name = "order", value = "请求体", dataType = "java.lang.Void", required = true)}) @PostMapping({"/api/invoice/v1/saveInvoice", "/api/invoice/v1/saveInvoice/{identity}", "/invoice/saveInvoice"}) - public Object saveInvoice(HttpServletRequest request - , String identity,String billInfoId,JSONObject resultJSON) throws Exception { + public Object saveInvoice(@Param("identity") String identity, @Param("billInfoId") String billInfoId, @Param("resultJSON") String resultJSON) throws Exception { + JSONObject jsonObject = JSONObject.parseObject(resultJSON); IInvoiceApiService invoiceService = invoiceServiceFactory.getService("aisinoZhongQi_console_invoice"); - return invoiceService.saveInvoice(identity,billInfoId,resultJSON); + return invoiceService.saveInvoice(billInfoId,identity,jsonObject); } diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java index 17e45da..aa493c9 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java @@ -461,19 +461,23 @@ public class AisinoConsoleInvoiceApiZhongQiServiceImpl implements IInvoiceApiSer /** 保存invoice表 */ public HXResponse saveInvoice(String billInfoId,String identity,JSONObject resultJSON){ + JSONObject jsonObjectData = JSONObject.parseObject(resultJSON.get("data").toString()); + + + if(StrUtil.isEmpty(billInfoId)){ return new HXResponse("billInfoId不存在"); } BillInfo billInfo = billInfoMapper.selectBillInfoById(Long.valueOf(billInfoId)); - String retcode = resultJSON.get("retcode") != null ? resultJSON.get("retcode").toString() : ""; - String retmsg = resultJSON.get("retmsg") != null ? resultJSON.get("retmsg").toString() : ""; + String retcode = jsonObjectData.get("retcode") != null ? jsonObjectData.get("retcode").toString() : ""; + String retmsg = jsonObjectData.get("retmsg") != null ? jsonObjectData.get("retmsg").toString() : ""; if ("4011".equals(retcode)) { //回写发票代码、发票号码信息 if (StrUtil.isEmpty(retmsg)) { return new HXResponse(retcode); } - AisinoConsoleInvoiceAddVO aisinoConsoleInvoiceAddVO = BeanUtil.copyProperties(resultJSON, AisinoConsoleInvoiceAddVO.class); + AisinoConsoleInvoiceAddVO aisinoConsoleInvoiceAddVO = BeanUtil.copyProperties(jsonObjectData, AisinoConsoleInvoiceAddVO.class); if (StrUtil.isEmpty(aisinoConsoleInvoiceAddVO.getInfoNumber())) { return new HXResponse("开具的发票号码不存在!"); }