From 1463fc610af5abcd38bd6dbed72586824d989e69 Mon Sep 17 00:00:00 2001 From: yefei Date: Fri, 28 Apr 2023 15:47:43 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=BA=8C=E6=89=8B=E8=BD=A6=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E5=A2=9E=E5=8A=A0=E4=BF=A1=E6=81=AF&=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E6=8E=A8=E9=80=81=E9=94=80=E9=A1=B9=E7=A5=A8=E6=B1=A0?= =?UTF-8?q?=E5=8F=91=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/controller/InterfaceController.java | 3 +++ .../dxhy/erp/controller/SDNYMainProcessController.java | 2 +- .../com/dxhy/erp/service/SNPushCheckRecordService.java | 10 +++++++++- .../dxhy/erp/service/impl/InvoicePoolServiceImpl.java | 4 +++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java index 1b782619..307d0696 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java @@ -963,6 +963,9 @@ public class InterfaceController extends AbstractController { // 鉴权校验接口安全 int validParams = authStatusService.validParams(request, requestParam); globalInfo = authStatusService.getGlobalInfo(requestParam); + + log.info("接收的push参数globalInfo={}",globalInfo); + // 校验IP int blocOne = checkIpBlocAppidService.checkBlocOne(authorize.getAppSecId(), request); if (blocOne == 0) { diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index 8980f911..04f0a1fb 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -108,7 +108,7 @@ public class SDNYMainProcessController extends AbstractController { JSONObject checkInvoiceResult = null; if("1".equals(isPresure)){ - String base64 = "{"success":true,"code":"0000","message":"default success","data":{"detailList":[{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"1","hwmc":"*塑料制品*保鲜膜","je":"100.00","spsl":"4","bhsdj":"25.00","ggxh":"中","jldw":"卷","hsdj":"","hsje":"","ssflbm":"1070601120000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"2","hwmc":"*塑料制品*保鲜膜","je":"40.00","spsl":"2","bhsdj":"20.00","ggxh":"小","jldw":"卷","hsdj":"","hsje":"","ssflbm":"1070601120000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"3","hwmc":"*油料*花生","je":"340.00","spsl":"1","bhsdj":"340.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1010103010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"4","hwmc":"*谷物细粉*面","je":"1030.00","spsl":"10","bhsdj":"103.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030101010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"5","hwmc":"*植物油*大豆油","je":"480.00","spsl":"2","bhsdj":"240.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030105040000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"6","hwmc":"*油料*花生","je":"1280.00","spsl":"2","bhsdj":"640.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1010103010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"7","hwmc":"*糖*加工糖","je":"12.00","spsl":"2","bhsdj":"6.00","ggxh":"","jldw":"斤","hsdj":"","hsje":"","ssflbm":"1030106030000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"8","hwmc":"*其他食品*当归","je":"21.00","spsl":"0.7","bhsdj":"30.00","ggxh":"","jldw":"斤","hsdj":"","hsje":"","ssflbm":"1030299000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"9","hwmc":"*谷物细粉*玉米面","je":"125.00","spsl":"1","bhsdj":"125.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030101990000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"10","hwmc":"*洗涤剂*合成洗涤剂","je":"180.00","spsl":"4","bhsdj":"45.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1070222020000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"11","hwmc":"*蛋制品*再制蛋","je":"30.00","spsl":"20","bhsdj":"1.50","ggxh":"","jldw":"个","hsdj":"","hsje":"","ssflbm":"1030114030000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"12","hwmc":"*谷物细粉*面","je":"2060.00","spsl":"20","bhsdj":"103.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030101010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"13","hwmc":"*焙烤食品*焙烤松脆食品","je":"36.00","spsl":"6","bhsdj":"6.00","ggxh":"","jldw":"盒","hsdj":"","hsje":"","ssflbm":"1030201050000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"14","hwmc":"*农副食品*辣段","je":"90.00","spsl":"2","bhsdj":"45.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030199000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"15","hwmc":"*发酵类制品*泡打粉","je":"17.50","spsl":"7","bhsdj":"2.50","ggxh":"","jldw":"包","hsdj":"","hsje":"","ssflbm":"1030207010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"16","hwmc":"*淀粉制品*淀粉制品","je":"100.00","spsl":"20","bhsdj":"5.00","ggxh":"","jldw":"斤","hsdj":"","hsje":"","ssflbm":"1030112030000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"17","hwmc":"*农副食品*玉米碜","je":"25.00","spsl":"10","bhsdj":"2.50","ggxh":"","jldw":"斤","hsdj":"","hsje":"","ssflbm":"1030199000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"18","hwmc":"*油料*花生","je":"340.00","spsl":"1","bhsdj":"340.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1010103010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"19","hwmc":"*植物油*花生油","je":"640.00","spsl":"1","bhsdj":"640.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030105010400000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"20","hwmc":"*植物油*大豆油","je":"1225.00","spsl":"5","bhsdj":"245.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030105040000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"21","hwmc":"*蔬菜*绿豆芽等芽苗菜","je":"180.00","spsl":"4","bhsdj":"45.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1010112140000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"22","hwmc":"*方便食品*腐竹","je":"450.00","spsl":"2","bhsdj":"225.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030203010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"23","hwmc":"*淀粉制品*淀粉制品","je":"100.00","spsl":"20","bhsdj":"5.00","ggxh":"","jldw":"斤","hsdj":"","hsje":"","ssflbm":"1030112030000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"24","hwmc":"*调味品*复合调味品","je":"48.00","spsl":"1","bhsdj":"48.00","ggxh":"","jldw":"桶","hsdj":"","hsje":"","ssflbm":"1030206040000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"25","hwmc":"*谷物细粉*面","je":"1030.00","spsl":"10","bhsdj":"103.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030101010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"26","hwmc":"*木制品*木制一次性筷子","je":"120.00","spsl":"4","bhsdj":"30.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1050108020000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"27","hwmc":"*其他食品*味达美","je":"178.00","spsl":"1","bhsdj":"178.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030299000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"28","hwmc":"*加工盐*食用盐","je":"50.00","spsl":"1","bhsdj":"50.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030210010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"29","hwmc":"*农副食品*木耳","je":"225.00","spsl":"5","bhsdj":"45.00","ggxh":"","jldw":"斤","hsdj":"","hsje":"","ssflbm":"1030199000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"30","hwmc":"*调味品*耗油","je":"130.00","spsl":"1","bhsdj":"130.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030206040000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"31","hwmc":"*植物油*花生油","je":"1280.00","spsl":"2","bhsdj":"640.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030105010400000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"32","hwmc":"*植物油*大豆油","je":"980.00","spsl":"4","bhsdj":"245.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030105040000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"33","hwmc":"*谷物细粉*面","je":"2060.00","spsl":"20","bhsdj":"103.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030101010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"34","hwmc":"*谷物*其他谷物","je":"50.00","spsl":"10","bhsdj":"5.00","ggxh":"","jldw":"斤","hsdj":"","hsje":"","ssflbm":"1010101990000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"35","hwmc":"*农副食品*小米","je":"70.00","spsl":"10","bhsdj":"7.00","ggxh":"","jldw":"斤","hsdj":"","hsje":"","ssflbm":"1030199000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"36","hwmc":"*谷物细粉*面","je":"2060.00","spsl":"20","bhsdj":"103.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030101010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"37","hwmc":"*调味品*安琪","je":"360.00","spsl":"20","bhsdj":"18.00","ggxh":"","jldw":"包","hsdj":"","hsje":"","ssflbm":"1030206040000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"38","hwmc":"*发酵类制品*泡打粉","je":"25.00","spsl":"10","bhsdj":"2.50","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030207010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"39","hwmc":"*谷物细粉*玉米面","je":"125.00","spsl":"1","bhsdj":"125.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030101990000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"40","hwmc":"*调味品*花椒面","je":"140.00","spsl":"2","bhsdj":"70.00","ggxh":"","jldw":"斤","hsdj":"","hsje":"","ssflbm":"1030206040000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"41","hwmc":"*其他食品*碱面","je":"40.00","spsl":"20","bhsdj":"2.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030299000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"42","hwmc":"*其他食品*味达美","je":"178.00","spsl":"1","bhsdj":"178.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030299000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"43","hwmc":"*调味品*醋及醋代用品","je":"75.00","spsl":"1","bhsdj":"75.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030206030000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"44","hwmc":"*其他食品*面","je":"75.00","spsl":"1","bhsdj":"75.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030299000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"45","hwmc":"*蔬菜加工品*腌渍菜","je":"70.00","spsl":"4","bhsdj":"17.50","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030110040000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"46","hwmc":"*其他食品*油条剂","je":"24.00","spsl":"2","bhsdj":"12.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030299000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"47","hwmc":"*其他食品*胡椒粉","je":"30.00","spsl":"2","bhsdj":"15.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030299000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"48","hwmc":"*木制品*木制一次性筷子","je":"30.00","spsl":"1","bhsdj":"30.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1050108020000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"49","hwmc":"*农副食品*大料","je":"300.00","spsl":"5","bhsdj":"60.00","ggxh":"","jldw":"斤","hsdj":"","hsje":"","ssflbm":"1030199000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"50","hwmc":"*淀粉制品*淀粉制品","je":"200.00","spsl":"40","bhsdj":"5.00","ggxh":"","jldw":"斤","hsdj":"","hsje":"","ssflbm":"1030112030000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"51","hwmc":"*其他食品*芥菜","je":"225.00","spsl":"5","bhsdj":"45.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030299000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"52","hwmc":"*谷物细粉*面","je":"2060.00","spsl":"20","bhsdj":"103.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030101010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"53","hwmc":"*谷物细粉*玉米面","je":"250.00","spsl":"2","bhsdj":"125.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030101990000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"54","hwmc":"*农副食品*小米","je":"70.00","spsl":"10","bhsdj":"7.00","ggxh":"","jldw":"斤","hsdj":"","hsje":"","ssflbm":"1030199000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"55","hwmc":"*其他化学制品*火碱","je":"190.00","spsl":"1","bhsdj":"190.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1070299990000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"56","hwmc":"*其他食品*海带丝","je":"240.00","spsl":"1","bhsdj":"240.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030299000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"57","hwmc":"*油料*花生","je":"420.00","spsl":"2","bhsdj":"210.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1010103010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"58","hwmc":"*调味品*醋及醋代用品","je":"75.00","spsl":"1","bhsdj":"75.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030206030000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"59","hwmc":"*调味品*醋及醋代用品","je":"50.00","spsl":"1","bhsdj":"50.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030206030000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"60","hwmc":"*加工盐*食用盐","je":"50.00","spsl":"1","bhsdj":"50.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030210010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"61","hwmc":"*调味品*酱油及酱类制品","je":"54.00","spsl":"1","bhsdj":"54.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030206020000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"62","hwmc":"*植物油*香油","je":"48.00","spsl":"6","bhsdj":"8.00","ggxh":"","jldw":"瓶","hsdj":"","hsje":"","ssflbm":"1030105040000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"63","hwmc":"*植物油*大豆油","je":"980.00","spsl":"4","bhsdj":"245.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030105040000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"64","hwmc":"*塑料制品*一次性手套","je":"50.00","spsl":"10","bhsdj":"5.00","ggxh":"","jldw":"包","hsdj":"","hsje":"","ssflbm":"1070601120000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"65","hwmc":"*谷物细粉*面","je":"1030.00","spsl":"10","bhsdj":"103.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030101010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"66","hwmc":"*植物油*花生油","je":"1080.00","spsl":"2","bhsdj":"540.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030105010400000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"67","hwmc":"*塑料制品*食品袋","je":"875.00","spsl":"350","bhsdj":"2.50","ggxh":"小","jldw":"把","hsdj":"","hsje":"","ssflbm":"1070601120000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"68","hwmc":"*塑料制品*食品袋","je":"960.00","spsl":"320","bhsdj":"3.00","ggxh":"中","jldw":"把","hsdj":"","hsje":"","ssflbm":"1070601120000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"69","hwmc":"*调味品*红九九","je":"120.00","spsl":"10","bhsdj":"12.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030206040000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"70","hwmc":"*调味品*酱油及酱类制品","je":"80.00","spsl":"1","bhsdj":"80.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030206020000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"71","hwmc":"*塑料制品*餐盒","je":"240.00","spsl":"2","bhsdj":"120.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1070601120000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"72","hwmc":"*调味品*红曲粉","je":"70.00","spsl":"10","bhsdj":"7.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030206040000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"73","hwmc":"*其他食品*豆沙","je":"80.00","spsl":"2","bhsdj":"40.00","ggxh":"","jldw":"包","hsdj":"","hsje":"","ssflbm":"1030299000000000000","sl":"0.000%"}],"kprq":"20221226","jym":"","cjhj":"","jshj":"28151.50","fpje":"28151.50","cycs":"9","xhfmc":"鄂托克旗王旭峰粮油批发店一分店","xhfsbh":"92150693MA0Q8GDT8H","xhfdzdh":"内蒙古自治区鄂尔多斯市鄂托克旗棋盘井镇利民街北康庄市场门口处18248336988","xhfyhzh":"7900801220000000010164","gmfyhzh":"047725012000030015","gmfdzdh":"内蒙古鄂托克前旗上海庙镇鄂尔多斯街新矿内蒙能源宾馆044-7869999","gmfmc":"山东能源集团国际酒店有限公司内蒙古分公司","gmfsbh":"91150623MA0NL53F8C","fpse":"0.00","bz":"裕兴矿食堂","skph":"","jqbh":"","kpr":"","skr":"","fhr":"","bswjurl":"","zfbz":"H","fpzt":"8","sfzh":"","cllx":"","cpxh":"","cd":"","hgzs":"","sjdh":"","fdjhm":"","clsbh":"","cyjg":"0001","cyjgxx":"查验成功发票一致","fpdm":"","fphm":"22152000000000858587","escscdh":"","escscsbh":"","qdbz":"N","fpzl":"22","jkzmsh":"","zgswjgdm":"","wspzhm":"","xcrs":"","zgswjgmc":"","dw":"","sl":"","khyh":"","khzh":"","cyrmc":"","cyrsbh":"","spfmc":"","spfshb":"","shrmc":"","shrsbh":"","fhrmc":"","fhrsbh":"","yshwxx":"","qydjyddd":"","czch":"","ccdw":"","txfbz":"","lslbs":"","cpzh":"","djzh":"","zrdcgsmc":"","mfdwgr":"","mfdwdmsfzh":"","mfdwgrdz":"","mfdh":"","smfdwgr":"","smfdwdmsfzh":"","smfdwgrzz":"","smfdh":"","jypmdw":"","jypmdwdz":"","khyhjzh":"","jypmdwdh":"","jypmdwdzsbh":"","escsc":"","escscdz":"","escsckhyhzh":"","dzzfbs":"","xhfdz":""}}"; + String base64 = "ewoJImNvZGUiOiAxMDAwLAoJImRhdGEiOiB7CgkJImRyYXdlZU5hbWUiOiAiIiwKCQkiYnVzaW5lc3NVbml0IjogIiIsCgkJImxlbW9uTWFya2V0VGF4Tm8iOiAiOTEzNzAxMjVNQTNRQUtDMjhBIiwKCQkiYnJhbmRNb2RlbCI6ICLliKvlhYvniYxTR002NTIxVUJBMSIsCgkJInZlaGljbGVJZGVudGlmaWNhdGlvbk5vIjogIkxTR1VBODJMN01HMDgzODcwIiwKCQkiaWRjYXJkTm8iOiAiIiwKCQkic291cmNlIjogIiIsCgkJInRyYW5zcG9ydFJvdXRlIjogIiIsCgkJInRvdGFsVGF4IjogIiIsCgkJImJ1c2luZXNzVW5pdEFkZHJlc3MiOiAiIiwKCQkibGljZW5zZVBsYXRlIjogIuS6kUFFODVTNSIsCgkJInNlbGxlclVuaXRPckluZGl2aWR1YWwiOiAi5rWO5Y2X5YyX5p6B5pif5rG96L2m5pyN5Yqh5pyJ6ZmQ5YWs5Y+45LqR5Y2X5YiG5YWs5Y+4IiwKCQkiYWRtaW5pc3RyYXRpdmVEaXZpc2lvbk5vIjogIiIsCgkJImNhcnJpZXJOYW1lIjogIiIsCgkJInRheFJlY29yZHMiOiAiIiwKCQkic2FsZXNCYW5rIjogIiIsCgkJImxlbW9uTWFya2V0IjogIuWxseS4nOa2pumAmuS6jOaJi+i9puW4guWcuuacjeWKoeaciemZkOWFrOWPuCIsCgkJImludm9pY2VUeXBlIjogIjE1IiwKCQkibGltaXRQZW9wbGUiOiAiIiwKCQkibWFjaGluZU5vIjogIjU4OTkxNjQyNDc3MiIsCgkJInB1cmNoYXNlckFkZHJlc3NQaG9uZSI6ICIiLAoJCSJzdGF0ZSI6ICIwIiwKCQkiaW52b2ljZU5vIjogIjAwMzI3OTYyIiwKCQkidmVoaWNsZVR5cGUiOiAi5bCP5Z6L5pmu6YCa5a6i6L2mIiwKCQkiZW5naW5lTm8iOiAiIiwKCQkiaW5zcGVjdGlvbk51bSI6ICIiLAoJCSJtYWNoaW5lQ29kZSI6ICIiLAoJCSJidXNpbmVzc1VuaXRQaG9uZSI6ICIiLAoJCSJzZWxsZXJQaG9uZSI6ICIxNTkxMDA4NDM4NCIsCgkJInplcm9UYXhSYXRlU2lnbiI6ICIiLAoJCSJpbnZvaWNlQ29kZSI6ICIwMzcwMDIxMDA0MTciLAoJCSJjZXJ0aWZpY2F0ZU5vIjogIiIsCgkJInB1cmNoYXNlck5hbWUiOiAiIiwKCQkiY2hlY2tDb2RlIjogIiIsCgkJImJpbGxpbmdEYXRlIjogIjIwMjMtMDMtMTciLAoJCSJ0b3RhbEFtb3VudCI6ICIiLAoJCSJ2ZWhpY2xlTm8iOiAiTFNHVUE4Mkw3TUcwODM4NzAiLAoJCSJzYWxlc0FkZHJlc3NQaG9uZSI6ICIiLAoJCSJidXllclBob25lIjogIjE1Njg4ODg1MjA1IiwKCQkic2FsZXNOYW1lIjogIiIsCgkJInB1cmNoYXNlclRheE5vIjogIiIsCgkJInNlbGxlclVuaXRDb2RlT3JJZE5vIjogIjkxNTMwMTAyTUE3SzcyWVQ1QyIsCgkJImNhcnJpZXJUYXhObyI6ICIiLAoJCSJ0YXhBdXRob3JpdHlOYW1lIjogIiIsCgkJImluc3BlY3Rpb25MaXN0Tm8iOiAiIiwKCQkiYW1vdW50VGF4IjogIiIsCgkJIm9yaWdpblBsYWNlIjogIiIsCgkJImNlcnRpZmljYXRlIjogIiIsCgkJImJ1eWVySUROdW0iOiAiIiwKCQkicGF5bWVudFZvdWNoZXJObyI6ICIiLAoJCSJsZW1vbk1hcmtldEFkZHJlc3MiOiAi5bGx5Lic55yB5rWO5Y2X5biC5rWO5YyX5byA5Y+R5Yy65Lit5bCP5LyB5Lia5a215YyW5ZutIiwKCQkiZmFjdG9yeU1vZGVsIjogIuWIq+WFi+eJjFNHTTY1MjFVQkExIiwKCQkiYnV5ZXJVbml0T3JJbmRpdmlkdWFsIjogIua1juWNl+WMl+aegeaYn+axvei9puacjeWKoeaciemZkOWFrOWPuCIsCgkJImludm9pY2VOdW1iZXIiOiAiMDAzMjc5NjIiLAoJCSJ0b2xsU2lnbiI6ICIwNyIsCgkJInRheEJ1cmVhdUNvZGUiOiAiIiwKCQkidG9ubmFnZSI6ICIiLAoJCSJ0YXhBdXRob3JpdHlObyI6ICIiLAoJCSJjb21wYW55IjogIkJJR0IiLAoJCSJsZW1vbk1hcmtldFBob25lIjogIjEzODU0MTkzMDI1IiwKCQkicHVyY2hhc2VyQmFuayI6ICIiLAoJCSJhZG1pbmlzdHJhdGl2ZURpdmlzaW9uTmFtZSI6ICIiLAoJCSJwYXNzZW5nZXJzTGltaXRlZCI6ICIiLAoJCSJidXllclVuaXRPckluZGl2aWR1YWxBZGRyZXNzIjogIuWxseS4nOecgea1juWNl+W4guWkqeahpeWMuuWMl+WFs+WMl+i3rzblj7fmuZblhYnlsbHoibLlrrblm600LTMtMTAyIiwKCQkiaW52b2ljZUxpbmVMaXN0IjogW3sKCQkJInVuaXRQcmljZSI6ICIiLAoJCQkicm93Tm8iOiAiMSIsCgkJCSJhbW91bnQiOiAiIiwKCQkJInNwZWNpZmljYXRpb25Nb2RlbCI6ICIiLAoJCQkicXVhbnRpdHkiOiAiIiwKCQkJInRheCI6ICIiLAoJCQkidHlwZSI6ICIiLAoJCQkidW5pdCI6ICIiLAoJCQkibGljZW5zZVBsYXRlTnVtIjogIiIsCgkJCSJjdXJyZW50RGF0ZUVuZCI6ICIiLAoJCQkiY29tbW9kaXR5Q29kZSI6ICIiLAoJCQkiY3VycmVudERhdGVTdGFydCI6ICIiLAoJCQkiY29tbW9kaXR5TmFtZSI6ICIiCgkJfV0sCgkJImxlbW9uTWFya2V0QmFua0FuZEFjY291bnQiOiAi5Lit5Zu96ZO26KGM5rWO6Ziz5pSv6KGM6JCl5Lia6YOoMjMyNTQwNzQ2NjQ5IiwKCQkic2FsZXNUYXhObyI6ICIiLAoJCSJzZWxsZXJVbml0T3JJbmRpdmlkdWFsQWRkcmVzcyI6ICLkupHljZfnnIHmmIbmmI7luILkupTljY7ljLrpu5Hmnpfpk7rooZfpgZPlip7kuovlpITkurrmsJHopb/ot683MjDlj7dN5qCLTS0xMOWPtyIsCgkJImJ1c2luZXNzVW5pdEJhbmtBbmRBY2NvdW50IjogIiIsCgkJInZlaGljbGVBZG1pbk9mZmljZSI6ICLmtY7ljZfluIIiLAoJCSJhbW91bnRUYXhDTiI6ICIiLAoJCSJyZWdpc3RyYXRpb25ObyI6ICIzNzAwMzc1ODUzNTciLAoJCSJwcm9kdWN0UGxhY2UiOiAiIiwKCQkicmVtYXJrcyI6ICIiLAoJCSJ0YXhCdXJlYXVOYW1lIjogIiIKCX0sCgkibWVzc2FnZSI6ICJzdWNjZXNzIgp9"; String result = Base64Encoding.decodeToString(base64); checkInvoiceResult = JSONObject.parseObject(result); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java index 2496eca8..14f6d79d 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java @@ -348,9 +348,16 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { jsonObject.put("totalTax", invoiceData.get("fpse")); jsonObject.put("totalAmount", invoiceData.get("fpje")); } - jsonObject.put("amountTax", invoiceData.get("jshj")); + if("15".equals(invoiceData.get("fpzl"))){ + jsonObject.put("amountTax", invoiceData.get("cjhj")); + }else{ + jsonObject.put("amountTax", invoiceData.get("jshj")); + } + jsonObject.put("amountTaxCN", ""); + jsonObject.put("buyerIDNum", invoiceData.get("mfdwdmsfzh")); + jsonObject.put("checkCode", invoiceData.get("jym")); if ("N".equals(invoiceData.get("zfbz"))) { jsonObject.put("state", "0"); @@ -667,6 +674,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { reimburse.setXfTaxNo(invoice.getSalesTaxNo()); reimburse.setXfAddressAndPhone(invoice.getSalesAddressPhone()); reimburse.setXfBankAndNo(invoice.getSalesBank()); + reimburse.setSelectId(UUID.randomUUID().toString().replace("-", "")); reimburse.setTaxRate(invoice.getTaxRate()); reimburse.setTaxCode(getTaxCode(invoice.getTaxRate())); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java index 68bdd999..2360f309 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java @@ -1602,6 +1602,7 @@ public class InvoicePoolServiceImpl implements InvoicePoolService { SalesInvoicePushInfos infos = null; try { infos = JSONObject.parseObject(requestParam.get("data"), SalesInvoicePushInfos.class); + log.info("接受到的销项票池发票信息为:{}",infos); } catch (Exception e) { run.setReturnCode(ReturnCodeEnum.QQBWGSCW.getFhzDm()); run.setReturnMessage(ReturnCodeEnum.QQBWGSCW.getFhzMc(ReturnCodeEnum.QQBWGSCW.getIndex())); @@ -1652,6 +1653,7 @@ public class InvoicePoolServiceImpl implements InvoicePoolService { TdxSaleRecordInvoice saleRecordInvoice = tdxSaleRecordInvoiceDao .selectOne(new QueryWrapper().eq("uuid", invoiceCode + invoiceNo)); if (saleRecordInvoice != null) { + log.info("更新销项票池"); TdxSaleRecordInvoice update = new TdxSaleRecordInvoice(); update.setId(saleRecordInvoice.getId()); update.setQsDate(new Date()); @@ -1674,7 +1676,7 @@ public class InvoicePoolServiceImpl implements InvoicePoolService { return JSONObject.toJSONString(interfaceCode, SerializerFeature.WriteMapNullValue); } else { - + log.info("插入销项票池"); TdxSaleRecordInvoice invoiceInfo = getSaleInvoiceInfo(infos); invoiceInfo.setUuid(invoiceCode + invoiceNo); invoiceInfo.setCompany(company);