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 b3f12a2..9494359 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
@@ -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
diff --git a/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceAddController.java b/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceAddController.java
new file mode 100644
index 0000000..c82cd47
--- /dev/null
+++ b/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表里面去。
+ *
+ *
+ */
+
+
+
+
+
+
+
+}
diff --git a/jianshui-income/src/main/java/com/jianshui/income/service/impl/EleAuthInvoiceImpl.java b/jianshui-income/src/main/java/com/jianshui/income/service/impl/EleAuthInvoiceImpl.java
index b6320ba..e360486 100644
--- a/jianshui-income/src/main/java/com/jianshui/income/service/impl/EleAuthInvoiceImpl.java
+++ b/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);
}
diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/IncomeTest.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/IncomeTest.java
index 0eca40e..ce46282 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/IncomeTest.java
+++ b/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);
diff --git a/jianshui-platform/pom.xml b/jianshui-platform/pom.xml
new file mode 100644
index 0000000..8bba55f
--- /dev/null
+++ b/jianshui-platform/pom.xml
@@ -0,0 +1,65 @@
+
+ 4.0.0
+
+ com.jianshui
+ jianshui
+ 3.8.0
+
+ jianshui-platform
+ war
+ jianshui-platform Maven Webapp
+ http://maven.apache.org
+
+
+ jianshui-platform
+
+
+
+
+ 8
+ 8
+
+
+
+
+
+ com.jianshui
+ jianshui-common
+
+
+ org.projectlombok
+ lombok
+
+
+ com.jianshui
+ jianshui-queue
+ 3.8.0
+ compile
+
+
+ com.jianshui
+ jianshui-system
+
+
+ commons-httpclient
+ commons-httpclient
+ 3.1
+ compile
+
+
+ cn.hutool
+ hutool-all
+ 5.8.0.M1
+ compile
+
+
+ io.swagger
+ swagger-annotations
+ 1.6.2
+ compile
+
+
+
+
+
diff --git a/pom.xml b/pom.xml
index fb74e5e..d3c0d6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -263,6 +263,7 @@
jianshui-breaker
jianshui-storage
jianshui-invoice-all
+ jianshui-platform
pom