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

src/main/java/com/oqpo/api/mapper/stockmng/StockMngMapper.java

@@ -45,6 +45,8 @@ public interface StockMngMapper {
 
     int updateStckMgntBaseInfo4BaseChg(@Param("userId") String userId, StckMgntBaseInfoEntity entity) throws Exception;
 
+    int updateStckMgntBaseInfo4Delete(@Param("userId") String userId, StckMgntBaseInfoEntity entity) throws Exception;
+
     int insertStckMgntDtlHist(@Param("userId") String userId, StckMgntDtlHistEntity entity) throws Exception;
 
     List<StckMgntBaseInfoEntity> selectStockCddGridList(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("whsId") String whsId, @Param("location") String location,

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

@@ -429,7 +429,10 @@ public class EasypayPaymentService extends CommonService {
                     // payInfo.setCancelDate(null);
                     unpaidMngMapper.insertPgKiccPayPtcl(userId, payInfo);
 
-                    if (PayTpCd.AFTER_PAYMENT.getCd().equals(easypayPaymentRequest.getPayTpCd())) { // 후불(결제)
+                    if (PayTpCd.PRE_PAY_CHARGE.getCd().equals(easypayPaymentRequest.getPayTpCd()) //
+                            || PayTpCd.AFTER_PRE_PAYMENT.getCd().equals(easypayPaymentRequest.getPayTpCd())) { // 선결제/충전
+                        procPreChargePayment(userId, r_amount, r_pay_type, payInfo, easypayPaymentRequest);
+                    } else if (PayTpCd.AFTER_PAYMENT.getCd().equals(easypayPaymentRequest.getPayTpCd())) { // 후불(결제)
                         procAfterPayment(userId, r_amount, r_pay_type, payInfo, easypayPaymentRequest);
                     }
                 } catch (Exception e) {
@@ -477,6 +480,55 @@ public class EasypayPaymentService extends CommonService {
         }
     }
 
+    private void procPreChargePayment(String userId, String r_amount, String r_pay_type, PgKiccPayPtclEntity payInfo, EasypayPaymentRequest easypayPaymentRequest) throws Exception {
+        // 1. 여신관리기본정보
+        LoanMgntBaseInfoEntity infoEntity = dsptMngMapper.selectLoanMgntBaseInfo(payInfo.getBrandId(), payInfo.getStoreId());
+
+        long trscBfBal = infoEntity.getAcctBal();
+        long trscAfBal = infoEntity.getAcctBal() + Long.parseLong(r_amount);
+        // 계좌잔액 증가
+        infoEntity.setAcctBal(trscAfBal);
+        dsptMngMapper.updateLoanMgntBaseInfo4AcctBal(userId, infoEntity);
+
+        // 2. 여신관리상세이력
+        // 2.1 입금 처리
+        LoanMgntDtlHstEntity hstEntity = new LoanMgntDtlHstEntity();
+        hstEntity.setLoanMgntUnqNo(infoEntity.getLoanMgntUnqNo());
+        hstEntity.setLoanRegDt(DateUtil.getCurrentDate());
+        hstEntity.setLoanRegTm(DateUtil.getCurrentTime());
+        hstEntity.setDpstPayDvsn(DpstPayDvsn.DEPOSIT.getCd());
+        // 11:신용카드, 21:계좌이체
+        if ("11".equals(r_pay_type)) {
+            hstEntity.setMediaDvsn(MediaDvsn.CARD.getCd());
+        } else if ("21".equals(r_pay_type)) {
+            hstEntity.setMediaDvsn(MediaDvsn.ACCOUNT.getCd());
+        }
+        if (PayTpCd.PRE_PAY_CHARGE.getCd().equals(easypayPaymentRequest.getPayTpCd())) {
+            hstEntity.setPayType(PayType.CHARGE_PAYMENT.getCd());
+        } else if (PayTpCd.AFTER_PRE_PAYMENT.getCd().equals(easypayPaymentRequest.getPayTpCd())) {
+            hstEntity.setPayType(PayType.PRE_PAYMENT.getCd());
+        }
+        hstEntity.setTrscAmt(Long.parseLong(r_amount)); // 거래금액
+        hstEntity.setTrscBfBal(trscBfBal);
+        hstEntity.setTrscAfBal(trscAfBal);
+        dsptMngMapper.insertLoanMgntDtlHst(userId, hstEntity);
+
+        // 4. 여신관리입금처리
+        LoanMgntDsptProcEntity entity = new LoanMgntDsptProcEntity();
+        entity.setDsptMgntNo(fnGetDealNo(21, "")); // 입금관리번호
+        entity.setReqDt(DateUtil.getCurrentDate());
+        entity.setReqTm(DateUtil.getCurrentTime());
+        entity.setDpstAmt(Long.parseLong(r_amount)); // 입금금액
+        entity.setDpstDt(entity.getReqDt()); // 입금일자
+        entity.setDpstStCd(DpstStCd.DPST_APPROVE.getCd());
+        entity.setDpstReqId(userId);
+        entity.setStoreId(payInfo.getStoreId());
+        entity.setBrandId(payInfo.getBrandId());
+        entity.setPoOrdNo(payInfo.getPoOrdNo());
+        entity.setPgId("KICC");
+        dsptMngMapper.insertLoanMgntDsptProcInfo(userId, entity);
+    }
+
     private void procAfterPayment(String userId, String r_amount, String r_pay_type, PgKiccPayPtclEntity payInfo, EasypayPaymentRequest easypayPaymentRequest) throws Exception {
         // 2. 여신관리기본정보
         LoanMgntBaseInfoEntity infoEntity = dsptMngMapper.selectLoanMgntBaseInfo(payInfo.getBrandId(), payInfo.getStoreId());

src/main/java/com/oqpo/api/service/stinfo/StoreBaseInfoService.java

@@ -74,6 +74,7 @@ public class StoreBaseInfoService extends CommonService {
                         .storeNm(m.getStoreNm())
                         .storeStCd(m.getStoreStCd())
                         .storeStNm(m.getStoreStNm())
+                        .loanDvsn(m.getLoanDvsn())      // 정산타입
                         .build())
                 .collect(Collectors.toList());
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);

src/main/java/com/oqpo/api/service/stockmng/StockBaseMngService.java

@@ -28,8 +28,16 @@ public class StockBaseMngService extends CommonService {
     @Transactional
     public void saveStockBaseInfo(String userId, SaveStockBaseInfoRequest saveStockBaseInfoRequest) throws Exception {
         try {
-            List<StckMgntBaseInfoEntity> list = saveStockBaseInfoRequest.toEntities(saveStockBaseInfoRequest.getGridUpdateData());
-            for (StckMgntBaseInfoEntity item : list) {
+            List<StckMgntBaseInfoEntity> deleteList = saveStockBaseInfoRequest.toEntities(saveStockBaseInfoRequest.getGridDeleteData());
+            for (StckMgntBaseInfoEntity item : deleteList) {
+                stockMngMapper.updateStckMgntBaseInfo4Delete(userId, item);
+            }
+            List<StckMgntBaseInfoEntity> insertList = saveStockBaseInfoRequest.toEntities(saveStockBaseInfoRequest.getGridInsertData());
+            for (StckMgntBaseInfoEntity item : insertList) {
+                stockMngMapper.insertStckMgntBaseInfo(userId, item);
+            }
+            List<StckMgntBaseInfoEntity> updateList = saveStockBaseInfoRequest.toEntities(saveStockBaseInfoRequest.getGridUpdateData());
+            for (StckMgntBaseInfoEntity item : updateList) {
                 stockMngMapper.updateStckMgntBaseInfo4BaseChg(userId, item);
             }
         } catch (GlobalException e) {

src/main/java/com/oqpo/api/web/dto/request/stockmng/SaveStockBaseInfoRequest.java

@@ -37,6 +37,7 @@ public class SaveStockBaseInfoRequest {
             entity.setWhsId(whsId);
             entity.setLocation(location);
             entity.setItemId(x.getItemId());
+            entity.setUnit(x.getUnit());
             entity.setPrpStckQty(x.getPrpStckQty());
             entity.setSftStckRt(x.getSftStckRt());
             entities.add(entity);
@@ -51,6 +52,8 @@ public class SaveStockBaseInfoRequest {
 
         @ApiModelProperty(value = "품목아이디")
         private String itemId;
+        @ApiModelProperty(value = "단위")
+        private String unit;
         @ApiModelProperty(value = "적정재고수량")
         private int prpStckQty;
         @ApiModelProperty(value = "안전재고비율")

src/main/java/com/oqpo/api/web/dto/response/stinfo/store/StorePopSearchResponse.java

@@ -31,4 +31,7 @@ public class StorePopSearchResponse {
 
     @ApiModelProperty(value = "상태명")
     private String storeStNm;
+
+    @ApiModelProperty(value = "정산타입")
+    private String loanDvsn;
 }

src/main/resources/mybatis/sqlmaps/stinfo/Store.xml

@@ -5,26 +5,28 @@
 
     <select id="selectPopStoreGridList" resultType="com.oqpo.api.entity.stinfo.StoreBaseInfoEntity">
         select /* selectPopStoreGridList */
-               brand_id, fn_brand_nm(brand_id) as brand_nm, store_id, store_nm, store_st_cd, fn_code_nm('STORE_ST_CD',store_st_cd) as store_st_nm
-        from store_base_info
+            A.brand_id, fn_brand_nm(A.brand_id) as brand_nm,
+            A.store_id, A.store_nm, A.store_st_cd, fn_code_nm('STORE_ST_CD', A.store_st_cd) as store_st_nm,
+            A.loan_dvsn
+        from store_base_info A
         where 1=1
-        and brand_id = #{sBrandId}
+        and A.brand_id = #{sBrandId}
         <if test="sStoreNm != null and sStoreNm != ''">
-            and store_nm like concat('%',#{sStoreNm},'%')
+            and A.store_nm like concat('%',#{sStoreNm},'%')
         </if>
         <choose>
             <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
                 <if test="gridRequest.sidx == 'VIEW_NUM'.toString()">
                     <if test="gridRequest.sord == 'asc'.toString()">
-                        order by store_nm asc
+                        order by A.store_nm asc
                     </if>
                     <if test="gridRequest.sord == 'desc'.toString()">
-                        order by store_nm desc
+                        order by A.store_nm desc
                     </if>
                 </if>
             </when>
             <otherwise>
-                order by store_nm asc
+                order by A.store_nm asc
             </otherwise>
         </choose>
         <if test="gridRequest.pagingYn == true">

src/main/resources/mybatis/sqlmaps/stockmng/StockMng.xml

@@ -26,7 +26,8 @@
                 </if>
             </if>
         </if>
-        WHERE A.brand_id = #{sBrandId}
+        WHERE A.del_yn = 'N'
+        AND A.brand_id = #{sBrandId}
         <if test="sStoreId != null and sStoreId != ''">
         AND C.store_id = #{sStoreId}
         </if>
@@ -94,7 +95,8 @@
                 </if>
             </if>
         </if>
-        WHERE A.brand_id = #{sBrandId}
+        WHERE A.del_yn = 'N'
+        AND A.brand_id = #{sBrandId}
         <if test="sStoreId != null and sStoreId != ''">
             AND C.store_id = #{sStoreId}
         </if>
@@ -154,12 +156,22 @@
     <insert id="insertStckMgntBaseInfo" >
         /* StockMngMapper.insertStckMgntBaseInfo */
         INSERT INTO stck_mgnt_base_info
-            (brand_id, whs_id, location, item_id, unit, stck_qty, prp_stck_qty, sft_stck_rt, cur_stck_rt,
+            (brand_id, whs_id, location, item_id, unit, stck_qty, wait_qty, prp_stck_qty, sft_stck_rt, cur_stck_rt,
              sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
         VALUES
             (#{entity.brandId}, #{entity.whsId}, #{entity.location}, #{entity.itemId}, #{entity.unit}, #{entity.stckQty},
-             #{entity.prpStckQty}, #{entity.sftStckRt}, #{entity.curStckRt},
+             #{entity.waitQty}, #{entity.prpStckQty}, #{entity.sftStckRt}, #{entity.curStckRt},
              NOW(), #{userId}, NOW(), #{userId})
+        ON DUPLICATE KEY UPDATE
+            unit = #{entity.unit},
+            stck_qty = #{entity.stckQty},
+            wait_qty = #{entity.waitQty},
+            prp_stck_qty = #{entity.prpStckQty},
+            sft_stck_rt = #{entity.sftStckRt},
+            cur_stck_rt = #{entity.curStckRt},
+            del_yn = 'N',
+            sys_chg_dttm = NOW(),
+            sys_chg_id = #{userId}
     </insert>
 
     <update id="updateStckMgntBaseInfo4StckProc" >
@@ -188,6 +200,18 @@
         AND item_id = #{entity.itemId}
     </update>
 
+    <update id="updateStckMgntBaseInfo4Delete" >
+        /* StockMngMapper.updateStckMgntBaseInfo4Delete */
+        UPDATE stck_mgnt_base_info SET
+            del_yn = 'Y',
+            sys_chg_dttm = NOW(),
+            sys_chg_id = #{userId}
+        WHERE brand_id = #{entity.brandId}
+        AND whs_id = #{entity.whsId}
+        AND location = #{entity.location}
+        AND item_id = #{entity.itemId}
+    </update>
+
     <insert id="insertStckMgntDtlHist" >
         /* StockMngMapper.insertStckMgntDtlHist */
         INSERT INTO stck_mgnt_dtl_hist