获取确认结果接口调整

jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java

@@ -1,13 +1,16 @@
 package com.jianshui.api.controller.http.invoice.v1;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.jianshui.common.core.domain.AjaxResult;
 import com.jianshui.common.core.domain.entity.Companyservice;
+import com.jianshui.common.core.redis.RedisCache;
 import com.jianshui.common.enums.ErrorCode;
 import com.jianshui.common.exception.jianshui.JianshuiParamErrorException;
 import com.jianshui.common.utils.StringUtils;
 import com.jianshui.common.utils.http.HttpHelper;
+import com.jianshui.common.utils.spring.SpringUtils;
 import com.jianshui.invoice.domain.BillInfo;
 import com.jianshui.invoice.domain.Redinfo;
 import com.jianshui.invoice.domain.dto.*;
@@ -31,6 +34,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @Description

jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceAddController.java

@@ -0,0 +1,34 @@
+package com.jianshui.web.controller.platform;
+
+import com.jianshui.common.core.controller.BaseController;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 发票录入
+ * 
+ */
+@Api(tags = "测试接口文档",value = "ceceshi")
+@RestController
+@RequestMapping("/platForm/invoice")
+public class InvoiceAddController extends BaseController {
+
+    //发票录入
+
+    /**
+     * 接口权限走登录验证，token
+     * 发票录入-》对接发票开具接口
+     *
+     * 录入到billInfo表里面去。
+     *
+     *
+     */
+
+
+
+
+
+
+
+}

jianshui-income/src/main/java/com/jianshui/income/service/impl/EleAuthInvoiceImpl.java

@@ -704,8 +704,8 @@ public class EleAuthInvoiceImpl implements IAuthInvoice {
                     }
                 }
             }
-        } else {
-            return AjaxResult.error(resp.getString("ZTXX") != null ? resp.getString("ZTXX") : "");
+        }else {
+            return AjaxResult.success(incomeApplyConfirmResultVO);
         }
         return AjaxResult.success(incomeApplyConfirmResultVO);
     }

jianshui-invoice/src/main/java/com/jianshui/invoice/utils/IncomeTest.java

@@ -113,6 +113,9 @@ public class IncomeTest {
         System.out.println("-------------------申请确认-----------------------------");
         order = "{\"GMFSBH\":\"9111122223333CKFPT\",\"PCH\":\""+ cn.hutool.core.lang.UUID.fastUUID().toString().replace("-","") +"\"," +
                 "\"QRBZ\":\"1\",\"TJSJ\":\"202209\",\"RZSKSSQ\":\"202209\",\"QRMM\":\"123456\",\"taxNo\":\"9111122223333CKFPT\"}";
+
+        order = "{\"GMFSBH\":\"9111122223333CKFPT\",\"PCH\":\""+ "67074fed71cc42da8fc12bdcd2111f49" +"\"," +
+                "\"QRBZ\":\"1\",\"TJSJ\":\"202209\",\"RZSKSSQ\":\"202209\",\"QRMM\":\"123456\",\"taxNo\":\"9111122223333CKFPT\"}";
         m = AisinoInvoiceDecryptUtil.encrypt(order, key);
         System.out.println("json : \n" + order);
         System.out.println(m);
@@ -121,6 +124,7 @@ public class IncomeTest {
         System.out.println("-------------------获取确认结果-----------------------------");
         order = "{\"GMFSBH\":\"9111122223333CKFPT\",\"PCH\":\"2d92821a9dfc4f1aaa744bcbd1696ebd\"," +
                 "\"QRBZ\":\"0\",\"TJSJ\":\"202209\",\"taxNo\":\"9111122223333CKFPT\"}";
+        order = "{\"PCH\":\"67074fed71cc42da8fc12bdcd2111f49\",\"TJSJ\":\"202209\",\"taxNo\":\"9111122223333CKFPT\",\"GMFSBH\":\"9111122223333CKFPT\",\"QRBZ\":\"0\"}";
         m = AisinoInvoiceDecryptUtil.encrypt(order, key);
         System.out.println("json : \n" + order);
         System.out.println(m);

jianshui-platform/pom.xml

@@ -0,0 +1,65 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.jianshui</groupId>
+        <artifactId>jianshui</artifactId>
+        <version>3.8.0</version>
+    </parent>
+    <artifactId>jianshui-platform</artifactId>
+    <packaging>war</packaging>
+    <name>jianshui-platform Maven Webapp</name>
+    <url>http://maven.apache.org</url>
+
+    <build>
+        <finalName>jianshui-platform</finalName>
+    </build>
+
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.jianshui</groupId>
+            <artifactId>jianshui-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.jianshui</groupId>
+            <artifactId>jianshui-queue</artifactId>
+            <version>3.8.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.jianshui</groupId>
+            <artifactId>jianshui-system</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.0.M1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.6.2</version>
+            <scope>compile</scope>
+        </dependency>
+
+
+    </dependencies>
+</project>

pom.xml

@@ -263,6 +263,7 @@
         <module>jianshui-breaker</module>
         <module>jianshui-storage</module>
         <module>jianshui-invoice-all</module>
+        <module>jianshui-platform</module>
     </modules>
     <packaging>pom</packaging>