Merge remote-tracking branch 'origin/beta' into beta

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java

@@ -179,7 +179,7 @@ public class BillInfo extends BaseEntity
     private Integer state;
 
     @Excel(name = "开票状态")
-    @TableField(exist = false)
+    @TableField(exist=false)
     private String billState;
 
     /** 订单来源 */

jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java

@@ -105,7 +105,7 @@ public class AisinoInvoiceRequestAdapterImpl implements IInvoiceRequestService {
         // 平台解密
         try {
             // TODO: 2023/9/20
-//            order = AisinoInvoiceDecryptUtil.decrypt(order, JKey);
+            order = AisinoInvoiceDecryptUtil.decrypt(order, JKey);
         } catch (Exception e) {
             e.printStackTrace();
             throw new JianshuiParamErrorException(ErrorCode.DECRYPT_ERROR, companyservice, "invoice");

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

@@ -35,7 +35,7 @@ public class InvoiceTest {
 //        String key = "FUTSzkE5Eqec1XYNrJ2h2w=="; // 1237
 //        String key = "LTEO+oOgWMsuQAOUglqXuQ=="; // 1221
 //        String key = "LTEO+oOgWMsuQAOUglqXuQ=="; // 1002
-        String key = "RzVdCHPvtOPvub5T0xbs6A=="; // 2004
+//        String key = "RzVdCHPvtOPvub5T0xbs6A=="; // 2004
 //        String key = "h+6FwpA1Mi7wgG+U207TKkcA=="; //
         // String key = "G+/33jnXT65iUSH1L+2E+w=="; // 1191
 //        String key = "HwHDdrtl8VkuZ/K+mLn0lA=="; // 2233
@@ -52,6 +52,7 @@ public class InvoiceTest {
 //         String key = "BUgDX62Wh1NChV+h1XCXdw=="; // 1203
         // String key = "TG1NR1N0R3RPcEY0eE55dg=="; // 1132
         // String key = "2KF3rawkN1B1gGjwrtBMlQ=="; // 500
+         String key = "S1jIlJRLXBNtIFihvQ0VPw=="; // 1501
 
         // 1203 红字发票
         // String order = "{" +
@@ -2131,6 +2132,7 @@ public class InvoiceTest {
 
 
 
+
     }