diff --git a/order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java b/order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java
index cd96d63b..73d9dc21 100644
--- a/order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java
+++ b/order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java
@@ -1754,29 +1754,6 @@ public class CommonUtils {
public static void main(String[] args) {
-
- String nsrsbh = "91450100MA5NA58U11";
- System.out.println(CommonUtils.getProvinceByNsrsbh(nsrsbh));
-
- String bz = "开具红字增值税专用发票信息表编号234234";
- String kplx = "1";
- String fpzldm = "52";
- String terminalCode = "006";
- String yfpdm = "fpdm";
- String yfphm = "fphm";
- String kce = "";
- String hzxxbbh = "234234";
- String bz1 = CommonUtils.getBz(bz, kplx, fpzldm, terminalCode, yfpdm, yfphm, kce, hzxxbbh);
- System.out.println(bz1);
-
- System.out.println(CommonUtils.getHzxxbbh("adfa开具红字增值税专用发票信息表编号1234567890123457", "001"));
- System.out.println(CommonUtils.getHzxxbbh("开具红字增值税专用发票信息表编号1234567890123457", "001"));
- System.out.println(CommonUtils.getHzxxbbh("adfa红字发票信息表编号1234567890123457", "004"));
- System.out.println(CommonUtils.getHzxxbbh("红字发票信息表编号1234567890123457", "004"));
-
- bz = "asdlkjfas;kldjf;asljd;l达里看风景的撒了科几艾兰德恐惧啊;连接的拉斯咖啡机埃里克交电费我去问旁人加起来待开具撒肥料去欧文疲软期颇为如期颇为UI阿斯利康多费劲啊刘东杰放辣椒砥砺奋进卡萨丁覅偶抢卧铺饿哦阿施蒂利克就发连接订饭啦解放东路就发了空数据多方了解888878y69213470168309;laksdfja;osdiuxc;lkj;lufaporuqwpoieurpoqwieurpqowjfz;lsdkjv;klzjhvpoiaudfpwhk;fglsdhvpoiasu;fgajg";
- String s = StringUtil.substringByte(bz, ConfigurerInfo.INT_0, ConfigurerInfo.INT_230);
- System.out.println(s);
-
+ System.out.println(judgeIsFgTerminalOld("015", "", ""));
}
}
diff --git a/order-management-consumer/src/main/resources/bootstrap.yaml b/order-management-consumer/src/main/resources/bootstrap.yaml
index 2a9064c5..3ebd7a07 100644
--- a/order-management-consumer/src/main/resources/bootstrap.yaml
+++ b/order-management-consumer/src/main/resources/bootstrap.yaml
@@ -6,11 +6,11 @@ spring:
name: order-api
profiles:
# Spring 配置文件读取
- active: @deployType@
+# active: @deployType@
# active: own
# active: std
# active: dev
-# active: test
+ active: test
jackson:
# jackson 日期格式化
date-format: yyyy-MM-dd HH:mm:ss
diff --git a/order-management-invoice/pom.xml b/order-management-invoice/pom.xml
index c86bd38b..08778dfc 100644
--- a/order-management-invoice/pom.xml
+++ b/order-management-invoice/pom.xml
@@ -181,6 +181,11 @@
${hutool.version}
compile
+
+ com.alibaba
+ fastjson
+ 1.2.33
+
diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/utils/HttpInvoiceRequestUtil.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/utils/HttpInvoiceRequestUtil.java
index 59599bbe..7484eede 100644
--- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/utils/HttpInvoiceRequestUtil.java
+++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/utils/HttpInvoiceRequestUtil.java
@@ -3033,6 +3033,16 @@ public class HttpInvoiceRequestUtil {
BeanUtils.copyProperties(interfaceData, invoiceRequestParam);
return invoiceRequestParam;
}
+
+ public static void main(String[] args) {
+ String result = "{\"taxpayerNo\":\"150301197205130026\",\"machineNo\":\"661616315922\",\"dataExchangeId\":\"70812846211437091698\",\"machineType\":\"FGKP_CLIENT\",\"encryCode\":\"2\",\"terminalCode\":\"2\",\"version\":\"1.3\",\"returnCode\":\"0000\",\"returnMsg\":\"5aSE55CG5oiQ5Yqf\",\"key\":\"9990562565RTBEODg3QzM3N0JERDkzQQ==\",\"data\":\"H4sIAAAAAAAEANs68Sw/56IT/jyXc5S1w7f5Z/NXPQ1nmSNQnii/31NkIXf5/4tuP/73PllewSt3jGHuPIYc0SXXZrIv+7PQ9Klt+fKOmGMhm/ueTeIV1D60IzyjR3zHqbMsTqUSs/9evLX59TONC34GT64UFGZ/PLK2TrJ3ltdFPgHdrh1LBHaeUv8Z0LE0LCY1XHLbvwUrGy2ulG5k3mfenfH991cPlq3Nwj5bpTeuyj8ytYVtyvnPvwv9tar2KKZ03QlvZ/S5nNMbtvDM7W7+doYosYVK84+9n/ftuM3MD38M5a1qoz8Irv7+pbF6os+mda/3P7Y7X5D19nbF2v70TYobiv71vGc4wjEhYYsAR6/E9b70jQI8E3rlNs/fnz/nLPdBU+Uf5yO/bOQTD9U5n7RyKU8h881WtTU/XRnFthW91NgiZRKV8f9Ezarip9JMctPbnx+5FWEwZzFfXs6PiBX7xYrcXvknTYw4VqUkul7NX0RPQWSDsWKw3xq3NrUlp/wnuqTPPeW5pSnss3bHF9kDxW/ZkszL5QN2P2ze//nNPP3d997crbvCynvm5qZu3Y17mtecnMzjsIX3bpzv/ABdthzjhNw/Rh0MEhpzxINtPkzcZbb122eJ3Q2fP32ofr/hd8ujo+/vvGeYIvl4x4G9sQe5/dg1VYV/dpRZGOo+kLz+TLmD30KrNpZdQfwUT6b8q+qnvnPVpn0q/G+9wjM6xKXrLI+AL0f7FmeOeQ1NE29O2VLMVvOo85r/+3jN8GMHHTiuPOZMF9b4pDdUwm3r106hXK7ndl6XEixzvwfG3Jp4fWrXlMW6pw67TPhb90bom9veFjmhidViU+2VDdntRW5FLrMIPa97oS+c+Xvc/vKVTe/r53wvCsjJL5k570x1W/tGp5RppSXT18/88/LXwv3x5Y6PpUR9ZdVPZq5rXc/18FfW7a2h/VMXXfryT0pGt1FTdwMsvSUwXJv8vUP9wVAJt8GS3lYH7z5TYf7j+VALN5j+gUpvB6IuN9/p/uoimVjnfXzhtDVbnYXieAqzAz+/6Vob9WSrnNtdw68TthWZ/mhgsYz1fpQd/dY2yzDocqrIOtGtK81mrO17tkA/fKastViR9COhQE25i2E343Z7bG0LcFRZvFu43PGI9STR8h93prh4fRKOanj6AuZvV7mUG18vFGyUuln5nt0ne1FJ8GVzjTxnvv9pShGNOzUrGRdvsjGoa1mZMOH9EkeR4K+zXaRcwrwjtjqGPtA4urfv6ZNHDNMenzA/Ra9we8j33liZf3Gnq1y5osEl+ckAJaPXPgAHAAA=\",\"checkCode\":\"84B9\"}";
+ try {
+ InterfaceData interfaceData = ProtocolUtil.decodeData(result);
+ System.out.println(JSONObject.toJSONString(interfaceData));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
private static String getMachineType(String terminalCode) {
String machineType = "";