정산 확정

src/main/java/com/oqpo/api/mapper/loanmng/UnpaidMngMapper.java

@@ -7,7 +7,6 @@ import com.oqpo.api.entity.settmng.PgKiccPayPtclEntity;
 import com.oqpo.api.entity.settmng.StlMgntBaseInfoEntity;
 import com.oqpo.api.entity.settmng.StlMgntDtlPtclEntity;
 import com.oqpo.api.web.dto.request.GridRequest;
-import com.oqpo.api.web.dto.request.loanmng.EasypayPaymentRequest;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -30,10 +29,6 @@ public interface UnpaidMngMapper {
 
     int insertPgKiccPayPtcl(@Param("userId") String userId, PgKiccPayPtclEntity entity) throws Exception;
 
-    int updateStlMgntBaseInfo4Rcpt(@Param("userId") String userId, StlMgntBaseInfoEntity entity) throws Exception;
-
     int updateLoanMgntBaseInfo4UnpaidPay(@Param("userId") String userId, LoanMgntBaseInfoEntity entity) throws Exception;
 
-    int selectTotalUnpaidAmt(EasypayPaymentRequest easypayPaymentRequest) throws Exception;
-
 }

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

@@ -9,13 +9,12 @@ import com.oqpo.api.entity.oper.UserMngEntity;
 import com.oqpo.api.entity.settmng.PgKiccBaseInfoEntity;
 import com.oqpo.api.entity.settmng.PgKiccPayPtclEntity;
 import com.oqpo.api.entity.settmng.StlMgntBaseInfoEntity;
-import com.oqpo.api.entity.stinfo.BrandEntity;
 import com.oqpo.api.enums.*;
 import com.oqpo.api.exception.GlobalException;
 import com.oqpo.api.mapper.loanmng.DsptMngMapper;
 import com.oqpo.api.mapper.loanmng.UnpaidMngMapper;
 import com.oqpo.api.mapper.oper.UserMngMapper;
-import com.oqpo.api.mapper.stinfo.BrandMapper;
+import com.oqpo.api.mapper.sttlmng.SttlReqMapper;
 import com.oqpo.api.service.CommonService;
 import com.oqpo.api.util.DateUtil;
 import com.oqpo.api.util.StringUtil;
@@ -44,10 +43,10 @@ public class EasypayPaymentService extends CommonService {
     private UserMngMapper userMngMapper;
 
     @Autowired
-    private BrandMapper brandMapper;
+    private DsptMngMapper dsptMngMapper;
 
     @Autowired
-    private DsptMngMapper dsptMngMapper;
+    private SttlReqMapper sttlReqMapper;
 
     @Value("${kicc.gateway}")
     private String kiccGatewayUrl;
@@ -611,9 +610,11 @@ public class EasypayPaymentService extends CommonService {
         // easypayPaymentRequest.setR_amount(Long.parseLong(r_amount));
         List<EasypayPaymentReqData> reqDataList = easypayPaymentRequest.getReqDataList();
         for (EasypayPaymentReqData reqData : reqDataList) {
-            StlMgntBaseInfoEntity stlEntity = new StlMgntBaseInfoEntity();
-            stlEntity.setSttlMgntUnqNo(reqData.getSttlMgntUnqNo()); // 정산관리고유번호
-            unpaidMngMapper.updateStlMgntBaseInfo4Rcpt(userId, stlEntity);
+            StlMgntBaseInfoEntity stlEntity = sttlReqMapper.selectStlMgntBaseInfo(reqData.getSttlMgntUnqNo());
+            long rcptAmt = stlEntity.getRcptAmt() + Long.parseLong(r_amount); // 수납금액
+            stlEntity.setRcptYn(rcptAmt >= stlEntity.getSttlReqAmt() ? "Y" : "N");
+            stlEntity.setRcptAmt(rcptAmt);
+            sttlReqMapper.updateStlMgntBaseInfo4Rcpt(userId, stlEntity);
         }
     }
 

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

@@ -82,36 +82,33 @@ public class SttlStateService extends CommonService {
     @Transactional
     public void endSttl(String userId, SttlConfirmRequest sttlConfirmRequest) throws Exception {
         // 정산기본정보 조회
-        StlMgntBaseInfoEntity entity = sttlReqMapper.selectStlMgntBaseInfo(sttlConfirmRequest.getSttlMgntUnqNo());
+        StlMgntBaseInfoEntity stlEntity = sttlReqMapper.selectStlMgntBaseInfo(sttlConfirmRequest.getSttlMgntUnqNo());
 
         // 정산관리기본정보 - 정산상태코드 변경
-        entity.setSttlStCd(SttlStCd.STTL_CONFIRM.getCd());
-        entity.setSttlDt(DateUtil.getCurrentDate());
-        entity.setSttlAmt(entity.getSttlReqAmt()); // 정산요청금액을 정산금액으로 지정한다.
-        sttlReqMapper.updateStlMgntBaseInfo4SttlConfirm(userId, entity);
+        stlEntity.setSttlStCd(SttlStCd.STTL_CONFIRM.getCd());
+        stlEntity.setSttlDt(DateUtil.getCurrentDate());
+        stlEntity.setSttlAmt(stlEntity.getSttlReqAmt()); // 정산요청금액을 정산금액으로 지정한다.
+        sttlReqMapper.updateStlMgntBaseInfo4SttlConfirm(userId, stlEntity);
 
-        if ("N".equals(entity.getRcptYn())) { // 수납여부가 N인 경우
+        if ("N".equals(stlEntity.getRcptYn())) { // 수납여부가 N인 경우
             // 매장의 계좌잔액이 있은 경우 정산지급 처리를 한다.
             // 매장 계좌잔액 조회
-            LoanMgntBaseInfoEntity loanEntity = dsptMngMapper.selectLoanMgntBaseInfo(entity.getBrandId(), entity.getStoreId());
+            LoanMgntBaseInfoEntity loanEntity = dsptMngMapper.selectLoanMgntBaseInfo(stlEntity.getBrandId(), stlEntity.getStoreId());
             if (loanEntity.getAcctBal() > 0) {
-                // 계좌잔액이 정산요청금액 이상인 경우 정산요청금액을 지급처리하고 정산 데이터는 수납처리한다.
-                // 계좌잔액이 정산요청금액 미만인 경우 계좌잔액을 지급처리하고 정산 데이터는 일부 수납처리한다. (미납금 발생)
-                String rcptYn; // 수납완료여부
-                long rcptAmt = 0; // 수납금액
-                if (loanEntity.getAcctBal() >= entity.getSttlReqAmt()) {
-                    rcptAmt = entity.getSttlReqAmt();
-                    rcptYn = "Y";
+                // 계좌잔액이 미납금액 이상인 경우 미납금액을 지급처리하고 정산 데이터는 수납처리한다.
+                // 계좌잔액이 미납금액 미만인 경우 계좌잔액을 지급처리하고 정산 데이터는 일부 수납처리한다. (미납금 발생)
+                long trscAmt = 0; // 수납금액
+                if (loanEntity.getAcctBal() >= stlEntity.getUnpaidAmt()) {
+                    trscAmt = stlEntity.getUnpaidAmt();
                 } else {
-                    rcptAmt = loanEntity.getAcctBal();
-                    rcptYn = "N";
+                    trscAmt = loanEntity.getAcctBal();
                 }
 
                 // 1. 여신관리기본정보 처리
                 long trscBfBal = loanEntity.getAcctBal();
-                long trscAfBal = loanEntity.getAcctBal() - rcptAmt;
+                long trscAfBal = loanEntity.getAcctBal() - trscAmt;
                 loanEntity.setAcctBal(trscAfBal); // 계좌잔액
-                loanEntity.setUseAmtTotal(loanEntity.getUseAmtTotal() - rcptAmt); // 사용금액합계 감소
+                loanEntity.setUseAmtTotal(loanEntity.getUseAmtTotal() - trscAmt); // 사용금액합계 감소
                 sttlReqMapper.updateLoanMgntBaseInfo4SttlReqProc(userId, loanEntity);
 
                 // 2. 여신관리상세이력
@@ -122,15 +119,16 @@ public class SttlStateService extends CommonService {
                 hstEntity.setDpstPayDvsn(DpstPayDvsn.PAYMENT.getCd());
                 hstEntity.setMediaDvsn(MediaDvsn.SETTLMENT.getCd());
                 hstEntity.setPayType(PayType.STTL_PAY.getCd());
-                hstEntity.setTrscAmt(rcptAmt); // 거래금액
+                hstEntity.setTrscAmt(trscAmt); // 거래금액
                 hstEntity.setTrscBfBal(trscBfBal); // 거래전잔액
                 hstEntity.setTrscAfBal(trscAfBal); // 거래후잔액
                 dsptMngMapper.insertLoanMgntDtlHst(userId, hstEntity);
 
                 // 3. 정산관리기본정보 수납처리
-                entity.setRcptYn(rcptYn); // 수납여부
-                entity.setRcptAmt(entity.getRcptAmt() + rcptAmt); // 수납금액
-                sttlReqMapper.updateStlMgntBaseInfo4Rcpt(userId, entity);
+                long rcptAmt = stlEntity.getRcptAmt() + trscAmt; // 수납금액
+                stlEntity.setRcptYn(rcptAmt >= stlEntity.getSttlReqAmt() ? "Y" : "N");
+                stlEntity.setRcptAmt(rcptAmt);
+                sttlReqMapper.updateStlMgntBaseInfo4Rcpt(userId, stlEntity);
             }
         }
     }

src/main/java/com/oqpo/api/util/DateUtil.java

@@ -763,6 +763,13 @@ public class DateUtil {
         return format.format(cal.getTime());
     }
 
+    public static Date addSeconds(Date date, Integer seconds) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.add(Calendar.SECOND, seconds);
+        return cal.getTime();
+    }
+
     public static void main(String args[]) {
         System.out.println(Integer.parseInt(DateUtil.getCurrentMinTime().substring(0, 2)));
         System.out.println(Integer.parseInt("0420"));

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

@@ -197,17 +197,6 @@
              NOW(), #{userId}, NOW(), #{userId})
     </insert>
 
-    <update id="updateStlMgntBaseInfo4Rcpt" >
-        /* UnpaidMngMapper.updateStlMgntBaseInfo4Rcpt */
-        UPDATE stl_mgnt_base_info SET
-            rcpt_yn = 'Y',                                                          /* 수납여부 */
-            rcpt_dt = DATE_FORMAT(NOW(),'%Y%m%d'),                                  /* 수납일자 */
-            rcpt_amt = sttl_req_amt,                                                /* 수납금액 : 정산요청금액을 지정한다. */
-            sys_chg_dttm = NOW(),
-            sys_chg_id = #{userId}
-        WHERE sttl_mgnt_unq_no = #{entity.sttlMgntUnqNo}
-    </update>
-
     <update id="updateLoanMgntBaseInfo4UnpaidPay" >
         /* UnpaidMngMapper.updateLoanMgntBaseInfo4UnpaidPay */
         UPDATE loan_mgnt_base_info SET

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

@@ -175,7 +175,7 @@
             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, /* 미납금액 */ 
+            CASE WHEN B.LOAN_DVSN = 'LD02' THEN IFNULL(A.sttl_amt, A.sttl_req_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,
             A.rcpt_yn, DATE_FORMAT(A.rcpt_dt, '%Y.%m.%d') AS rcpt_dt,   /* 수납여부/수납일자 */

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

@@ -15,7 +15,7 @@
             A.sttl_req_amt,         /* 정산요청금액 */
             A.sttl_amt,             /* 정산확정금액 */
             A.rcpt_amt,             /* 수납금액 */
-            case when B.LOAN_DVSN = 'LD02' then A.sttl_amt - IFNULL(A.rcpt_amt, 0) ELSE 0 END AS unpaid_amt, /* 미납금액 */ 
+            CASE WHEN B.LOAN_DVSN = 'LD02' THEN IFNULL(A.sttl_amt, A.sttl_req_amt) - IFNULL(A.rcpt_amt, 0) ELSE 0 END AS unpaid_amt, /* 미납금액 */
             A.sttl_reg_mgr_nm, A.sttl_reg_mgr_id,
             B.loan_dvsn, FN_CODE_NM('LOAN_DVSN', B.loan_dvsn) AS loan_dvsn_nm
         FROM stl_mgnt_base_info A