F

deploy/.s/1636896505560465-cn-shanghai-stategrid-service-invoice-filling-httpTrigger.json

@@ -22,7 +22,7 @@
       "disableURLInternet": false
     },
     "createdTime": "2022-07-18T02:02:16Z",
-    "lastModifiedTime": "2023-09-11T09:38:02Z",
+    "lastModifiedTime": "2023-09-11T10:40:24Z",
     "status": null,
     "targetArn": null,
     "name": "httpTrigger"

deploy/.s/1636896505560465-cn-shanghai-stategrid-service-invoice-filling.json

@@ -8,13 +8,13 @@
     "timeout": 30,
     "initializer": "",
     "initializationTimeout": 3,
-    "codeSize": 69229221,
-    "codeChecksum": "3053493131185536708",
+    "codeSize": 69224674,
+    "codeChecksum": "6416792759513366220",
     "memorySize": 1024,
     "gpuMemorySize": null,
     "environmentVariables": {},
     "createdTime": "2022-07-18T02:02:16Z",
-    "lastModifiedTime": "2023-09-11T09:37:59Z",
+    "lastModifiedTime": "2023-09-11T10:40:21Z",
     "instanceConcurrency": 1,
     "instanceSoftConcurrency": null,
     "customContainerConfig": null,

deploy/.s/1636896505560465-cn-shanghai-stategrid-service.json

@@ -12,7 +12,7 @@
     },
     "serviceId": "6e96fa7b-9988-4908-b06a-0aa7e510c881",
     "createdTime": "2022-02-26T04:50:56Z",
-    "lastModifiedTime": "2023-09-11T09:38:02Z",
+    "lastModifiedTime": "2023-09-11T10:40:24Z",
     "vpcConfig": {
       "vpcId": "",
       "vSwitchIds": [],

deploy/.s/invoice-filling.stategrid.njyunzhi.com.json

@@ -36,7 +36,7 @@
     ]
   },
   "createdTime": "2022-07-18T02:03:47Z",
-  "lastModifiedTime": "2023-09-11T09:38:03Z",
+  "lastModifiedTime": "2023-09-11T10:40:24Z",
   "keepFullPath": null,
   "subdomainCount": null,
   "wafConfig": null

deploy/s.prod.yaml

@@ -49,7 +49,7 @@ services:
       function:
         name: invoice-filling
         description: '发票确认'
-        codeUri: ../target/invoice-0.0.7.jar
+        codeUri: ../target/invoice-0.0.8.jar
         runtime: custom
         memorySize: 1024
         timeout: 30

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.njyunzhi</groupId>
 	<artifactId>invoice</artifactId>
-	<version>0.0.6</version>
+	<version>0.0.8</version>
 	<name>invoice-fill</name>
 	<description>发票填报</description>
 	<properties>

src/main/java/com/njyunzhi/invoice/config/cros/CorsConfig.java

@@ -28,9 +28,9 @@ public class CorsConfig implements WebMvcConfigurer {
 //        registration.allowCredentials(true);
         // 域名
         String origin = request.getHeader("Origin");
-        registration.allowedOrigins(origin);
+        registration.allowedOrigins(toArray(crosProperties.getOrigins()));
         //放行哪些请求方式
-        registration.allowedMethods("*");
+        registration.allowedMethods(toArray(crosProperties.getMethods()));
         //放行哪些原始请求头部信息
         registration.allowedHeaders("*");
         //暴露哪些原始请求头部信息

src/main/java/com/njyunzhi/invoice/entity/TaInvoiceDetail.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import java.util.List;
 
+import com.njyunzhi.invoice.common.excel.IsNeedLodqingCoverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -108,6 +109,14 @@ public class TaInvoiceDetail implements Serializable {
     @ApiModelProperty(value = "住宿清单")
     private String stayRemark;
 
+        @ExcelProperty(index = 12, converter = IsNeedLodqingCoverter.class)
+    @ApiModelProperty(value = "0不需要 1需要 是否需要住宿清单")
+    private String isNeedLodging;
+
+    @ExcelProperty(index = 13)
+    @ApiModelProperty(value = "房号")
+    private String roomCode;
+
     @ApiModelProperty(value = "收件人姓名")
     private String mailUser;
 

src/main/resources/application-dev.yml

@@ -8,7 +8,7 @@ spring:
   datasource:
     url: jdbc:mysql://112.2.2.154:3394/invoice_fill?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
     username: invoice_fill
-    password: invoice_fill@ABCD1234
+    password: invoice_fill
 
 wx:
   mp:

src/main/resources/mapper/TaInvoiceDetailMapper.xml

@@ -104,7 +104,9 @@
             t.`mail_phone`,
             t.`mail_address`,
             t.`status`,
-            t.`create_date`
+            t.`create_date`,
+            t.`is_need_lodging`,
+            t.`room_code`
         FROM
             ta_invoice_detail t
                 INNER JOIN ta_invoice_item s ON t.invoice_id = s.invoice_id AND t.invoice_person_id = s.invoice_person_id