입금처리 시 입금관리번호 이력에 등록 되도록

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

@@ -495,6 +495,21 @@ public class EasypayPaymentService extends CommonService {
         infoEntity.setAcctBal(trscAfBal);
         dsptMngMapper.updateLoanMgntBaseInfo4AcctBal(userId, infoEntity);
 
+        // 4. 여신관리입금처리
+        LoanMgntDsptProcEntity entity = new LoanMgntDsptProcEntity();
+        entity.setDsptMgntNo(fnGetDealNo(21, "")); // 입금관리번호
+        entity.setReqDt(DateUtil.getCurrentDate());
+        entity.setReqTm(DateUtil.getCurrentTime());
+        entity.setDpstAmt(Long.parseLong(r_amount)); // 입금금액
+        entity.setDpstDt(entity.getReqDt()); // 입금일자
+        entity.setDpstStCd(DpstStCd.DPST_APPROVE.getCd());
+        entity.setDpstReqId(userId);
+        entity.setStoreId(payInfo.getStoreId());
+        entity.setBrandId(payInfo.getBrandId());
+        entity.setPoOrdNo(payInfo.getPoOrdNo());
+        entity.setPgId("KICC");
+        dsptMngMapper.insertLoanMgntDsptProcInfo(userId, entity);
+
         // 2. 여신관리상세이력
         // 2.1 입금 처리
         LoanMgntDtlHstEntity hstEntity = new LoanMgntDtlHstEntity();
@@ -515,12 +530,22 @@ public class EasypayPaymentService extends CommonService {
         } else if (PayTpCd.PR_APPR_PAYMENT.getCd().equals(easypayPaymentRequest.getPayTpCd())) {
             hstEntity.setPayType(PayType.PRE_PAYMENT.getCd());
         }
-
-
         hstEntity.setTrscAmt(Long.parseLong(r_amount)); // 거래금액
         hstEntity.setTrscBfBal(trscBfBal);
         hstEntity.setTrscAfBal(trscAfBal);
+        hstEntity.setDsptMgntNo(entity.getDsptMgntNo()); // 입금관리번호
         dsptMngMapper.insertLoanMgntDtlHst(userId, hstEntity);
+    }
+
+    private void procAfterPayment(String userId, String r_amount, String r_pay_type, PgKiccPayPtclEntity payInfo, EasypayPaymentRequest easypayPaymentRequest) throws Exception {
+        // 2. 여신관리기본정보
+        LoanMgntBaseInfoEntity infoEntity = dsptMngMapper.selectLoanMgntBaseInfo(payInfo.getBrandId(), payInfo.getStoreId());
+
+        long trscBfBal = infoEntity.getAcctBal();
+        long trscAfBal = infoEntity.getAcctBal() + Long.parseLong(r_amount);
+        // 사용금액합계 감소
+        infoEntity.setUseAmtTotal(infoEntity.getUseAmtTotal() - Long.parseLong(r_amount));
+        unpaidMngMapper.updateLoanMgntBaseInfo4UnpaidPay(userId, infoEntity);
 
         // 4. 여신관리입금처리
         LoanMgntDsptProcEntity entity = new LoanMgntDsptProcEntity();
@@ -529,24 +554,17 @@ public class EasypayPaymentService extends CommonService {
         entity.setReqTm(DateUtil.getCurrentTime());
         entity.setDpstAmt(Long.parseLong(r_amount)); // 입금금액
         entity.setDpstDt(entity.getReqDt()); // 입금일자
+        // entity.setDpstNm(reqDsptRequest.getDpstNm());
+        // entity.setRcvAcctNo(reqDsptRequest.getRcvAcctNo());
+        // entity.setDpstBnkCd(reqDsptRequest.getDpstBnkCd());
         entity.setDpstStCd(DpstStCd.DPST_APPROVE.getCd());
         entity.setDpstReqId(userId);
+        // entity.setDpstReqNm(user.getUserNm());
         entity.setStoreId(payInfo.getStoreId());
         entity.setBrandId(payInfo.getBrandId());
         entity.setPoOrdNo(payInfo.getPoOrdNo());
         entity.setPgId("KICC");
         dsptMngMapper.insertLoanMgntDsptProcInfo(userId, entity);
-    }
-
-    private void procAfterPayment(String userId, String r_amount, String r_pay_type, PgKiccPayPtclEntity payInfo, EasypayPaymentRequest easypayPaymentRequest) throws Exception {
-        // 2. 여신관리기본정보
-        LoanMgntBaseInfoEntity infoEntity = dsptMngMapper.selectLoanMgntBaseInfo(payInfo.getBrandId(), payInfo.getStoreId());
-
-        long trscBfBal = infoEntity.getAcctBal();
-        long trscAfBal = infoEntity.getAcctBal() + Long.parseLong(r_amount);
-        // 사용금액합계 감소
-        infoEntity.setUseAmtTotal(infoEntity.getUseAmtTotal() - Long.parseLong(r_amount));
-        unpaidMngMapper.updateLoanMgntBaseInfo4UnpaidPay(userId, infoEntity);
 
         // 3. 여신관리상세이력
         // 3.1 입금 처리
@@ -565,6 +583,7 @@ public class EasypayPaymentService extends CommonService {
         hstEntity1.setTrscAmt(Long.parseLong(r_amount)); // 거래금액
         hstEntity1.setTrscBfBal(trscBfBal);
         hstEntity1.setTrscAfBal(trscAfBal);
+        hstEntity1.setDsptMgntNo(entity.getDsptMgntNo()); // 입금관리번호
         dsptMngMapper.insertLoanMgntDtlHst(userId, hstEntity1);
 
         // 3.2 지급 처리
@@ -580,25 +599,6 @@ public class EasypayPaymentService extends CommonService {
         hstEntity2.setTrscAfBal(trscBfBal);
         dsptMngMapper.insertLoanMgntDtlHst(userId, hstEntity2);
 
-        // 4. 여신관리입금처리
-        LoanMgntDsptProcEntity entity = new LoanMgntDsptProcEntity();
-        entity.setDsptMgntNo(fnGetDealNo(21, "")); // 입금관리번호
-        entity.setReqDt(DateUtil.getCurrentDate());
-        entity.setReqTm(DateUtil.getCurrentTime());
-        entity.setDpstAmt(Long.parseLong(r_amount)); // 입금금액
-        entity.setDpstDt(entity.getReqDt()); // 입금일자
-        // entity.setDpstNm(reqDsptRequest.getDpstNm());
-        // entity.setRcvAcctNo(reqDsptRequest.getRcvAcctNo());
-        // entity.setDpstBnkCd(reqDsptRequest.getDpstBnkCd());
-        entity.setDpstStCd(DpstStCd.DPST_APPROVE.getCd());
-        entity.setDpstReqId(userId);
-        // entity.setDpstReqNm(user.getUserNm());
-        entity.setStoreId(payInfo.getStoreId());
-        entity.setBrandId(payInfo.getBrandId());
-        entity.setPoOrdNo(payInfo.getPoOrdNo());
-        entity.setPgId("KICC");
-        dsptMngMapper.insertLoanMgntDsptProcInfo(userId, entity);
-
         // 5. 정산관리기본정보 업데이트
         // easypayPaymentRequest.setR_amount(Long.parseLong(r_amount));
         List<EasypayPaymentReqData> reqDataList = easypayPaymentRequest.getReqDataList();