미납금관리

src/main/java/com/oqpo/api/entity/loanmng/LoanMgntDsptProcEntity.java

@@ -81,5 +81,7 @@ public class LoanMgntDsptProcEntity implements Serializable {
     @ApiModelProperty(value = "PG사아이디")
     private String pgId;
 
+    @ApiModelProperty(value = "정산관리고유번호(후불/PG사용안함)")
+    private String sttlMgntUnqNo;
 
 }

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

@@ -80,5 +80,9 @@ public class StlMgntBaseInfoEntity implements Serializable {
 
     @ApiModelProperty(value = "PG 몰아이디")
     private String mallId;
+    @ApiModelProperty(value = "입금관리번호")
+    private String dsptMgntNo;
+    @ApiModelProperty(value = "입금상태코드")
+    private String dpstStCd;
 
 }

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

@@ -5,14 +5,17 @@ import com.oqpo.api.entity.loanmng.LoanMgntBaseInfoEntity;
 import com.oqpo.api.entity.loanmng.LoanMgntDsptProcEntity;
 import com.oqpo.api.entity.loanmng.LoanMgntDtlHstEntity;
 import com.oqpo.api.entity.oper.UserMngEntity;
+import com.oqpo.api.entity.settmng.StlMgntBaseInfoEntity;
 import com.oqpo.api.enums.DpstPayDvsn;
 import com.oqpo.api.enums.DpstStCd;
 import com.oqpo.api.enums.MediaDvsn;
 import com.oqpo.api.exception.GlobalException;
 import com.oqpo.api.mapper.loanmng.DsptMngMapper;
 import com.oqpo.api.mapper.oper.UserMngMapper;
+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;
 import com.oqpo.api.web.dto.request.GridRequest;
 import com.oqpo.api.web.dto.request.loanmng.ApproveDsptRequest;
 import com.oqpo.api.web.dto.request.loanmng.RejectDsptRequest;
@@ -26,6 +29,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.Writer;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -39,6 +45,9 @@ public class DsptMngService extends CommonService {
     @Autowired
     private UserMngMapper userMngMapper;
 
+    @Autowired
+    private SttlReqMapper sttlReqMapper;
+
     /*
       입금관리 그리드 리스트 조회
      */
@@ -115,12 +124,17 @@ public class DsptMngService extends CommonService {
             entity.setDpstReqNm(user.getUserNm());
             entity.setStoreId(reqDsptRequest.getStoreId());
             entity.setBrandId(reqDsptRequest.getBrandId());
+            entity.setSttlMgntUnqNo(reqDsptRequest.getSttlMgntUnqNo());     // 정산관리고유번호
             dsptMngMapper.insertLoanMgntDsptProcInfo(userId, entity);
         } catch (GlobalException e) {
             e.getStackTrace();
             throw new GlobalException(e.getSystemMessageCode());
         } catch (Exception e) {
-            e.getStackTrace();
+            // e.getStackTrace();
+            Writer buffer = new StringWriter();
+            PrintWriter pw = new PrintWriter(buffer);
+            e.printStackTrace(pw);
+            log.error(buffer.toString());
             throw new RuntimeException();
         }
     }
@@ -172,6 +186,15 @@ public class DsptMngService extends CommonService {
             entity.setDpstAuthTm(DateUtil.getCurrentTime());
             entity.setDpstAuthYn("Y"); // 입금승인여부
             dsptMngMapper.updateLoanMgntDsptProcInfo4Approve(userId, entity);
+
+            // 정산관리고유번호 처리
+            if (!StringUtil.isEmpty(procEntity.getSttlMgntUnqNo())) {
+                StlMgntBaseInfoEntity stlEntity = new StlMgntBaseInfoEntity();
+                stlEntity.setSttlMgntUnqNo(procEntity.getSttlMgntUnqNo());
+                stlEntity.setRcptYn("Y");
+                stlEntity.setRcptAmt(procEntity.getDpstAmt());
+                sttlReqMapper.updateStlMgntBaseInfo4Rcpt(userId, stlEntity);
+            }
         }
     }
 

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

@@ -23,5 +23,7 @@ public class ReqDsptRequest {
     private String storeId;
     @ApiModelProperty(value = "브랜드아이디")
     private String brandId;
+    @ApiModelProperty(value = "정산관리고유번호")
+    private String sttlMgntUnqNo;
 
 }

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

@@ -71,6 +71,11 @@ public class UnpaidMngInfoResponse {
     @ApiModelProperty(value = "PG 몰아이디")
     private String mallId;
 
+    @ApiModelProperty(value = "입금관리번호")
+    private String dsptMgntNo;
+    @ApiModelProperty(value = "입금상태코드")
+    private String dpstStCd;
+
     public static UnpaidMngInfoResponse toDTO(StlMgntBaseInfoEntity entity) {
         if (entity == null) return null;
         return UnpaidMngInfoResponse.builder()
@@ -99,6 +104,8 @@ public class UnpaidMngInfoResponse {
                 .rcptYn(entity.getRcptYn())
                 .loanDvsn(entity.getLoanDvsn())             /* 여신구분 */
                 .mallId(entity.getMallId())                 /* PG몰ID */
+                .dsptMgntNo(entity.getDsptMgntNo())         /* 입금관리번호 */
+                .dpstStCd(entity.getDpstStCd())             /* 입금상태코드 */
                 .build();
     }
 

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

@@ -92,7 +92,8 @@
         SELECT A.dspt_mgnt_no, A.req_dt, A.req_tm, A.dpst_amt, A.dpst_dt, A.dpst_nm, A.rcv_acct_no, A.dpst_bnk_cd,
             A.dpst_st_cd, A.dpst_req_id, A.dpst_req_nm, A.dpst_auth_id, A.dpst_auth_nm, A.dpst_auth_dt, A.dpst_auth_tm, A.dspt_rjct_dt,
             A.dspt_rjct_tm, A.store_id, A.brand_id, A.dpst_auth_yn, A.dspt_rjct_rsn,
-            A.sys_reg_dttm, A.sys_reg_id, A.sys_chg_dttm, A.sys_chg_id
+            A.sys_reg_dttm, A.sys_reg_id, A.sys_chg_dttm, A.sys_chg_id,
+            A.sttl_mgnt_unq_no      /* 정산관리고유번호 */
         FROM loan_mgnt_dspt_proc A
         WHERE A.dspt_mgnt_no = #{dsptMgntNo}
     </select>
@@ -103,14 +104,14 @@
             (dspt_mgnt_no, req_dt, req_tm, dpst_amt, dpst_dt, dpst_nm, rcv_acct_no, dpst_bnk_cd, dpst_st_cd, dpst_req_id,
              dpst_req_nm, dpst_auth_id, dpst_auth_nm, dpst_auth_dt, dpst_auth_tm, dspt_rjct_dt, dspt_rjct_tm,
              store_id, brand_id, dpst_auth_yn, dspt_rjct_rsn,
-             po_ord_no, pg_id,
+             po_ord_no, pg_id, sttl_mgnt_unq_no,
              sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
         VALUES
             (#{entity.dsptMgntNo}, #{entity.reqDt}, #{entity.reqTm}, #{entity.dpstAmt}, #{entity.dpstDt}, #{entity.dpstNm},
              #{entity.rcvAcctNo}, #{entity.dpstBnkCd}, #{entity.dpstStCd}, #{entity.dpstReqId}, #{entity.dpstReqNm},
              #{entity.dpstAuthId}, #{entity.dpstAuthNm}, #{entity.dpstAuthDt}, #{entity.dpstAuthTm}, #{entity.dsptRjctDt},
              #{entity.dsptRjctTm}, #{entity.storeId}, #{entity.brandId}, #{entity.dpstAuthYn}, #{entity.dsptRjctRsn},
-             #{entity.poOrdNo}, #{entity.pgId},
+             #{entity.poOrdNo}, #{entity.pgId}, #{entity.sttlMgntUnqNo},
              NOW(), #{userId}, NOW(), #{userId})
     </insert>
 

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

@@ -133,20 +133,17 @@
                 END
                 END
                 ELSE '정산대기'
-            END AS sttl_add_st_nm,         /* 상태 */
+            END AS sttl_add_st_nm,      /* 상태 */
             ]]>
-            stl.sttl_mgnt_unq_no,      /* 정산관리고유번호 */
-            stl.rcpt_yn,               /* 수납여부(후불사용) */
+            stl.sttl_mgnt_unq_no,       /* 정산관리고유번호 */
+            stl.rcpt_yn,                /* 수납여부(후불사용) */
             DATE_FORMAT(stl.sys_reg_dttm,'%Y.%m.%d %H:%i:%s') AS sys_reg_dttm,
-            FN_USER_NM(stl.sys_reg_id) AS sys_reg_nm
+            FN_USER_NM(stl.sys_reg_id) AS sys_reg_nm,
+            dspt.dspt_mgnt_no, dspt.dpst_st_cd           /* 여신관리번호 */
         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
-        INNER JOIN stl_mgnt_base_info stl
-        ON store.store_id = stl.store_id
-        AND store.brand_id = stl.brand_id
+        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
+        INNER JOIN stl_mgnt_base_info stl ON store.store_id = stl.store_id AND store.brand_id = stl.brand_id
+        LEFT JOIN loan_mgnt_dspt_proc dspt ON stl.sttl_mgnt_unq_no = dspt.sttl_mgnt_unq_no
         WHERE stl.sttl_mgnt_unq_no = #{sttlMgntUnqNo}
     </select>