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

src/main/java/com/oqpo/api/entity/settmng/StlMgntBaseInfoEntity.java

@@ -32,6 +32,8 @@ public class StlMgntBaseInfoEntity implements Serializable {
     private String sttlStCd;
     @ApiModelProperty(value = "정산상태명")
     private String sttlStNm;
+    @ApiModelProperty(value = "정산부가상태명")
+    private String sttlAddStNm;
     @ApiModelProperty(value = "정산요청금액")
     private Long sttlReqAmt;
     @ApiModelProperty(value = "정산일자")

src/main/java/com/oqpo/api/mapper/sttlmng/SttlReqMapper.java

@@ -57,6 +57,8 @@ public interface SttlReqMapper {
 
     int updateStlMgntBaseInfo4SttlConfirm(@Param("userId") String userId, StlMgntBaseInfoEntity entity) throws Exception;
 
+    int updateStlMgntBaseInfo4Rcpt(@Param("userId") String userId, StlMgntBaseInfoEntity entity) throws Exception;
+
     int updateStlMgntBaseInfo4SttlReject(@Param("userId") String userId, StlMgntBaseInfoEntity entity) throws Exception;
 
 }

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

@@ -534,6 +534,7 @@ public class EasypayPaymentService extends CommonService {
         dsptMngMapper.insertLoanMgntDsptProcInfo(userId, entity);
 
         // 5. 정산관리기본정보 업데이트
+        easypayPaymentRequest.setR_amount(Long.parseLong(r_amount));
         unpaidMngMapper.updateStlMgntBaseInfo4Rcpt(userId, easypayPaymentRequest);
     }
 

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

@@ -48,6 +48,7 @@ public class UnpaidMngService extends CommonService {
                         .storeNm(m.getStoreNm())
                         .sttlStCd(m.getSttlStCd())
                         .sttlStNm(m.getSttlStNm())
+                        .sttlAddStNm(m.getSttlAddStNm())
                         .sttlReqAmt(m.getSttlReqAmt())      /* 정산요청금액 */
                         .sttlDt(m.getSttlDt())              /* 정산확정일자 */
                         .sttlAmt(m.getSttlAmt())            /* 정산확정금액 */

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

@@ -1,8 +1,15 @@
 package com.oqpo.api.service.sttlmng;
 
 
+import com.oqpo.api.entity.loanmng.LoanMgntBaseInfoEntity;
+import com.oqpo.api.entity.loanmng.LoanMgntDtlHstEntity;
 import com.oqpo.api.entity.settmng.StlMgntBaseInfoEntity;
+import com.oqpo.api.enums.DpstPayDvsn;
+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;
@@ -29,6 +36,12 @@ public class SttlStateService extends CommonService {
     @Autowired
     private SttlReqMapper sttlReqMapper;
 
+    @Autowired
+    private DsptMngMapper dsptMngMapper;
+
+    @Autowired
+    private UnpaidMngMapper unpaidMngMapper;
+
     /*
       정산요청 그리드 리스트 조회
      */
@@ -76,12 +89,54 @@ public class SttlStateService extends CommonService {
         StlMgntBaseInfoEntity entity = sttlReqMapper.selectStlMgntBaseInfo(sttlConfirmRequest.getSttlMgntUnqNo());
 
         // 정산관리기본정보 - 정산상태코드 변경
-        StlMgntBaseInfoEntity infoEntity = new StlMgntBaseInfoEntity();
-        infoEntity.setSttlMgntUnqNo(sttlConfirmRequest.getSttlMgntUnqNo());
-        infoEntity.setSttlStCd(SttlStCd.STTL_CONFIRM.getCd());
-        infoEntity.setSttlDt(DateUtil.getCurrentDate());
-        infoEntity.setSttlAmt(entity.getSttlReqAmt()); // 정산요청금액을 정산금액으로 지정한다.
-        sttlReqMapper.updateStlMgntBaseInfo4SttlConfirm(userId, infoEntity);
+        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);
+
+        // 매장의 계좌잔액이 있은 경우 정산지급 처리를 한다.
+        // 매장 계좌잔액 조회
+        LoanMgntBaseInfoEntity loanEntity = dsptMngMapper.selectLoanMgntBaseInfo(entity.getBrandId(), entity.getStoreId());
+        if (loanEntity.getAcctBal() > 0) {
+            // 계좌잔액이 정산요청금액 이상인 경우 정산요청금액을 지급처리하고 정산 데이터는 수납처리한다.
+            // 계좌잔액이 정산요청금액 미만인 경우 계좌잔액을 지급처리하고 정산 데이터는 일부 수납처리한다. (미납금 발생)
+            String rcptYn; // 수납완료여부
+            long rcptAmt = 0; // 수납금액
+            if (loanEntity.getAcctBal() >= entity.getSttlReqAmt()) {
+                rcptAmt = entity.getSttlReqAmt();
+                rcptYn = "Y";
+            } else {
+                rcptAmt = loanEntity.getAcctBal();
+                rcptYn = "N";
+            }
+
+            // 1. 여신관리기본정보 처리
+            long trscBfBal = loanEntity.getAcctBal();
+            long trscAfBal = loanEntity.getAcctBal() - rcptAmt;
+            loanEntity.setAcctBal(trscAfBal); // 계좌잔액
+            loanEntity.setUseAmtTotal(loanEntity.getUseAmtTotal() - rcptAmt); // 사용금액합계 감소
+            sttlReqMapper.updateLoanMgntBaseInfo4SttlReqProc(userId, loanEntity);
+
+            // 2. 여신관리상세이력
+            LoanMgntDtlHstEntity hstEntity = new LoanMgntDtlHstEntity();
+            hstEntity.setLoanMgntUnqNo(loanEntity.getLoanMgntUnqNo());
+            hstEntity.setLoanRegDt(DateUtil.getCurrentDate());
+            hstEntity.setLoanRegTm(DateUtil.getCurrentTime());
+            hstEntity.setDpstPayDvsn(DpstPayDvsn.PAYMENT.getCd());
+            hstEntity.setMediaDvsn(MediaDvsn.SETTLMENT.getCd());
+            hstEntity.setPayType(PayType.STTL_PAY.getCd());
+            hstEntity.setTrscAmt(rcptAmt); // 거래금액
+            hstEntity.setTrscBfBal(trscAfBal);
+            hstEntity.setTrscAfBal(trscBfBal);
+            dsptMngMapper.insertLoanMgntDtlHst(userId, hstEntity);
+
+            // 3. 정산관리기본정보 수납처리
+            stlEntity.setRcptYn(rcptYn); // 수납여부
+            stlEntity.setRcptAmt(rcptAmt); // 수납금액
+            sttlReqMapper.updateStlMgntBaseInfo4Rcpt(userId, stlEntity);
+        }
     }
 
 }

src/main/java/com/oqpo/api/web/controller/sttlmng/SttlReqController.java

@@ -97,7 +97,7 @@ public class SttlReqController {
     })
     @ApiOperation(value = "정산 상세정보")
     @GetMapping("/info-sttl")
-    public ResponseEntity<SttlMngInfoResponse> infoUnpaid(@RequestParam(value = "sttlMgntUnqNo") String sttlMgntUnqNo) throws Exception {
+    public ResponseEntity<SttlMngInfoResponse> infoSttl(@RequestParam(value = "sttlMgntUnqNo") String sttlMgntUnqNo) throws Exception {
         return ResponseEntity.ok(sttlReqService.selectSttlReqInfo(sttlMgntUnqNo));
     }
 

src/main/java/com/oqpo/api/web/dto/request/loanmng/EasypayPaymentRequest.java

@@ -1,5 +1,6 @@
 package com.oqpo.api.web.dto.request.loanmng;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -87,4 +88,8 @@ public class EasypayPaymentRequest {
     @JsonProperty("sp_sessionkey")
     private String sp_sessionkey;
 
+    @ApiModelProperty(value = "결제금액", required = false)
+    @JsonIgnore
+    private Long r_amount;
+
 }

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

@@ -33,6 +33,8 @@ public class UnpaidMngInfoResponse {
     private String sttlStCd;
     @ApiModelProperty(value = "정산상태명")
     private String sttlStNm;
+    @ApiModelProperty(value = "정산부가상태명")
+    private String sttlAddStNm;
     @ApiModelProperty(value = "정산요청금액")
     private Long sttlReqAmt;
     @ApiModelProperty(value = "정산일자")
@@ -76,6 +78,7 @@ public class UnpaidMngInfoResponse {
                 .storeNm(entity.getStoreNm())
                 .sttlStCd(entity.getSttlStCd())
                 .sttlStNm(entity.getSttlStNm())
+                .sttlAddStNm(entity.getSttlAddStNm())       /* 정산부가상태명 */
                 .sttlReqAmt(entity.getSttlReqAmt())         /* 정산요청금액 */
                 .sttlAmt(entity.getSttlAmt())               /* 정산확정금액 */
                 .unpaidAmt(entity.getUnpaidAmt())           /* 미납금액 */

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

@@ -26,6 +26,8 @@ public class UnpaidMngListResponse {
     private String storeNm;
     @ApiModelProperty(value = "정산상태코드")
     private String sttlStCd;
+    @ApiModelProperty(value = "정산부가상태명")
+    private String sttlAddStNm;
     @ApiModelProperty(value = "정산상태명")
     private String sttlStNm;
     @ApiModelProperty(value = "정산요청일자")

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

@@ -20,6 +20,7 @@
             stl.sttl_amt,               /* 정산확정금액 */
             stl.rcpt_amt,               /* 수납금액 */
             (IFNULL(stl.sttl_amt, stl.sttl_req_amt) - IFNULL(stl.rcpt_amt, 0)) AS unpaid_amt,       /* 미납금액 */
+            stl.sttl_st_cd, FN_CODE_NM('STTL_ST_CD', stl.sttl_st_cd) AS sttl_st_nm,                 /* 정산상태코드 */
             <![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 '정산요청전'
@@ -35,9 +36,9 @@
                 END
                 END
                 ELSE '정산대기'
-            END AS sttl_st_nm,         /* 상태 */
+            END AS sttl_add_st_nm,          /* 정산부가상태명 */
             ]]>
-            stl.sttl_mgnt_unq_no      /* 정산관리고유번호 */
+            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
@@ -116,6 +117,7 @@
             stl.sttl_amt,               /* 정산확정금액 */
             stl.rcpt_amt,               /* 수납금액 */
             (IFNULL(stl.sttl_amt, stl.sttl_req_amt) - IFNULL(stl.rcpt_amt, 0)) AS unpaid_amt,       /* 미납금액 */
+            stl.sttl_st_cd, FN_CODE_NM('STTL_ST_CD', stl.sttl_st_cd) AS sttl_st_nm,                 /* 정산상태코드 */
             <![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 '정산요청전'
@@ -131,7 +133,7 @@
                 END
                 END
                 ELSE '정산대기'
-            END AS sttl_st_nm,         /* 상태 */
+            END AS sttl_add_st_nm,         /* 상태 */
             ]]>
             stl.sttl_mgnt_unq_no,      /* 정산관리고유번호 */
             stl.rcpt_yn,               /* 수납여부(후불사용) */
@@ -197,8 +199,9 @@
     <update id="updateStlMgntBaseInfo4Rcpt" >
         /* UnpaidMngMapper.updateStlMgntBaseInfo4Rcpt */
         UPDATE stl_mgnt_base_info SET
-            rcpt_yn = 'Y',
-            rcpt_dt = DATE_FORMAT(NOW(),'%Y%m%d'),
+            rcpt_yn = 'Y',                                                          /* 수납여부 */
+            rcpt_dt = DATE_FORMAT(NOW(),'%Y%m%d'),                                  /* 수납일자 */
+            rcpt_amt = IFNULL(rcpt_amt, 0) + #{easypayPaymentRequest.r_amount},     /* 수납금액 : 결제금액을 더한다. */
             sys_chg_dttm = NOW(),
             sys_chg_id = #{userId}
         WHERE sttl_mgnt_unq_no = #{easypayPaymentRequest.sttlMgntUnqNo}

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

@@ -162,7 +162,7 @@
             DATE_FORMAT(A.sys_reg_dttm,'%Y.%m.%d %H:%i:%s') AS sys_reg_dttm, A.sys_reg_id, FN_USER_NM(A.sys_reg_id) AS sys_reg_nm,
             DATE_FORMAT(A.sys_chg_dttm,'%Y.%m.%d %H:%i:%s') AS sys_chg_dttm, A.sys_chg_id,
             B.loan_dvsn, FN_CODE_NM('LOAN_DVSN', B.loan_dvsn) AS loan_dvsn_nm,      /* 매장 정상구분 */
-            C.acct_bal                                                              /* 매장 계좌잔액 */
+            IFNULL(C.acct_bal, 0) AS acct_bal                                       /* 매장 계좌잔액 */
         FROM stl_mgnt_base_info A
         INNER JOIN store_base_info B ON A.brand_id = B.brand_id AND A.store_id = B.store_id
         LEFT JOIN loan_mgnt_base_info C ON B.loan_mgnt_unq_no = C.loan_mgnt_unq_no
@@ -417,4 +417,17 @@
         WHERE sttl_mgnt_unq_no = #{entity.sttlMgntUnqNo}
     </update>
 
+    <update id="updateStlMgntBaseInfo4Rcpt" >
+        /* SttlReqMapper.updateStlMgntBaseInfo4Rcpt */
+        UPDATE stl_mgnt_base_info SET
+            rcpt_yn = #{entity.rcptYn},
+            <if test='"Y".equals(entity.rcptYn)'>
+            rcpt_dt = DATE_FORMAT(NOW(),'%Y%m%d'),
+            </if>
+            rcpt_amt = #{entity.rcptAmt},
+            sys_chg_dttm = NOW(),
+            sys_chg_id = #{userId}
+        WHERE sttl_mgnt_unq_no = #{entity.sttlMgntUnqNo}
+    </update>
+
 </mapper>