From b4f1ce97e9b48b9b83e662c89f579aa4441eeb5d Mon Sep 17 00:00:00 2001 From: xuefeilong <15138742644@163.com> Date: Tue, 23 Apr 2024 14:20:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E6=8D=AE=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E4=B8=8D=E6=88=90=E5=8A=9F=E5=9C=B0=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zzsxt/controller/api/ApiController.java | 28 +++++++++++++++++++ .../xxgl/xmkpgl/kpsq/BoKpsqServiceImpl.java | 7 ++++- .../zzsxt/xxgl/xmkpgl/kpsq/index_add.js | 7 +++-- .../zzsxt/xxgl/xmkpgl/kpsq/index_add.html | 3 +- 4 files changed, 41 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/htjs/pt4/zzsxt/controller/api/ApiController.java b/src/main/java/net/htjs/pt4/zzsxt/controller/api/ApiController.java index 940179a..7ddb573 100644 --- a/src/main/java/net/htjs/pt4/zzsxt/controller/api/ApiController.java +++ b/src/main/java/net/htjs/pt4/zzsxt/controller/api/ApiController.java @@ -45,6 +45,34 @@ public class ApiController extends BaseController { return jsonObj; } + /** + * //TODO 异步推送发票回调 + * @author: long + * @date 2024/3/15 + * + */ + @PostMapping(value = "/asynCallback") + public Object asynCallback(@RequestBody String jsonStr){ + StaticLog.info("发票推送回调参数:{}",jsonStr); + cn.hutool.json.JSONObject jsonObject1 = JSONUtil.parseObj(jsonStr); + cn.hutool.json.JSONArray ywdjbh1 = jsonObject1.getJSONArray("result"); + if(!ywdjbh1.isEmpty()) { + for (Object o : ywdjbh1) { + cn.hutool.json.JSONObject resultObj = JSONUtil.parseObj(o); + String ywdjbh = resultObj.getStr("ywdjbh"); + Map updateMap = new HashMap<>(); + updateMap.put("djbh", ywdjbh); + updateMap.put("kpzt",resultObj.getStr("zt")); + iBoKpsqService.updataZZSGL_XX_KPSQ(updateMap); + + } + } + cn.hutool.json.JSONObject jsonObject2 = JSONUtil.createObj(); + jsonObject2.put("code","200"); + jsonObject2.put("message","回调成功"); + return jsonObject2; + } + /** * //TODO 推送发票回调 * @author: long diff --git a/src/main/java/net/htjs/pt4/zzsxt/service/impl/xxgl/xmkpgl/kpsq/BoKpsqServiceImpl.java b/src/main/java/net/htjs/pt4/zzsxt/service/impl/xxgl/xmkpgl/kpsq/BoKpsqServiceImpl.java index 9790fe1..68b5be5 100644 --- a/src/main/java/net/htjs/pt4/zzsxt/service/impl/xxgl/xmkpgl/kpsq/BoKpsqServiceImpl.java +++ b/src/main/java/net/htjs/pt4/zzsxt/service/impl/xxgl/xmkpgl/kpsq/BoKpsqServiceImpl.java @@ -3,6 +3,7 @@ package net.htjs.pt4.zzsxt.service.impl.xxgl.xmkpgl.kpsq; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; import cn.hutool.json.JSONUtil; @@ -1364,7 +1365,7 @@ public class BoKpsqServiceImpl implements IBoKpsqService { jsonObject.put("async","1"); HashMap cszzMap = MapUtil.newHashMap(1); - cszzMap.put("CSMC","HDDZ"); + cszzMap.put("CSMC","YBKPHD"); Map map = kpsqMapper.selectZZSGL_XT_CSSZ(cszzMap); jsonObject.put("callBackUrl",MapUtil.getStr(map,"CSZ")); cn.hutool.json.JSONArray array = JSONUtil.createArray(); @@ -1506,6 +1507,10 @@ public class BoKpsqServiceImpl implements IBoKpsqService { fpmxJsonObj.put("spdm",mxObj.getStr("SPBM"));//否 string 商品代码 fpmxJsonObj.put("spsl",mxObj.getStr("SPSL").replaceAll(",",""));//是 number 商品数量 fpmxJsonObj.put("bhsdj",mxObj.getStr("SPDJ"));//否 string 不含税单价 + if (ObjectUtil.isNotEmpty(mxObj.get("SPSL"))&&mxObj.getBigDecimal("SPSL").compareTo(BigDecimal.ZERO) != 0) { + BigDecimal bhsdj = mxObj.getBigDecimal("JE", BigDecimal.ZERO).divide(mxObj.getBigDecimal("SPSL"), 13, BigDecimal.ROUND_HALF_UP); + fpmxJsonObj.put("bhsdj",bhsdj);//否 string 不含税单价 + } fpmxJsonObj.put("bhsje",StrUtil.isNotBlank(mxObj.getStr("JE"))?new BigDecimal(mxObj.getStr("JE").replaceAll(",","")):"0.00");//否 number 不含税金额 fpmxJsonObj.put("hsdj",mxObj.getStr("SPDJ"));//否 string 含税单价 fpmxJsonObj.put("hsje",StrUtil.isNotBlank(mxObj.getStr("HSJE"))?new BigDecimal(mxObj.getStr("HSJE").replaceAll(",","")):"0.00");//否 number 含税金额 diff --git a/src/main/resources/static/zzsxt/xxgl/xmkpgl/kpsq/index_add.js b/src/main/resources/static/zzsxt/xxgl/xmkpgl/kpsq/index_add.js index 948d099..96c3760 100644 --- a/src/main/resources/static/zzsxt/xxgl/xmkpgl/kpsq/index_add.js +++ b/src/main/resources/static/zzsxt/xxgl/xmkpgl/kpsq/index_add.js @@ -35,7 +35,10 @@ var kpsq_add =(function(){ tablePublic.onReset(curSeg,tableType); var optionStr = ''; - if (kpsx == "qdtbkp" || kpsx == "qdybkp"){ + optionStr += + ' \n' + + ' \n' + /*if (kpsx == "qdtbkp" || kpsx == "qdybkp"){ optionStr += ' \n' + ' \n' @@ -44,7 +47,7 @@ var kpsq_add =(function(){ ' \n' + ' \n' + ' '; - } + }*/ $('#FPLX_DM').html(optionStr); layui.use(['form','element','jquery','layer'], function () { diff --git a/src/main/resources/templates/zzsxt/xxgl/xmkpgl/kpsq/index_add.html b/src/main/resources/templates/zzsxt/xxgl/xmkpgl/kpsq/index_add.html index 551a678..de063cd 100644 --- a/src/main/resources/templates/zzsxt/xxgl/xmkpgl/kpsq/index_add.html +++ b/src/main/resources/templates/zzsxt/xxgl/xmkpgl/kpsq/index_add.html @@ -69,7 +69,8 @@ placeholder="发票类型：请选择发票类型" autocomplete="off" > - + +