정산완료/입금승인 등 수정

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

@@ -191,10 +191,10 @@ public class DsptMngService extends CommonService {
             // 정산관리고유번호 존재시 처리
             if (!StringUtil.isEmpty(procEntity.getSttlMgntUnqNo())) {
                 // 1. 정산관리기본정보 수납처리
-                StlMgntBaseInfoEntity stlEntity = new StlMgntBaseInfoEntity();
-                stlEntity.setSttlMgntUnqNo(procEntity.getSttlMgntUnqNo());
-                stlEntity.setRcptYn("Y");
-                stlEntity.setRcptAmt(procEntity.getDpstAmt());
+                StlMgntBaseInfoEntity stlEntity = sttlReqMapper.selectStlMgntBaseInfo(procEntity.getSttlMgntUnqNo());
+                long rcptAmt = stlEntity.getRcptAmt() + procEntity.getDpstAmt(); // 수납금액
+                stlEntity.setRcptYn(rcptAmt >= stlEntity.getSttlReqAmt() ? "Y" : "N");
+                stlEntity.setRcptAmt(rcptAmt);
                 sttlReqMapper.updateStlMgntBaseInfo4Rcpt(userId, stlEntity);
 
                 // 2. 여신관리기본정보 처리

src/main/java/com/oqpo/api/service/sttlmng/SttlStateService.java

@@ -9,7 +9,6 @@ import com.oqpo.api.enums.MediaDvsn;
 import com.oqpo.api.enums.PayType;
 import com.oqpo.api.enums.SttlStCd;
 import com.oqpo.api.mapper.loanmng.DsptMngMapper;
-import com.oqpo.api.mapper.loanmng.UnpaidMngMapper;
 import com.oqpo.api.mapper.sttlmng.SttlReqMapper;
 import com.oqpo.api.mapper.sttlmng.SttlStateMapper;
 import com.oqpo.api.service.CommonService;
@@ -39,9 +38,6 @@ public class SttlStateService extends CommonService {
     @Autowired
     private DsptMngMapper dsptMngMapper;
 
-    @Autowired
-    private UnpaidMngMapper unpaidMngMapper;
-
     /*
       정산요청 그리드 리스트 조회
      */
@@ -89,12 +85,10 @@ public class SttlStateService extends CommonService {
         StlMgntBaseInfoEntity entity = sttlReqMapper.selectStlMgntBaseInfo(sttlConfirmRequest.getSttlMgntUnqNo());
 
         // 정산관리기본정보 - 정산상태코드 변경
-        StlMgntBaseInfoEntity stlEntity = new StlMgntBaseInfoEntity();
-        stlEntity.setSttlMgntUnqNo(sttlConfirmRequest.getSttlMgntUnqNo());
-        stlEntity.setSttlStCd(SttlStCd.STTL_CONFIRM.getCd());
-        stlEntity.setSttlDt(DateUtil.getCurrentDate());
-        stlEntity.setSttlAmt(entity.getSttlReqAmt()); // 정산요청금액을 정산금액으로 지정한다.
-        sttlReqMapper.updateStlMgntBaseInfo4SttlConfirm(userId, stlEntity);
+        entity.setSttlStCd(SttlStCd.STTL_CONFIRM.getCd());
+        entity.setSttlDt(DateUtil.getCurrentDate());
+        entity.setSttlAmt(entity.getSttlReqAmt()); // 정산요청금액을 정산금액으로 지정한다.
+        sttlReqMapper.updateStlMgntBaseInfo4SttlConfirm(userId, entity);
 
         if ("N".equals(entity.getRcptYn())) { // 수납여부가 N인 경우
             // 매장의 계좌잔액이 있은 경우 정산지급 처리를 한다.
@@ -134,9 +128,9 @@ public class SttlStateService extends CommonService {
                 dsptMngMapper.insertLoanMgntDtlHst(userId, hstEntity);
 
                 // 3. 정산관리기본정보 수납처리
-                stlEntity.setRcptYn(rcptYn); // 수납여부
-                stlEntity.setRcptAmt(rcptAmt); // 수납금액
-                sttlReqMapper.updateStlMgntBaseInfo4Rcpt(userId, stlEntity);
+                entity.setRcptYn(rcptYn); // 수납여부
+                entity.setRcptAmt(entity.getRcptAmt() + rcptAmt); // 수납금액
+                sttlReqMapper.updateStlMgntBaseInfo4Rcpt(userId, entity);
             }
         }
     }

src/main/resources/mybatis/sqlmaps/sttlmng/SttlReq.xml

@@ -172,9 +172,9 @@
             A.sttl_st_cd, FN_CODE_NM('STTL_ST_CD', A.sttl_st_cd) AS sttl_st_nm,
             DATE_FORMAT(A.sttl_req_dt, '%Y.%m.%d') AS sttl_req_dt,      /* 정산요청일자 */
             DATE_FORMAT(A.sttl_dt, '%Y.%m.%d') AS sttl_dt,              /* 정산확정일자 */
-            A.sttl_req_amt,             /* 정산요청금액 */
-            A.sttl_amt,                 /* 정산확정금액 */
-            A.rcpt_amt,                 /* 수납금액 */
+            A.sttl_req_amt,                         /* 정산요청금액 */
+            A.sttl_amt,                             /* 정산확정금액 */
+            IFNULL(A.rcpt_amt, 0) AS rcpt_amt,      /* 수납금액 */
             case when B.LOAN_DVSN = 'LD02' then A.sttl_amt - IFNULL(A.rcpt_amt, 0) ELSE 0 END AS unpaid_amt, /* 미납금액 */ 
             A.sttl_reg_mgr_nm, A.sttl_reg_mgr_id,
             A.sttl_rjct_rsn,