From 9dba8de3bf2090c5d676ac6458afb9c375aaa4dc Mon Sep 17 00:00:00 2001
From: lch <lch  @example.com>
Date: Mon, 5 Jul 2021 05:47:57 +0000
Subject: [PATCH] =?UTF-8?q?=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC=20?=
 =?UTF-8?q?=EC=9E=88=EB=8A=94=20=EC=9A=94=EC=B2=AD=20=EC=A6=89=EC=8B=9C?=
 =?UTF-8?q?=EB=B0=9C=ED=96=89=EC=8B=9C=20:=20ACommonController.PayTaxRegis?=
 =?UTF-8?q?tIssue=20->=20PopbillService.RegistIssue=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EC=9E=84=EC=8B=9C=EC=A0=80=EC=9E=A5->=EB=B0=9C=ED=96=89?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=ED=95=98=EA=B2=8C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Base/Controller/ACommonCRoom.cs | 34 +++++----------------------------
 Base/Popbill/PopbillService.cs  | 26 +++++++++++++++++++++----
 2 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/Base/Controller/ACommonCRoom.cs b/Base/Controller/ACommonCRoom.cs
index b6e9a65..d196e55 100644
--- a/Base/Controller/ACommonCRoom.cs
+++ b/Base/Controller/ACommonCRoom.cs
@@ -928,39 +928,15 @@ namespace NP.Base.Controllers
             if (Dao.Save("cr.paytax.save", payTax) > 0)
             {
                 var payItems = Dao.Get<PayItem>("cr.paytaxitem2", new System.Collections.Hashtable() { { "taxno", payTax.taxno } });
-                //첨부파일이 있으면 임시저장 후 발행처리
-                if(payTax.fgno != null && payTax.fgno != 0)
+                var result = Popbill.PopbillService.RegistIssue(Dao, payTax, payItems);
+                if (result.IsSuccess)
                 {
-                    var result = Popbill.PopbillService.TempSave(Dao, payTax, payItems);
-                    if (result.IsSuccess)
-                    {
-                        var resultIssue = Popbill.PopbillService.Issue(payTax.mgtkey);
-                        if (resultIssue.IsSuccess)
-                        {
-                            return JsonOK(resultIssue.Code);
-                        }
-                        else
-                        {
-                            return JsonError(JSONCode.Error, resultIssue.Message, resultIssue);
-                        }
-                    }
-                    else
-                    {
-                        return JsonError(JSONCode.Error, result.Message, result);
-                    }
+                    return JsonOK(result.Code);
                 }
                 else
                 {
-                    var result = Popbill.PopbillService.RegistIssue(Dao, payTax, payItems);
-                    if (result.IsSuccess)
-                    {
-                        return JsonOK(result.Code);
-                    }
-                    else
-                    {
-                        return JsonError(JSONCode.Error, result.Message, result);
-                    }
-                }                
+                    return JsonError(JSONCode.Error, result.Message, result);
+                }        
             }
             return JsonOK(0);
         }
diff --git a/Base/Popbill/PopbillService.cs b/Base/Popbill/PopbillService.cs
index 5b1cbe5..8c131a7 100644
--- a/Base/Popbill/PopbillService.cs
+++ b/Base/Popbill/PopbillService.cs
@@ -410,10 +410,28 @@ namespace NP.Base.Popbill
             Result<IssueResponse> result = new Result<IssueResponse>(); ;
             try
             {
-                var taxinvoice = GetTaxinvoice(payTax, payItems, keyType).Data;
-                result.Data = PopbillConfig.taxinvoiceService.RegistIssue(PopbillConfig.CorpNum, taxinvoice, forceIssue, memo);
-                result.Code = result.Data.code;
-                result.Message = result.Data.message; 
+                //첨부파일이 있으면 임시저장 후 발행
+                if (payTax.fgno != null && payTax.fgno != 0)
+                {
+                    var resultResponse = TempSave(Dao, payTax, payItems, keyType);
+                    if (resultResponse.IsSuccess)
+                    {
+                        result = Issue(payTax.mgtkey, keyType, forceIssue, memo);
+                    }
+                    else
+                    {
+                        result.IsSuccess = false;
+                        result.Code = resultResponse.Code;
+                        result.Message = resultResponse.Message;
+                    }
+                }
+                else
+                {
+                    var taxinvoice = GetTaxinvoice(payTax, payItems, keyType).Data;
+                    result.Data = PopbillConfig.taxinvoiceService.RegistIssue(PopbillConfig.CorpNum, taxinvoice, forceIssue, memo);
+                    result.Code = result.Data.code;
+                    result.Message = result.Data.message;
+                }
             }
             catch (PopbillException ex)
             {