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 3331512..cd07148 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 @@ -39,8 +39,7 @@ import javax.servlet.http.HttpServletRequest; * @Author 巩权林 * @Date 2022/3/26 10:11 **/ -@Api(tags = "销项接口",value = "aaaa") -@ApiOperation("aaaaaaaaaaaaaaaaa") +@Api(tags = "A简税升级-销项接口V1.0") @RestController // @RequestMapping("/api/invoice/v1/invoice") // 为了兼容老版本航信接口 @Slf4j @@ -69,7 +68,6 @@ public class InvoiceController { * @return * @throws Exception */ - @ApiOperation("API回调") @RequestMapping({"/api/invoice/v1/callback", "/api/invoice/v1/callback/{service}"}) public Object callback(HttpServletRequest request, String service) throws Exception { log.info("【销项控制器】 收到api回调请求：{}", HttpHelper.getBodyString(request)); @@ -109,7 +107,7 @@ public class InvoiceController { * @return * @throws Exception */ - @ApiOperation("API网关") +// @ApiOperation("API网关") @PostMapping({"/api/invoice/v1/gateway", "/api/invoice/v1/gateway/{identity}"}) public Object gateway(HttpServletRequest request, String identity) throws Exception { // 如果identity是空的，就去看下header头里有没有 @@ -149,7 +147,7 @@ public class InvoiceController { } @Validated - @ApiOperation("开票请求接口") + @ApiOperation("开票请求接口-（蓝字发票开具，红字发票开具）") @ApiImplicitParams({ @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), @ApiImplicitParam(name = "order", value = "请求体", required = true)}) @@ -179,7 +177,7 @@ public class InvoiceController { @Validated - @ApiOperation("开票查询接口（发票请求流水号）") +// @ApiOperation("开票查询接口（发票请求流水号）") @ApiImplicitParams({ @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), @ApiImplicitParam(name = "order", value = "请求体", required = true)}) @@ -208,7 +206,7 @@ public class InvoiceController { } @Validated - @ApiOperation("开票查询接口（订单号）") +// @ApiOperation("开票查询接口（订单号）") @ApiImplicitParams({ @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), @ApiImplicitParam(name = "order", value = "请求体", required = true)}) @@ -238,7 +236,7 @@ public class InvoiceController { @Validated - @ApiOperation("开票查询接口（范围查询）") +// @ApiOperation("开票查询接口（范围查询）") @ApiImplicitParams({ @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), @ApiImplicitParam(name = "order", value = "请求体", required = true)}) @@ -268,7 +266,7 @@ public class InvoiceController { @Validated - @ApiOperation("作废发票") +// @ApiOperation("作废发票") @ApiImplicitParams({ @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), @ApiImplicitParam(name = "order", value = "请求体", required = true)}) @@ -297,7 +295,7 @@ public class InvoiceController { } @Validated - @ApiOperation("作废发票结果查询") +// @ApiOperation("作废发票结果查询") @ApiImplicitParams({ @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), @ApiImplicitParam(name = "order", value = "请求体", required = true)}) @@ -327,7 +325,7 @@ public class InvoiceController { @Validated - @ApiOperation("红字信息表上传") +// @ApiOperation("红字信息表上传") @ApiImplicitParams({ @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), @ApiImplicitParam(name = "order", value = "请求体", required = true)}) @@ -357,7 +355,7 @@ public class InvoiceController { @Validated - @ApiOperation("红字信息表下载") +// @ApiOperation("红字信息表下载") @ApiImplicitParams({ @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), @ApiImplicitParam(name = "order", value = "请求体", required = true)}) @@ -387,7 +385,7 @@ public class InvoiceController { @Validated - @ApiOperation("发票推送接口") +// @ApiOperation("发票推送接口") @ApiImplicitParams({ @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), @ApiImplicitParam(name = "order", value = "请求体", required = true)}) @@ -417,7 +415,7 @@ public class InvoiceController { @Validated - @ApiOperation("发票批量打印接口") +// @ApiOperation("发票批量打印接口") @ApiImplicitParams({ @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), @ApiImplicitParam(name = "order", value = "请求体", required = true)}) @@ -460,7 +458,7 @@ public class InvoiceController { } @Validated - @ApiOperation("打印机查询接口") +// @ApiOperation("打印机查询接口") @ApiImplicitParams({ @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), @ApiImplicitParam(name = "order", value = "请求体", required = true)}) @@ -503,7 +501,7 @@ public class InvoiceController { } @Validated - @ApiOperation("发票签章") +// @ApiOperation("发票签章") @ApiImplicitParams({ @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), @ApiImplicitParam(name = "order", value = "请求体", required = true)}) @@ -532,7 +530,7 @@ public class InvoiceController { } @Validated - @ApiOperation("发票专用章导入注册") +// @ApiOperation("发票专用章导入注册") @ApiImplicitParams({ @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), @ApiImplicitParam(name = "order", value = "请求体", required = true)}) @@ -561,7 +559,7 @@ public class InvoiceController { } @Validated - @ApiOperation("发票专用章图片生成") +// @ApiOperation("发票专用章图片生成") @ApiImplicitParams({ @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), @ApiImplicitParam(name = "order", value = "请求体", required = true)}) @@ -855,7 +853,7 @@ public class InvoiceController { // TODO: 2023/4/6 全电接口 - @ApiOperation("获取发票下载地址") +// @ApiOperation("获取发票下载地址") @ApiImplicitParams({ @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), @ApiImplicitParam(name = "order", value = "请求体", required = true)}) @@ -890,7 +888,7 @@ public class InvoiceController { } - @ApiOperation("全电文件获取") +// @ApiOperation("全电文件获取") @ApiImplicitParams({ @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), @ApiImplicitParam(name = "order", value = "请求体", required = true)}) @@ -928,7 +926,7 @@ public class InvoiceController { } - @ApiOperation("获取人脸识别二维码") +// @ApiOperation("获取人脸识别二维码") @ApiImplicitParams({ @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), @ApiImplicitParam(name = "order", value = "请求体", required = true)}) @@ -964,7 +962,7 @@ public class InvoiceController { } - @ApiOperation("发票查询") +// @ApiOperation("发票查询") @ApiImplicitParams({ @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), @ApiImplicitParam(name = "order", value = "请求体", required = true)}) @@ -1000,7 +998,7 @@ public class InvoiceController { } - @ApiOperation("获取发票打印XML") +// @ApiOperation("获取发票打印XML") @ApiImplicitParams({ @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), @ApiImplicitParam(name = "order", value = "请求体", required = true)}) @@ -1036,7 +1034,7 @@ public class InvoiceController { } - @ApiOperation("快速红冲") +// @ApiOperation("快速红冲") @ApiImplicitParams({ @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), @ApiImplicitParam(name = "order", value = "请求体", required = true)}) @@ -1074,7 +1072,7 @@ public class InvoiceController { } - @ApiOperation("蓝字发票统计") +// @ApiOperation("蓝字发票统计") @ApiImplicitParams({ @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), @ApiImplicitParam(name = "order", value = "请求体", required = true)}) @@ -1110,7 +1108,7 @@ public class InvoiceController { } - @ApiOperation("审核红字信息表") +// @ApiOperation("审核红字信息表") @ApiImplicitParams({ @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), @ApiImplicitParam(name = "order", value = "请求体", required = true)}) @@ -1148,7 +1146,7 @@ public class InvoiceController { } - @ApiOperation("查询红字信息表明细") +// @ApiOperation("查询红字信息表明细") @ApiImplicitParams({ @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), @ApiImplicitParam(name = "order", value = "请求体", required = true)}) diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/JcskTest.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/JcskTest.java index 0f6e4e7..92bbc97 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/JcskTest.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/JcskTest.java @@ -16,7 +16,8 @@ public class JcskTest { // String key = "ZWaJUo9tKNKKQTQCryW9dw=="; // 1242 // String key = "GAu2XyVU4AYiqzPuoVGi4g=="; // 1245 - String key = "5lkC/Y5cRCtdzeroilBYFw=="; // 1246 +// String key = "5lkC/Y5cRCtdzeroilBYFw=="; // 1246 + String key = "ubDUJvWWr26KTYHfzz02KA=="; // 1247 // String key = "kpP/pYUBGWdIRNFswh+1Qg=="; // 1240 @@ -45,7 +46,7 @@ public class JcskTest { " \"loginType\": \"0\"\n" + " }\n" + "}";*/ - order = "{ \n" + + /*order = "{ \n" + " \"appkey\": \"935248bf224f6c8431cdc1969f029519\",\n" + " \"async\": false,\n" + " \"bsrysfzjhm\":\"440823199706182127\",\n" + @@ -66,7 +67,31 @@ public class JcskTest { " \"zjh\": \"\",\n" + " \"loginType\": \"0\"\n" + " }\n" + + "}";*/ + + order = "{ \n" + + " \"appkey\": \"935248bf224f6c8431cdc1969f029519\",\n" + + " \"async\": false,\n" + + " \"bsrysfzjhm\":\"37028519930620441X\",\n" + + " \"serviceId\": \"yhdj\",\n" + + " \"dqbm\": \"guangdong\",\n" + + " \"nsrsbh\": \"92370214MACAAEK16E\",\n" + + " \"jsonData\": {\n" + + " \"bsryxm\": \"贾宁\",\n" + + " \"dlsf\": \"7\",\n" + + " \"dlsfmm\": \"139690jn\",\n" + + " \"dlfs\": \"6\",\n" + + " \"dlmm\": \"139690jn\",\n" + + " \"dlzh\": \"37028519930620441X\",\n" + + " \"nsrmc\": \"城阳区兴顺通制冷设备维修服务部\",\n" + + " \"nsrsbh\": \"92370214MACAAEK16E\",\n" + + " \"bsrysfzjhm\": \"37028519930620441X\",\n" + + " \"bsrysjhm\": \"13969067208\",\n" + + " \"zjh\": \"\",\n" + + " \"loginType\": \"0\"\n" + + " }\n" + "}"; + System.out.println(order); m = AisinoInvoiceDecryptUtil.encrypt(order, key); System.out.println("-------------------用户登记-----------------------------"); @@ -135,9 +160,9 @@ public class JcskTest { " \"appkey\": \"935248bf224f6c8431cdc1969f029519\",\n" + " \"dqbm\":\"guangdong\",\n" + " \"async\": false,\n" + - " \"bsrysfzjhm\":\"440823199706182127\",\n" + - " \"nsrsbh\": \"91440101MA5CT3T24L\",\n" + - " \"requestId\": \"e2336c66-9496-46fe-82be-e30de264f622\",\n" + + " \"bsrysfzjhm\":\"37028519930620441X\",\n" + + " \"nsrsbh\": \"92370214MACAAEK16E\",\n" + + " \"requestId\": \"133a4003-5039-4cb0-9282-2eca56523a73\",\n" + " \"serviceId\": \"tycxjk\"\n" + "}"; System.out.println(order);