매장단가 검색조건 변경

src/main/java/com/oqpo/api/mapper/stinfo/StoreItemUnitMapper.java

@@ -11,8 +11,8 @@ import java.util.List;
 @Mapper
 public interface StoreItemUnitMapper {
 
-    List<StoreItemUnitEntity> selectStoreItemUnitGridList(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId , GridRequest gridRequest)throws Exception;
-    int selectStoreItemUnitGridCnt(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId )throws Exception;
+    List<StoreItemUnitEntity> selectStoreItemUnitGridList(@Param("sBrandId") String sBrandId, @Param("sStoreNm") String sStoreNm , GridRequest gridRequest)throws Exception;
+    int selectStoreItemUnitGridCnt(@Param("sBrandId") String sBrandId, @Param("sStoreNm") String sStoreNm )throws Exception;
 
     List<StoreItemUnitEntity> selectStoreItemUnitInfo(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("contSttDt") String contSttDt, @Param("contEndDt") String contEndDt)throws Exception;
 

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

@@ -155,13 +155,13 @@ public class ItemUnitService extends CommonService {
     /*
       브랜드 매장 단가 리스트 조회
      */
-    public GridResponse selectStoreItemUnitGridList(String sBrandId, String sStoreId,  GridRequest gridRequest) throws Exception {
+    public GridResponse selectStoreItemUnitGridList(String sBrandId, String sStoreNm,  GridRequest gridRequest) throws Exception {
         int gridPage = gridRequest.getGridPage();
         int gridSize = gridRequest.getGridSize();
 
-        int gridRecords = storeItemUnitMapper.selectStoreItemUnitGridCnt( sBrandId, sStoreId );
+        int gridRecords = storeItemUnitMapper.selectStoreItemUnitGridCnt( sBrandId, sStoreNm );
         int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
-        List<StoreItemUnitEntity> entities = storeItemUnitMapper.selectStoreItemUnitGridList(sBrandId, sStoreId, gridRequest);
+        List<StoreItemUnitEntity> entities = storeItemUnitMapper.selectStoreItemUnitGridList(sBrandId, sStoreNm, gridRequest);
         List<Object> gridRows = entities.stream()
                 .map(m -> StoreItemUnitSearchResponse.builder()
                         .viewCd("R")

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

@@ -213,6 +213,10 @@ public class StoreBaseInfoService extends CommonService {
                         } else {
                             loanInfoEntity.setCredtLimitUseYn("N");
                         }
+                } else if ("LD03".equals(entity.getLoanDvsn())) {   // 무정산
+                    loanInfoEntity.setChrgeLimitAmt(0);
+                    loanInfoEntity.setCredtLimitAmt(0);
+                    loanInfoEntity.setCredtLimitUseYn("N");
                 }
                 loanInfoEntity.setUseAmtTotal(0);
                 loanInfoEntity.setTmpRcvAcctTotal(0);
@@ -329,7 +333,7 @@ public class StoreBaseInfoService extends CommonService {
                         LoanInfoEntity loanInfoUEntity = new LoanInfoEntity();
                         loanInfoUEntity.setLoanMgntUnqNo(entity.getLoanMgntUnqNo());
                         loanInfoUEntity.setLoanDvsn(entity.getLoanDvsn());
-                        if ("LD02".equals(entity.getLoanDvsn())) {
+                        if ("LD02".equals(entity.getLoanDvsn())) {  // 후불
                             loanInfoUEntity.setCredtLimitAmt(entity.getLimitAmt());
                             loanInfoUEntity.setChrgeLimitAmt(0);
                             if (entity.getLimitAmt() > 0 ) {
@@ -337,10 +341,14 @@ public class StoreBaseInfoService extends CommonService {
                             } else {
                                 loanInfoUEntity.setCredtLimitUseYn("N");
                             }
-                        } else if ("LD01".equals(entity.getLoanDvsn())) {
+                        } else if ("LD01".equals(entity.getLoanDvsn())) {  // 선불
                             loanInfoUEntity.setCredtLimitAmt(0);
                             loanInfoUEntity.setChrgeLimitAmt(entity.getLimitAmt());
                             loanInfoUEntity.setCredtLimitUseYn("N");
+                        } else if ("LD03".equals(entity.getLoanDvsn())) {  // 무정산
+                            loanInfoUEntity.setCredtLimitAmt(0);
+                            loanInfoUEntity.setChrgeLimitAmt(0);
+                            loanInfoUEntity.setCredtLimitUseYn("N");
                         }
                         loanMgntMapper.updateLoanChgLimitInfo(userId, loanInfoUEntity);
                     }
@@ -362,6 +370,10 @@ public class StoreBaseInfoService extends CommonService {
                         loanInfoChEntity.setCredtLimitAmt(0);
                         loanInfoChEntity.setChrgeLimitAmt(entity.getLimitAmt());
                         loanInfoChEntity.setCredtLimitUseYn("N");
+                    } else if ("LD03".equals(entity.getLoanDvsn())) {
+                        loanInfoChEntity.setCredtLimitAmt(0);
+                        loanInfoChEntity.setChrgeLimitAmt(0);
+                        loanInfoChEntity.setCredtLimitUseYn("N");
                     }
                     //신규 생성
                     loanMgntMapper.insertAddLoanMgntInfo(userId, loanInfoChEntity) ;

src/main/java/com/oqpo/api/web/controller/stinfo/ItemUnitController.java

@@ -107,7 +107,7 @@ public class ItemUnitController {
     @ApiOperation(value = "  매장 단가 그리드 리스트")
     @PostMapping("/store-unit-grid-list")
     public ResponseEntity<GridResponse> storeDetailGridList(@RequestBody @Valid StoreItemUnitSearchGridRequest storeItemUnitSearchGridRequest) throws Exception {
-        return ResponseEntity.ok(itemUnitService.selectStoreItemUnitGridList(storeItemUnitSearchGridRequest.getSBrandId(),storeItemUnitSearchGridRequest.getSStoreId(),  storeItemUnitSearchGridRequest.toDTO(storeItemUnitSearchGridRequest)));
+        return ResponseEntity.ok(itemUnitService.selectStoreItemUnitGridList(storeItemUnitSearchGridRequest.getSBrandId(),storeItemUnitSearchGridRequest.getSStoreNm(),  storeItemUnitSearchGridRequest.toDTO(storeItemUnitSearchGridRequest)));
     }
 
     /**

src/main/java/com/oqpo/api/web/dto/request/stinfo/itemUnit/StoreItemUnitSearchGridRequest.java

@@ -14,8 +14,8 @@ public class StoreItemUnitSearchGridRequest extends GridRequest {
     @ApiModelProperty(value = "브랜드아이디")
     private String sBrandId;
 
-    @ApiModelProperty(value = "매장아이디")
-    private String sStoreId;
+    @ApiModelProperty(value = "매장명")
+    private String sStoreNm;
 
     protected StoreItemUnitSearchGridRequest(Integer gridSize, Integer gridPage, String sidx, String sord, Boolean pagingYn, Integer gridFirst) {
         super(gridSize, gridPage, sidx, sord, pagingYn, gridFirst);

src/main/java/com/oqpo/api/web/dto/response/pomng/pchReq/PchReqInfoResponse.java

@@ -2,11 +2,9 @@ package com.oqpo.api.web.dto.response.pomng.pchReq;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.oqpo.api.entity.loanmng.LoanMgntBaseInfoEntity;
-import com.oqpo.api.entity.oper.FileEntity;
 import com.oqpo.api.entity.oper.UserMngEntity;
 import com.oqpo.api.entity.pomng.PchReqBaseInfoEntity;
 import com.oqpo.api.entity.pomng.PchReqDtlPtclEntity;
-import com.oqpo.api.entity.stinfo.BrandEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 

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

@@ -12,8 +12,8 @@
         select  brand_id, store_id, cont_stt_dt, cont_end_dt, min(sys_reg_dttm) as sys_reg_dttm, count(*) as item_cnt
         from    store_item_unit_info
         where   brand_id = #{sBrandId}
-        <if test="sStoreId != null and sStoreId != ''">
-            and     store_id = #{sStoreId}
+        <if test="sStoreNm != null and sStoreNm != ''">
+            and     store_nm = concat('%',#{sStoreNm},'%')
         </if>
         and     unit_target_cd = 'Y'
         group by brand_id, store_id, cont_stt_dt, cont_end_dt
@@ -45,8 +45,8 @@
         select  distinct brand_id, store_id, cont_stt_dt, cont_end_dt
         from    store_item_unit_info
         where   brand_id = #{sBrandId}
-        <if test="sStoreId != null and sStoreId != ''">
-            and     store_id = #{sStoreId}
+        <if test="sStoreNm != null and sStoreNm != ''">
+            and     store_nm = concat('%',#{sStoreNm},'%')
         </if>
         and     unit_target_cd = 'Y'
         ) iunit