Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-api

src/main/java/com/oqpo/api/service/loanmng/UnpaidMngService.java

@@ -48,13 +48,13 @@ public class UnpaidMngService extends CommonService {
                         .storeNm(m.getStoreNm())
                         .sttlStCd(m.getSttlStCd())
                         .sttlStNm(m.getSttlStNm())
-                        .sttlReqAmt(m.getSttlReqAmt())
-                        .sttlDt(m.getSttlDt())
-                        .sttlAmt(m.getSttlAmt())
-                        .acctBal(m.getAcctBal())
+                        .sttlReqAmt(m.getSttlReqAmt())      /* 정산요청금액 */
+                        .sttlDt(m.getSttlDt())              /* 정산확정일자 */
+                        .sttlAmt(m.getSttlAmt())            /* 정산확정금액 */
+                        .unpaidAmt(m.getUnpaidAmt())        /* 미납금액 */
                         .loanDvsn(m.getLoanDvsn())
                         .loanDvsnNm(m.getLoanDvsnNm())
-                        .useAmtTotal(m.getUseAmtTotal())
+                        .useAmtTotal(m.getUseAmtTotal())    /* 사용가능한도 */
                         .build())
                 .collect(Collectors.toList());
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);

src/main/java/com/oqpo/api/web/dto/response/loanmng/UnpaidMngInfoResponse.java

@@ -39,6 +39,8 @@ public class UnpaidMngInfoResponse {
     private String sttlDt;
     @ApiModelProperty(value = "정산금액")
     private Long sttlAmt;
+    @ApiModelProperty(value = "미납금액(후불사용)")
+    private Long unpaidAmt;
     @ApiModelProperty(value = "정산등록담당자명")
     private String sttlRegMgrNm;
     @ApiModelProperty(value = "정산등록담당자아이디")
@@ -67,15 +69,16 @@ public class UnpaidMngInfoResponse {
         return UnpaidMngInfoResponse.builder()
                 .sttlMgntUnqNo(entity.getSttlMgntUnqNo())
                 .sttlReqDt(entity.getSttlReqDt())
+                .sttlDt(entity.getSttlDt())
                 .brandId(entity.getBrandId())
                 .brandNm(entity.getBrandNm())
                 .storeId(entity.getStoreId())
                 .storeNm(entity.getStoreNm())
                 .sttlStCd(entity.getSttlStCd())
                 .sttlStNm(entity.getSttlStNm())
-                .sttlReqAmt(entity.getSttlReqAmt())
-                .sttlDt(entity.getSttlDt())
-                .sttlAmt(entity.getSttlAmt())
+                .sttlReqAmt(entity.getSttlReqAmt())         /* 정산요청금액 */
+                .sttlAmt(entity.getSttlAmt())               /* 정산확정금액 */
+                .unpaidAmt(entity.getUnpaidAmt())           /* 미납금액 */
                 .sttlRegMgrNm(entity.getSttlRegMgrNm())
                 .sttlRegMgrId(entity.getSttlRegMgrId())
                 .sysRegDttm(entity.getSysRegDttm())
@@ -83,7 +86,8 @@ public class UnpaidMngInfoResponse {
                 .sysRegNm(entity.getSysRegNm())
                 .sysChgDttm(entity.getSysChgDttm())
                 .sysChgId(entity.getSysChgId())
-                .useAmtTotal(entity.getUseAmtTotal())
+                .acctBal(entity.getAcctBal())               /* 계좌잔액 */
+                .useAmtTotal(entity.getUseAmtTotal())       /* 사용가능한도금액 */
                 .rcptYn(entity.getRcptYn())
                 .build();
     }

src/main/java/com/oqpo/api/web/dto/response/loanmng/UnpaidMngListResponse.java

@@ -32,11 +32,13 @@ public class UnpaidMngListResponse {
     private String sttlReqDt;
     @ApiModelProperty(value = "정산요청금액")
     private Long sttlReqAmt;
-    @ApiModelProperty(value = "정산일자")
+    @ApiModelProperty(value = "정산확정일자")
     private String sttlDt;
-    @ApiModelProperty(value = "정산금액")
+    @ApiModelProperty(value = "정산확정금액")
     private Long sttlAmt;
-    @ApiModelProperty(value = "계좌잔액")
+    @ApiModelProperty(value = "미납금액")
+    private Long unpaidAmt;
+    @ApiModelProperty(value = "매장 계좌잔액")
     private Long acctBal;
     @ApiModelProperty(value = "여신구분")
     private String loanDvsn;

src/main/resources/mybatis/sqlmaps/loanmng/UnpaidMng.xml

@@ -15,8 +15,11 @@
             loan.credt_limit_amt,       /* 신용한도금액(후불) */
             loan.tmp_rcv_acct_total,    /* 가수금액합계(선결제) */
             DATE_FORMAT(stl.sttl_req_dt, '%Y.%m.%d') AS sttl_req_dt,        /* 정산요청일자 */
+            DATE_FORMAT(stl.sttl_dt, '%Y.%m.%d') AS sttl_dt,                /* 정산확정일자 */
             stl.sttl_req_amt,           /* 정산요청금액 */
-            DATE_FORMAT(stl.sttl_dt, '%Y.%m.%d') AS sttl_dt,                /* 정산확인일자 */
+            stl.sttl_amt,               /* 정산확정금액 */
+            stl.rcpt_amt,               /* 수납금액 */
+            (IFNULL(stl.sttl_amt, stl.sttl_req_amt) - IFNULL(stl.rcpt_amt, 0)) AS unpaid_amt,       /* 미납금액 */
             <![CDATA[
             CASE WHEN store.sttl_req_cfrm_term > 0 AND store.sttl_rcp_amt_term > 0 THEN
                     CASE WHEN stl.sttl_req_dt IS NULL THEN '정산요청전'
@@ -37,17 +40,17 @@
             stl.sttl_mgnt_unq_no      /* 정산관리고유번호 */
         FROM store_base_info store
         INNER JOIN loan_mgnt_base_info loan
-        ON store.loan_mgnt_unq_no = loan.loan_mgnt_unq_no
-        AND store.loan_dvsn = loan.loan_dvsn
-        AND store.store_id = loan.store_id
-        AND loan.loan_dvsn = 'LD02'
-        AND loan.use_amt_total > 0
+            ON store.loan_mgnt_unq_no = loan.loan_mgnt_unq_no
+            AND store.loan_dvsn = loan.loan_dvsn
+            AND store.store_id = loan.store_id
+            AND loan.loan_dvsn = 'LD02'
+            AND loan.use_amt_total > 0
         INNER JOIN stl_mgnt_base_info stl
-        ON store.store_id = stl.store_id
-        AND store.brand_id = stl.brand_id
-        AND stl.sttl_req_dt BETWEEN #{fromDt} AND #{toDt}
-        AND stl.sttl_st_cd IN ('ST10', 'ST20')      /* 정산요청/정산확정 */
-        AND IFNULL(stl.rcpt_yn, 'N') = 'N'          /* 수납여부(후불사용) */
+            ON store.store_id = stl.store_id
+            AND store.brand_id = stl.brand_id
+            AND stl.sttl_req_dt BETWEEN #{fromDt} AND #{toDt}
+            AND stl.sttl_st_cd IN ('ST10', 'ST20')      /* 정산요청/정산확정 */
+            AND IFNULL(stl.rcpt_yn, 'N') = 'N'          /* 수납여부(후불사용) */
         WHERE 1 = 1
         AND store.brand_id = #{sBrandId}
         <if test="sStoreId != null and sStoreId != ''">
@@ -104,12 +107,15 @@
             loan.loan_mgnt_unq_no,          /* 여신관리고유번호 */
             loan.loan_dvsn, FN_CODE_NM('LOAN_DVSN', loan.loan_dvsn) AS loan_dvsn_nm,       /* 여신구분(정산타입) */
             loan.credt_limit_amt - loan.use_amt_total + loan.acct_bal + loan.tmp_rcv_acct_total AS use_amt_total,    /* 사용가능한도 */
-            loan.acct_bal,              /* 계좌잔액 */
+            loan.acct_bal,              /* 매장 계좌잔액 */
             loan.credt_limit_amt,       /* 신용한도금액(후불) */
             loan.tmp_rcv_acct_total,    /* 가수금액합계(선결제) */
             DATE_FORMAT(stl.sttl_req_dt, '%Y.%m.%d') AS sttl_req_dt,        /* 정산요청일자 */
+            DATE_FORMAT(stl.sttl_dt, '%Y.%m.%d') AS sttl_dt,                /* 정산확정일자 */
             stl.sttl_req_amt,           /* 정산요청금액 */
-            DATE_FORMAT(stl.sttl_dt, '%Y.%m.%d') AS sttl_dt,                /* 정산확인일자 */
+            stl.sttl_amt,               /* 정산확정금액 */
+            stl.rcpt_amt,               /* 수납금액 */
+            (IFNULL(stl.sttl_amt, stl.sttl_req_amt) - IFNULL(stl.rcpt_amt, 0)) AS unpaid_amt,       /* 미납금액 */
             <![CDATA[
             CASE WHEN store.sttl_req_cfrm_term > 0 AND store.sttl_rcp_amt_term > 0 THEN
                     CASE WHEN stl.sttl_req_dt IS NULL THEN '정산요청전'