Merge branch 'beta' into xingze

jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/jcsk/add/InvoiceAllAddDTO.java

@@ -8,6 +8,7 @@ import java.util.List;
 
 /**
  * 发票开具 1 DTO
+ *
  * @author kk
  * @date 2022年12月09日 17:16
  */
@@ -37,7 +38,7 @@ public class InvoiceAllAddDTO {
     @ApiModelProperty(value = "lzfpkj")
     private String serviceId;
 
-    InvoiceAllAddInfoDTO  jsonData;
+    InvoiceAllAddInfoDTO jsonData;
 
     // 2023/3/9  新增字段
     @ApiModelProperty(value = "放弃享受减按1%征收率原因")
@@ -81,34 +82,8 @@ public class InvoiceAllAddDTO {
 
     @ApiModelProperty(value = "运输货物名称")
     private String yshwmc;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    @ApiModelProperty(value = "购买方自然人标识")
+    private String gmfZrrbs;
 
 
 }

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

@@ -21,7 +21,8 @@ public class JcskTest {
 //         String key = "5lkC/Y5cRCtdzeroilBYFw=="; // 1246
 //         String key = "ubDUJvWWr26KTYHfzz02KA=="; // 1247
 //         String key = "uIawjnF+dXZa60h8cyI/MA=="; // 1483
-         String key = "W45KUNcF+EA9rodLz96V2w=="; // 1487
+//         String key = "W45KUNcF+EA9rodLz96V2w=="; // 1487
+         String key = "GGzLrdR6Y8FXIXkMq94StA=="; // 1488
 
 
         String  order = "";
@@ -163,6 +164,30 @@ public class JcskTest {
                 "    }\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\": \"3\",\n" +
+                "        \"dlmm\": \"139690jn\",\n" +
+                "        \"dlzh\": \"13969067208\",\n" +
+                "        \"nsrmc\": \"城阳区兴顺通制冷设备维修服务部\",\n" +
+                "        \"nsrsbh\": \"92370214MACAAEK16E\",\n" +
+                "        \"bsrysfzjhm\": \"37028519930620441X\",\n" +
+                "        \"bsrysjhm\": \"13969067208\",\n" +
+                "        \"zjh\": \"13969067208\",\n" +
+                "        \"loginType\": \"1\"\n" +
+                "    }\n" +
+                "}";
+
         System.out.println(order);
         m = AisinoInvoiceDecryptUtil.encrypt(order, key);
         System.out.println("-------------------用户登记-----------------------------");