fix org delete

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

@@ -21,7 +21,7 @@
       "authType": "anonymous"
     },
     "createdTime": "2022-07-18T02:02:16Z",
-    "lastModifiedTime": "2022-07-18T07:56:57Z",
+    "lastModifiedTime": "2022-07-19T07:13:25Z",
     "name": "httpTrigger"
   }
 }

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

@@ -8,13 +8,13 @@
     "timeout": 30,
     "initializer": "",
     "initializationTimeout": 3,
-    "codeSize": 69219873,
-    "codeChecksum": "8933832746482495729",
+    "codeSize": 69220537,
+    "codeChecksum": "5731091282673601247",
     "memorySize": 1024,
     "gpuMemorySize": null,
     "environmentVariables": {},
     "createdTime": "2022-07-18T02:02:16Z",
-    "lastModifiedTime": "2022-07-18T07:56:50Z",
+    "lastModifiedTime": "2022-07-19T07:13:16Z",
     "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": "2022-07-18T07:56:57Z",
+    "lastModifiedTime": "2022-07-19T07:13:25Z",
     "vpcConfig": {
       "vpcId": "",
       "vSwitchIds": [],

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

@@ -33,5 +33,5 @@
     ]
   },
   "createdTime": "2022-07-18T02:03:47Z",
-  "lastModifiedTime": "2022-07-18T07:56:57Z"
+  "lastModifiedTime": "2022-07-19T07:13:25Z"
 }

deploy/s.prod.yaml

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

pom.xml

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

src/main/java/com/njyunzhi/invoice/controller/TaInvoicePersonController.java

@@ -114,7 +114,18 @@ public class TaInvoicePersonController extends BaseController {
      */
     @RequestMapping(value="/admin/invoice/{invoiceId}/person/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taInvoicePersonDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+    public ResponseBean taInvoicePersonDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        TaInvoicePerson taInvoicePerson = iTaInvoicePersonService.getById(id);
+        if (null == taInvoicePerson) {
+            return ResponseBean.success("success");
+        }
+
+        // 判断是否需要删除单位信息
+        int cnt = iTaInvoicePersonService.countBy("invoice_org_id", taInvoicePerson.getInvoiceOrgId(), true);
+        if (cnt <= 1) {
+            iTaInvoiceOrgService.removeLogicById(taInvoicePerson.getInvoiceOrgId());
+        }
+
         if (iTaInvoicePersonService.removeLogicById(id)) {
             return ResponseBean.success("success");
         } else {

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

@@ -108,6 +108,15 @@ public class TaInvoiceDetail implements Serializable {
     @ApiModelProperty(value = "住宿清单")
     private String stayRemark;
 
+    @ApiModelProperty(value = "收件人姓名")
+    private String mailUser;
+
+    @ApiModelProperty(value = "收件人电话")
+    private String mailPhone;
+
+    @ApiModelProperty(value = "收件人地址")
+    private String mailAddress;
+
     @ApiModelProperty(value = "状态")
     private Integer status;
 

src/main/java/com/njyunzhi/invoice/service/impl/TaInvoiceDetailServiceImpl.java

@@ -104,6 +104,9 @@ public class TaInvoiceDetailServiceImpl extends ServiceImpl<TaInvoiceDetailMappe
             origin.setPersonId(taInvoiceDetail.getPersonId());
             origin.setMergeRemark(taInvoiceDetail.getMergeRemark());
             origin.setStayRemark(taInvoiceDetail.getStayRemark());
+            origin.setMailAddress(taInvoiceDetail.getMailAddress());
+            origin.setMailPhone(taInvoiceDetail.getMailPhone());
+            origin.setMailUser(taInvoiceDetail.getMailUser());
 
             return updateById(origin);
         }

src/main/resources/application-dev.yml

@@ -24,7 +24,7 @@ wx:
 
 ### 跨域
 cors:
-  enabled: true
+  enabled: false
   origins:
     - "http://localhost:8000"
   exposedHeaders:

src/main/resources/mapper/TaInvoiceDetailMapper.xml

@@ -100,6 +100,9 @@
             s.`charge`,
             t.`merge_remark`,
             t.`stay_remark`,
+            t.`mail_user`,
+            t.`mail_phone`,
+            t.`mail_address`,
             t.`status`,
             t.`create_date`
         FROM