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

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

@@ -27,21 +27,21 @@ public class LoanMgntBaseInfoEntity implements Serializable {
     @ApiModelProperty(value = "계좌번호")
     private String acctNo;
     @ApiModelProperty(value = "계좌잔액")
-    private long acctBal;
+    private Long acctBal;
     @ApiModelProperty(value = "여신구분")
     private String loanDvsn;
     @ApiModelProperty(value = "여신구분명")
     private String loanDvsnNm;
     @ApiModelProperty(value = "신용한도금액")
-    private long credtLimitAmt;
+    private Long credtLimitAmt;
     @ApiModelProperty(value = "충전한도금액")
-    private long chrgeLimitAmt;
+    private Long chrgeLimitAmt;
     @ApiModelProperty(value = "신용한도사용여부")
     private String credtLimitUseYn;
     @ApiModelProperty(value = "사용금액합계")
-    private long useAmtTotal;
+    private Long useAmtTotal;
     @ApiModelProperty(value = "가수금액합계")
-    private long tmpRcvAcctTotal;
+    private Long tmpRcvAcctTotal;
     @ApiModelProperty(value = "사용여부")
     private String useYn;
     @ApiModelProperty(value = "사용여부명")
@@ -61,11 +61,11 @@ public class LoanMgntBaseInfoEntity implements Serializable {
     @ApiModelProperty(value = "시스템변경자")
     private String sysChgNm;
     @ApiModelProperty(value = "주문사용가능금액")
-    private long ordUseAmt;
+    private Long ordUseAmt;
 
     @ApiModelProperty(value = "한도금액")
-    private long limitAmt;
+    private Long limitAmt;
     @ApiModelProperty(value = "가용한도금액")
-    private long posbLimitAmt;
+    private Long posbLimitAmt;
 
 }

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

@@ -19,7 +19,7 @@ public class LoanMgntDsptProcEntity implements Serializable {
     @ApiModelProperty(value = "요청시각")
     private String reqTm;
     @ApiModelProperty(value = "입금금액")
-    private long dpstAmt;
+    private Long dpstAmt;
     @ApiModelProperty(value = "입금일자")
     private String dpstDt;
     @ApiModelProperty(value = "입금자명")

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

@@ -23,15 +23,15 @@ public class LoanMgntDtlHstEntity implements Serializable {
     @ApiModelProperty(value = "입금지급구분명")
     private String dpstPayDvsnNm;
     @ApiModelProperty(value = "거래금액")
-    private long trscAmt;
+    private Long trscAmt;
     @ApiModelProperty(value = "입금금액")
-    private long dpstAmt;
+    private Long dpstAmt;
     @ApiModelProperty(value = "지급금액")
-    private long paymAmt;
+    private Long paymAmt;
     @ApiModelProperty(value = "거래전잔액")
-    private long trscBfBal;
+    private Long trscBfBal;
     @ApiModelProperty(value = "거래후잔액")
-    private long trscAfBal;
+    private Long trscAfBal;
     @ApiModelProperty(value = "매체구분")
     private String mediaDvsn;
     @ApiModelProperty(value = "매체구분명")

src/main/java/com/oqpo/api/enums/LoanDvsn.java

@@ -0,0 +1,36 @@
+package com.oqpo.api.enums;
+
+import lombok.Getter;
+import lombok.Setter;
+
+public enum LoanDvsn {
+
+    PRE_PAYMENT("LD01", "선불(충전)"), //
+    POST_PAYMENT("LD02", "후불(신용)"), //
+    NO_STTL("LD03", "무정산"), //
+    ;
+
+    LoanDvsn(String cd, String nm) {
+        this.cd = cd;
+        this.name = nm;
+    }
+
+    @Getter
+    @Setter
+    private String cd;
+
+    @Getter
+    @Setter
+    private String name;
+
+    public static String getName(String ccd) {
+        LoanDvsn[] values = LoanDvsn.values();
+        for (LoanDvsn icd : values) {
+            if (icd.cd.equals(ccd)) {
+                return icd.name;
+            }
+        }
+        return ccd;
+    }
+
+}

src/main/java/com/oqpo/api/enums/PayType.java

@@ -0,0 +1,37 @@
+package com.oqpo.api.enums;
+
+import lombok.Getter;
+import lombok.Setter;
+
+public enum PayType {
+
+    STTL_PAY("PT00", "정산지급"), //
+    CHARGE_PAYMENT("PT01", "충전결제"), //
+	STTL_PAYMENT("PT02", "정산결제"), //
+	PRE_PAYMENT("PT03", "선결제"), //
+    ;
+
+    PayType(String cd, String nm) {
+        this.cd = cd;
+        this.name = nm;
+    }
+
+    @Getter
+    @Setter
+    private String cd;
+
+    @Getter
+    @Setter
+    private String name;
+
+    public static String getName(String ccd) {
+        PayType[] values = PayType.values();
+        for (PayType icd : values) {
+            if (icd.cd.equals(ccd)) {
+                return icd.name;
+            }
+        }
+        return ccd;
+    }
+
+}

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

@@ -1,6 +1,7 @@
 package com.oqpo.api.mapper.sttlmng;
 
 
+import com.oqpo.api.entity.loanmng.LoanMgntBaseInfoEntity;
 import com.oqpo.api.entity.rtnmng.RtnProcInfoPtclEntity;
 import com.oqpo.api.entity.settmng.StlMgntBaseInfoEntity;
 import com.oqpo.api.entity.settmng.StlMgntDtlPtclEntity;
@@ -46,4 +47,12 @@ public interface SttlReqMapper {
 
     int updateRtnProcInfoPtcl4SttlReq(@Param("userId") String userId, RtnProcInfoPtclEntity entity) throws Exception;
 
+    int updateLoanMgntBaseInfo4SttlReqProc(@Param("userId") String userId, LoanMgntBaseInfoEntity entity) throws Exception;
+
+    int updateWhsProcInfoPtcl4SttlReqProc(@Param("userId") String userId, StlMgntDtlPtclEntity entity) throws Exception;
+
+    int updateRtnProcInfoPtcl4SttlReqProc(@Param("userId") String userId, StlMgntDtlPtclEntity entity) throws Exception;
+
+    int updateStlMgntBaseInfo4SttlReqProc(@Param("userId") String userId, StlMgntBaseInfoEntity entity) throws Exception;
+
 }

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

@@ -1,20 +1,26 @@
 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.oper.UserMngEntity;
 import com.oqpo.api.entity.rtnmng.RtnProcInfoPtclEntity;
 import com.oqpo.api.entity.settmng.StlMgntBaseInfoEntity;
 import com.oqpo.api.entity.settmng.StlMgntDtlPtclEntity;
+import com.oqpo.api.entity.stinfo.StoreBaseInfoEntity;
 import com.oqpo.api.entity.stockmng.WhsProcInfoPtclEntity;
-import com.oqpo.api.enums.SttlDvsn;
-import com.oqpo.api.enums.SttlStCd;
+import com.oqpo.api.enums.*;
+import com.oqpo.api.mapper.loanmng.DsptMngMapper;
 import com.oqpo.api.mapper.oper.UserMngMapper;
+import com.oqpo.api.mapper.stinfo.StoreBaseInfoMapper;
 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.sttlmng.SttlReqData;
+import com.oqpo.api.web.dto.request.sttlmng.SttlReqProcData;
 import com.oqpo.api.web.dto.request.sttlmng.SttlReqProcRequest;
 import com.oqpo.api.web.dto.request.sttlmng.SttlReqRequest;
 import com.oqpo.api.web.dto.response.GridResponse;
@@ -39,6 +45,12 @@ public class SttlReqService extends CommonService {
     @Autowired
     private UserMngMapper userMngMapper;
 
+    @Autowired
+    private StoreBaseInfoMapper storeBaseInfoMapper;
+
+    @Autowired
+    private DsptMngMapper dsptMngMapper;
+
     /*
       정산요청 그리드 리스트 조회
      */
@@ -189,13 +201,77 @@ public class SttlReqService extends CommonService {
     /* 정산요청  처리 */
     @Transactional
     public void procSttlRequest(String userId, SttlReqProcRequest sttlReqProcRequest) throws Exception {
+        // 매장 정산타입 조회
+        StoreBaseInfoEntity storeInfo = storeBaseInfoMapper.selectStoreInfo(sttlReqProcRequest.getBrandId(), sttlReqProcRequest.getStoreId());
 
         // 정산관리상세내역 처리
-        // 정산타입에 따라
+        long sttlAmt = 0; // 정산금액
+        List<SttlReqProcData> list = sttlReqProcRequest.getSttlReqDataList();
+        for (SttlReqProcData item : list) {
+            // 정산관리상세내역 조회
+            StlMgntDtlPtclEntity dtlPtcl = sttlReqMapper.selectStlMgntDtlPtcl(sttlReqProcRequest.getSttlMgntUnqNo(), item.getSttlMgntDtlNo());
+            // 정산타입에 따라
+            if (LoanDvsn.PRE_PAYMENT.getCd().equals(storeInfo.getLoanDvsn())) {
+                // 정산금액
+                sttlAmt += dtlPtcl.getWhsColAmt();
+
+                // 1. 선불
+                // 1.1 여신관리기본정보(매장) 차감 : loan_mgnt_base_info
+                // 매장의 여신관리기본정보 조회 - 없으면 에러 처리
+                LoanMgntBaseInfoEntity loanBase = dsptMngMapper.selectLoanMgntBaseInfo(sttlReqProcRequest.getBrandId(), sttlReqProcRequest.getStoreId());
+                long trscBfBal = loanBase.getAcctBal();
+                long trscAfBal = loanBase.getAcctBal() - dtlPtcl.getWhsColAmt(); // 잔액에서 입고/수거금액 차감
+                long useAmtTotal = loanBase.getUseAmtTotal() - dtlPtcl.getWhsColAmt(); // 사용금액합계에서 입고/수거금액 차감
 
-        // 정산구분에 따라 처리
+                loanBase.setAcctBal(trscBfBal);
+                loanBase.setUseAmtTotal(useAmtTotal);
+                sttlReqMapper.updateLoanMgntBaseInfo4SttlReqProc(userId, loanBase);
 
+                // 1.2 여신관리상세이력 등록 (지급/대체/정산지급)
+                // 여신관리상세이력 등록
+                LoanMgntDtlHstEntity hstEntity = new LoanMgntDtlHstEntity();
+                hstEntity.setLoanMgntUnqNo(storeInfo.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(dtlPtcl.getWhsColAmt()); // 거래금액
+                hstEntity.setPaymAmt(dtlPtcl.getWhsColAmt()); // 지급금액
+                hstEntity.setTrscBfBal(trscBfBal);
+                hstEntity.setTrscAfBal(trscAfBal);
+                dsptMngMapper.insertLoanMgntDtlHst(userId, hstEntity);
+
+                // 1.3 정산구분에 따라 처리 (STTL_DVSN)
+                if (SttlDvsn.WHS.getCd().equals(dtlPtcl.getSttlDvsn())) { // 입고
+                    // 입고처리정보내역 업데이트
+                    sttlReqMapper.updateWhsProcInfoPtcl4SttlReqProc(userId, dtlPtcl);
+                } else if (SttlDvsn.RTN.getCd().equals(dtlPtcl.getSttlDvsn())) { // 수거
+                    // 반품처리정보내역 업데이트
+                    sttlReqMapper.updateRtnProcInfoPtcl4SttlReqProc(userId, dtlPtcl);
+                }
+            } else if (LoanDvsn.POST_PAYMENT.getCd().equals(storeInfo.getLoanDvsn())) {
+                // 2. 후불
+                // 정산상태코드만 변경하고 매장에서 정상확정시 여신처리를 한다.
+            }
+        }
         // 정산관리기본정보 업데이트 (정산상태코드)
+        // 정산타입에 따라
+        if (LoanDvsn.PRE_PAYMENT.getCd().equals(storeInfo.getLoanDvsn())) {
+            StlMgntBaseInfoEntity baseInfo = new StlMgntBaseInfoEntity();
+            baseInfo.setSttlMgntUnqNo(sttlReqProcRequest.getSttlMgntUnqNo());
+            baseInfo.setSttlStCd(SttlStCd.STTL_CONFIRM.getCd());
+            baseInfo.setSttlDt(DateUtil.getCurrentDate());
+            baseInfo.setSttlAmt(sttlAmt);
+            sttlReqMapper.updateStlMgntBaseInfo4SttlReqProc(userId, baseInfo);
+        } else if (LoanDvsn.POST_PAYMENT.getCd().equals(storeInfo.getLoanDvsn())) {
+            StlMgntBaseInfoEntity baseInfo = new StlMgntBaseInfoEntity();
+            baseInfo.setSttlMgntUnqNo(sttlReqProcRequest.getSttlMgntUnqNo());
+            baseInfo.setSttlStCd(SttlStCd.STTL_REQ.getCd());
+            baseInfo.setSttlDt(null);
+            baseInfo.setSttlAmt(null);
+            sttlReqMapper.updateStlMgntBaseInfo4SttlReqProc(userId, baseInfo);
+        }
     }
 
     /* 정산요청 정보 조회 */

src/main/java/com/oqpo/api/web/dto/request/sttlmng/SttlReqProcRequest.java

@@ -11,6 +11,14 @@ import java.util.List;
 @Setter
 public class SttlReqProcRequest {
 
+    @ApiModelProperty(value = "브랜드아이디")
+    @NonNull
+    private String brandId;
+
+    @ApiModelProperty(value = "매장아이디")
+    @NonNull
+    private String storeId;
+
     @ApiModelProperty(value = "정산관리고유번호")
     @NonNull
     private String sttlMgntUnqNo;

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

@@ -179,6 +179,8 @@
             A.brand_id, FN_BRAND_NM(A.brand_id) AS brand_nm,
             A.store_id, FN_STORE_NM(A.brand_id, A.store_id) AS store_nm,
             B.sttl_st_cd, FN_CODE_NM('STTL_ST_CD', B.sttl_st_cd) AS sttl_st_nm,
+            A.whs_mgnt_unq_no,          /* 입고관리고유번호 */
+            A.rtn_mgnt_unq_no,          /* 반품관리고유번호 */
             A.item_id, A.item_nm, A.unit, A.unit_amt,
             A.podr_qty, A.dlv_qty,
             A.sttl_dvsn, FN_CODE_NM('STTL_DVSN', A.sttl_dvsn) AS sttl_dvsn_nm,  /* 정산구분 */
@@ -331,4 +333,51 @@
         WHERE rtn_mgnt_unq_no = #{entity.rtnMgntUnqNo}
     </update>
 
+    <update id="updateLoanMgntBaseInfo4SttlReqProc" >
+        /* SttlReqMapper.updateLoanMgntBaseInfo4SttlReqProc */
+        UPDATE loan_mgnt_base_info SET
+            acct_bal = #{entity.acctBal},
+            use_amt_total = #{entity.useAmtTotal},
+            sys_chg_dttm = NOW(),
+            sys_chg_id = #{userId}
+        WHERE loan_mgnt_unq_no = #{entity.loanMgntUnqNo}
+    </update>
+
+    <update id="updateWhsProcInfoPtcl4SttlReqProc" >
+        /* SttlReqMapper.updateWhsProcInfoPtcl4SttlReqProc */
+        UPDATE whs_proc_info_ptcl SET
+            sttl_yn = 'Y',
+            sttl_mgnt_unq_no = #{entity.sttlMgntUnqNo},
+            sttl_mgnt_dtl_no = #{entity.sttlMgntDtlNo},
+            sys_chg_dttm = NOW(),
+            sys_chg_id = #{userId}
+        WHERE whs_mgnt_unq_no = #{entity.whsMgntUnqNo}
+    </update>
+
+    <update id="updateRtnProcInfoPtcl4SttlReqProc" >
+        /* SttlReqMapper.updateRtnProcInfoPtcl4SttlReqProc */
+        UPDATE rtn_proc_info_ptcl SET
+            sttl_yn = 'Y',
+            sttl_mgnt_unq_no = #{entity.sttlMgntUnqNo},
+            sttl_mgnt_dtl_no = #{entity.sttlMgntDtlNo},
+            sys_chg_dttm = NOW(),
+            sys_chg_id = #{userId}
+        WHERE rtn_mgnt_unq_no = #{entity.rtnMgntUnqNo}
+    </update>
+
+    <update id="updateStlMgntBaseInfo4SttlReqProc" >
+        /* SttlReqMapper.updateStlMgntBaseInfo4SttlReqProc */
+        UPDATE stl_mgnt_base_info SET
+            sttl_st_cd = #{entity.sttlStCd},
+            <if test="entity.sttlDt != null and entity.sttlDt != ''">
+            sttl_dt = #{entity.sttlDt},
+            </if>
+            <if test="entity.sttlAmt != null and entity.sttlAmt != ''">
+            sttl_amt = #{entity.sttlAmt},
+            </if>
+            sys_chg_dttm = NOW(),
+            sys_chg_id = #{userId}
+        WHERE sttl_mgnt_unq_no = #{entity.sttlMgntUnqNo}
+    </update>
+
 </mapper>