반품관련 처리 프로세스 수정

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

@@ -10,6 +10,7 @@ public enum MediaDvsn {
     CARD("CARD", "카드"), //
     SETTLMENT("STTL", "대체"), //
     VERTUAL("VRTL", "가상"), //
+    RTNC("RTNC", "반품"), //
     ;
 
     MediaDvsn(String cd, String nm) {

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

@@ -9,6 +9,7 @@ public enum PayType {
     CHARGE_PAYMENT("PT01", "충전결제"), //
 	STTL_PAYMENT("PT02", "정산결제"), //
 	PRE_PAYMENT("PT03", "선결제"), //
+    RTN_PAYMENT("PT04", "반품지급"), //
     ;
 
     PayType(String cd, String nm) {

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

@@ -28,14 +28,17 @@ public interface LoanStateMapper {
                               @Param("fromDt") String fromDt, @Param("toDt") String toDt) throws Exception;
 
 
-    LoanMgntBaseInfoEntity selectLoanJobDataInfo(@Param("storeId") String storeId) ;
+    LoanMgntBaseInfoEntity selectLoanJobDataInfo(@Param("storeId") String storeId)  throws Exception;
 
-    int updateloanPchReqUseAmt(@Param("loanMgntUnqNo") String loanMgntUnqNo, @Param("storeId") String storeId, @Param("ordPchReqAmt") long ordPchReqAmt);
-    int updateloanMinusPchReqUseAmt(@Param("loanMgntUnqNo") String loanMgntUnqNo, @Param("storeId") String storeId, @Param("ordPchReqAmt") long ordPchReqAmt);
+    int updateloanPchReqUseAmt(@Param("loanMgntUnqNo") String loanMgntUnqNo, @Param("storeId") String storeId, @Param("ordPchReqAmt") long ordPchReqAmt) throws Exception;
+    int updateloanMinusPchReqUseAmt(@Param("loanMgntUnqNo") String loanMgntUnqNo, @Param("storeId") String storeId, @Param("ordPchReqAmt") long ordPchReqAmt) throws Exception;
 
-    int updateloanMinusInstProc(@Param("loanMgntUnqNo") String loanMgntUnqNo, @Param("storeId") String storeId, @Param("useAmtTotal") long useAmtTotal);
+    int updateloanMinusInstProc(@Param("loanMgntUnqNo") String loanMgntUnqNo, @Param("storeId") String storeId, @Param("useAmtTotal") long useAmtTotal) throws Exception;
 
-    int updateListLoanMinusProc(@Param("userId") String userId, List<LoanMgntBaseInfoEntity> gridUpdateData );
+    int updateListLoanMinusProc(@Param("userId") String userId, List<LoanMgntBaseInfoEntity> gridUpdateData ) throws Exception;
 
+    int updateloanRtnacctBalAmt(@Param("userId") String userId, LoanMgntBaseInfoEntity entity) throws Exception;
+
+    LoanMgntBaseInfoEntity selectLoanRtnDataInfo(@Param("storeId") String storeId)  throws Exception;
 
 }

src/main/java/com/oqpo/api/service/inoutmng/ColOdrService.java

@@ -3,6 +3,7 @@ package com.oqpo.api.service.inoutmng;
 
 import com.oqpo.api.entity.inoutmng.*;
 import com.oqpo.api.entity.loanmng.LoanMgntBaseInfoEntity;
+import com.oqpo.api.entity.loanmng.LoanMgntDtlHstEntity;
 import com.oqpo.api.entity.oper.FileEntity;
 import com.oqpo.api.entity.oper.UserMngEntity;
 import com.oqpo.api.entity.pomng.PchOdrBaseInfoEntity;
@@ -16,13 +17,12 @@ import com.oqpo.api.entity.stinfo.StoreBaseInfoEntity;
 import com.oqpo.api.entity.stockmng.StckMgntBaseInfoEntity;
 import com.oqpo.api.entity.stockmng.StckMgntDtlHistEntity;
 import com.oqpo.api.entity.stockmng.WhsProcInfoPtclEntity;
-import com.oqpo.api.enums.ChgDvsn;
-import com.oqpo.api.enums.InOutCd;
-import com.oqpo.api.enums.SystemMessageCode;
+import com.oqpo.api.enums.*;
 import com.oqpo.api.exception.GlobalException;
 import com.oqpo.api.mapper.FileMapper;
 import com.oqpo.api.mapper.inoutmng.ColOdrMapper;
 import com.oqpo.api.mapper.inoutmng.ShmtOdrMapper;
+import com.oqpo.api.mapper.loanmng.DsptMngMapper;
 import com.oqpo.api.mapper.loanmng.LoanStateMapper;
 import com.oqpo.api.mapper.oper.UserMngMapper;
 import com.oqpo.api.mapper.pomng.PchOrdMapper;
@@ -34,6 +34,7 @@ import com.oqpo.api.mapper.stockmng.StockMngMapper;
 import com.oqpo.api.service.CommonService;
 import com.oqpo.api.service.pomng.PchOrdService;
 import com.oqpo.api.service.rtnmng.RtnOdrService;
+import com.oqpo.api.util.DateUtil;
 import com.oqpo.api.web.dto.request.GridRequest;
 import com.oqpo.api.web.dto.request.inoutmng.*;
 import com.oqpo.api.web.dto.response.GridResponse;
@@ -78,6 +79,11 @@ public class ColOdrService extends CommonService {
     @Autowired
     private UserMngMapper userMngMapper;
 
+    @Autowired
+    private LoanStateMapper loanStateMapper;
+
+    @Autowired
+    private DsptMngMapper dsptMngMapper;
 
 
     /*
@@ -806,6 +812,9 @@ public class ColOdrService extends CommonService {
                 StoreBaseInfoEntity whsUseInfo = storeBaseInfoMapper.selectStoreLoanInfo(uEntity.getBrandId(), uEntity.getStoreId());
                 storeWhsUseYn = whsUseInfo.getWhsUseYn();
 
+                // 여신금액 합
+                long acctbalAmt = 0 ;
+
                 List<RtnProcInfoPtclEntity> rtnProcInfoPtclList = new ArrayList<RtnProcInfoPtclEntity>();
                 List<StckMgntBaseInfoEntity> stckMgntBaseInfoList = new ArrayList<StckMgntBaseInfoEntity>();
                 List<StckMgntDtlHistEntity> stckMgntDtlHistList= new ArrayList<StckMgntDtlHistEntity>();
@@ -817,6 +826,15 @@ public class ColOdrService extends CommonService {
                 // 반품처리를 위한 관련정보를 가져온다
                 List<PickInfoMgntEntity> targetList = colOdrMapper.selectColRtnInstProcList(saveRtnStockProcRequest.getBrandId(), saveRtnStockProcRequest.getRtnWhsId(), searchList);
 
+                //String loanMgntUnqNo = "";
+                LoanMgntBaseInfoEntity loanInfo = null ;
+                long loanAmt = 0 ; // 여신차감할 금액 (사용금액 - 여신차감금액,   잔액금액 - 여신차감금액)
+                if (!"".toString().equals(saveRtnStockProcRequest.getStoreId())) {
+                    loanInfo = loanStateMapper.selectLoanRtnDataInfo(saveRtnStockProcRequest.getStoreId());
+                }
+
+
+
                 for (int i = 0; i < gridInsertData.size(); i++) {
                     RtnProcInfoPtclEntity requestData = gridInsertData.get(i);
 
@@ -933,6 +951,9 @@ public class ColOdrService extends CommonService {
                                 stckW1Hist.setRelationNo(rtnMgntUnqNo);  //======================================
                                 stckMgntDtlHistList.add(stckW1Hist);
 
+                                //반품 금액 계산
+                                acctbalAmt = acctbalAmt +  (targetData.getPickDtlInfo().getUnitAmt() * requestData.getColQty()) ;
+
                             } else if (targetData.getColDvsn().equals("C002") && requestData.getColQty() > 0) {
                                 //  공급사 수거일경우 - 본사창고 재고 차감 처리
                                 // 1. 참감처리 , 2. 반품처리테이블 생성, 3. 수거서 업데이타, 4, 반품발주건 업데이트
@@ -1030,6 +1051,31 @@ public class ColOdrService extends CommonService {
                     List<PickInfoMgntEntity>  pickInfoList = colOdrMapper.selectColPickStList(userId, pickInfoMgntList);
                     colOdrMapper.updateChgStckPickStCd(userId, pickInfoList);
                 }
+
+                //수거 반품 금액 매장에 정산처리함 acctbalAmt
+                if (loanInfo != null && !"".toString().equals(saveRtnStockProcRequest.getStoreId())) {
+
+                    if ("LD01".equals(loanInfo.getLoanDvsn()) || "LD02".equals(loanInfo.getLoanDvsn())) {
+                        LoanMgntBaseInfoEntity loanEntity = new LoanMgntBaseInfoEntity();
+                        loanEntity.setLoanMgntUnqNo(loanInfo.getLoanMgntUnqNo());
+                        loanEntity.setStoreId(saveRtnStockProcRequest.getStoreId());
+                        loanEntity.setAcctBal(acctbalAmt);
+                        loanStateMapper.updateloanRtnacctBalAmt(userId, loanEntity);
+
+                        LoanMgntDtlHstEntity hstEntity = new LoanMgntDtlHstEntity();
+                        hstEntity.setLoanMgntUnqNo(loanInfo.getLoanMgntUnqNo());
+                        hstEntity.setLoanRegDt(DateUtil.getCurrentDate());
+                        hstEntity.setLoanRegTm(DateUtil.getCurrentTime());
+                        hstEntity.setDpstPayDvsn(DpstPayDvsn.DEPOSIT.getCd());
+                        hstEntity.setMediaDvsn(MediaDvsn.RTNC.getCd());
+                        hstEntity.setPayType(PayType.RTN_PAYMENT.getCd());
+
+                        hstEntity.setTrscAmt(acctbalAmt); // 거래금액
+                        hstEntity.setTrscBfBal(loanInfo.getAcctBal());
+                        hstEntity.setTrscAfBal(loanInfo.getAcctBal() + acctbalAmt);
+                        dsptMngMapper.insertLoanMgntDtlHst(userId, hstEntity);
+                    }
+                }
             }
 
         } catch (GlobalException e) {

src/main/java/com/oqpo/api/service/inoutmng/ShmtOdrService.java

@@ -182,7 +182,7 @@ public class ShmtOdrService extends CommonService {
                         }
 
                         if (reqEntity.getShmtQty() < entity.getPchOdrDtlInfo().getPodrQty()) {
-                            // 출고수량보다 발주수량클경우 구매금액을 차감 처리.
+                            // 출고수량보다 발주수량클경우 구매금액을 차감 처리. selectStoreLoanMgntUnqNo
                             String loanMgntUnqNo = storeBaseInfoMapper.selectStoreLoanMgntUnqNo(entity.getStoreId());
 
                             if (loanList.size() > 0) {

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

@@ -184,4 +184,21 @@
             and   store_id = #{item.storeId}
         </foreach>
     </update>
+
+    <update id="updateloanRtnacctBalAmt">
+        update /* updateloanRtnacctBalAmt */ loan_mgnt_base_info
+        set   sys_chg_dttm = now()
+             ,sys_chg_id = #{userId}
+             ,acct_bal = acct_bal + #{entity.acctBal}
+        where loan_mgnt_unq_no = #{entity.loanMgntUnqNo}
+        and   store_id = #{entity.storeId}
+    </update>
+
+
+    <select id="selectLoanRtnDataInfo" resultType="com.oqpo.api.entity.loanmng.LoanMgntBaseInfoEntity">
+        select loan_mgnt_unq_no, store_id, loan_dvsn, acct_bal
+        from   loan_mgnt_base_info
+        where  store_id = #{storeId}
+        and    use_yn = 'Y'
+    </select>
 </mapper>