브랜드, 매장 단가정보 api 저장 (단위테스트전단계)

src/main/java/com/oqpo/api/entity/stinfo/StoreItemUnitEntity.java

@@ -37,6 +37,9 @@ public class StoreItemUnitEntity implements Serializable {
     private String sysRegId ;
     private String sysChgDttm ;
     private String sysChgId ;
-
+    private Integer itemCnt;
+    private Integer spplyUnitAmt;
+    private String unitTargetCd;
+    private String unitTargetNm;
     private List<FileEntity> fileEntity ;
 }

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

@@ -14,11 +14,11 @@ 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;
 
-    StoreItemUnitEntity selectStoreItemUnitInfo(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("contSttDt") String contSttDt, @Param("contEndDt") String contEndDt)throws Exception;
+    List<StoreItemUnitEntity> selectStoreItemUnitInfo(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("contSttDt") String contSttDt, @Param("contEndDt") String contEndDt)throws Exception;
 
     StoreItemUnitEntity selectStoreItemUnitContDateInfo(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("contSttDt") String contSttDt,  @Param("contEndDt") String contEndDt)throws Exception;
     int updateStoreItemUnitContEnd(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("contEndDt") String contEndDt) throws Exception;
 
-    int insertMergStoreItemUnitInfo(@Param("userId") String userId, List<StoreItemUnitEntity> gridUpdateData) throws Exception;
+    int insertMergStoreItemUnitInfo(@Param("userId") String userId, @Param("brandId") String brandId, @Param("storeId") String storeId, @Param("contSttDt") String contSttDt, @Param("contEndDt") String contEndDt, List<StoreItemUnitEntity> gridUpdateData) throws Exception;
 
 }

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

@@ -1,26 +1,29 @@
 package com.oqpo.api.service.stinfo;
 
 
+import com.oqpo.api.entity.CodeEntity;
 import com.oqpo.api.entity.oper.FileEntity;
-import com.oqpo.api.entity.stinfo.ItemClassEntity;
-import com.oqpo.api.entity.stinfo.ItemClassMngEntity;
-import com.oqpo.api.entity.stinfo.ItemEntity;
-import com.oqpo.api.entity.stinfo.ItemUnitEntity;
+import com.oqpo.api.entity.stinfo.*;
 import com.oqpo.api.enums.SystemMessageCode;
 import com.oqpo.api.exception.GlobalException;
 import com.oqpo.api.mapper.FileMapper;
 import com.oqpo.api.mapper.stinfo.ItemMapper;
 import com.oqpo.api.mapper.stinfo.ItemUnitMapper;
+import com.oqpo.api.mapper.stinfo.StoreItemUnitMapper;
 import com.oqpo.api.service.CommonService;
 import com.oqpo.api.web.dto.request.GridRequest;
 import com.oqpo.api.web.dto.request.stinfo.item.DelItemInfolRequest;
 import com.oqpo.api.web.dto.request.stinfo.item.SaveItemClassMngInfolRequest;
 import com.oqpo.api.web.dto.request.stinfo.item.SaveItemInfolRequest;
 import com.oqpo.api.web.dto.request.stinfo.itemUnit.SaveItemUnitInfolRequest;
+import com.oqpo.api.web.dto.request.stinfo.itemUnit.SaveStoreItemUnitInfolRequest;
 import com.oqpo.api.web.dto.response.GridResponse;
+import com.oqpo.api.web.dto.response.code.CodeSearchListResponse;
 import com.oqpo.api.web.dto.response.stinfo.item.*;
 import com.oqpo.api.web.dto.response.stinfo.itemUnit.ItemUnitInfoResponse;
 import com.oqpo.api.web.dto.response.stinfo.itemUnit.ItemUnitSearchResponse;
+import com.oqpo.api.web.dto.response.stinfo.itemUnit.StoreItemUnitInfoResponse;
+import com.oqpo.api.web.dto.response.stinfo.itemUnit.StoreItemUnitSearchResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -36,6 +39,10 @@ public class ItemUnitService extends CommonService {
     @Autowired
     private ItemUnitMapper itemUnitMapper;
 
+    @Autowired
+    private StoreItemUnitMapper storeItemUnitMapper;
+
+
     @Autowired
     private FileMapper fileMapper;
 
@@ -101,7 +108,7 @@ public class ItemUnitService extends CommonService {
     public void saveItemUnitInfo(String userId, SaveItemUnitInfolRequest saveItemUnitInfolRequest) throws Exception {
         try {
 
-            ItemUnitEntity entity = new ItemEntity();
+            ItemUnitEntity entity = new ItemUnitEntity();
             entity.setBrandUnitUnqNo(saveItemUnitInfolRequest.getBrandUnitUnqNo());
             entity.setBrandId(saveItemUnitInfolRequest.getBrandId());
             entity.setBrandNm(saveItemUnitInfolRequest.getBrandNm());
@@ -144,5 +151,74 @@ public class ItemUnitService extends CommonService {
     }
 
 
+    /*
+      브랜드 매장 단가 리스트 조회
+     */
+    public GridResponse selectStoreItemUnitGridList(String sBrandId, String sStoreId,  GridRequest gridRequest) throws Exception {
+        int gridPage = gridRequest.getGridPage();
+        int gridSize = gridRequest.getGridSize();
+
+        int gridRecords = storeItemUnitMapper.selectStoreItemUnitGridCnt( sBrandId, sStoreId );
+        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+        List<StoreItemUnitEntity> entities = storeItemUnitMapper.selectStoreItemUnitGridList(sBrandId, sStoreId, gridRequest);
+        List<Object> gridRows = entities.stream()
+                .map(m -> StoreItemUnitSearchResponse.builder()
+                        .viewCd("R")
+                        .brandId(m.getBrandId())
+                        .brandNm(m.getBrandNm())
+                        .storeId(m.getStoreId())
+                        .storeNm(m.getStoreNm())
+                        .contSttDt(m.getContSttDt())
+                        .contEndDt(m.getContEndDt())
+                        .sysRegDttm(m.getSysRegDttm())
+                        .itemCnt(m.getItemCnt())
+                        .build())
+                .collect(Collectors.toList());
+        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
+    }
+
+
+    /* 매장 단가 정보 */
+    public StoreItemUnitInfoResponse selectStoreItemUnitInfo(String brandId, String storeId, String contSttDt, String contEndDt) throws Exception {
+
+        List<StoreItemUnitEntity> entities = storeItemUnitMapper.selectStoreItemUnitInfo( brandId, storeId, contSttDt, contEndDt);
+        return StoreItemUnitInfoResponse.toDTO(entities);
+
+    }
+
+
+    /* 매장 단가 저장 */
+    @Transactional
+    public void saveStroeItemUnitInfo(String userId, SaveStoreItemUnitInfolRequest saveStoreItemUnitInfolRequest) throws Exception {
+        try {
+
+            StoreItemUnitEntity entity = new StoreItemUnitEntity();
+            entity.setBrandId(saveStoreItemUnitInfolRequest.getBrandId());
+            entity.setStoreId(saveStoreItemUnitInfolRequest.getStoreId());
+            entity.setContSttDt(saveStoreItemUnitInfolRequest.getContSttDt());
+            entity.setContEndDt(saveStoreItemUnitInfolRequest.getContEndDt());
+
+            StoreItemUnitEntity chkDataEnity =  storeItemUnitMapper.selectStoreItemUnitContDateInfo(entity.getBrandId(), entity.getStoreId(), entity.getContSttDt(), entity.getContEndDt());
+
+            if (chkDataEnity != null) {
+                if ("".equals(chkDataEnity.getContEndDt()))
+                {
+                    storeItemUnitMapper.updateStoreItemUnitContEnd(entity.getBrandId(), entity.getStoreId(), chkDataEnity.getContEndDt());
+                }
+            }
+
+            List<StoreItemUnitEntity> gridUpdateData = saveStoreItemUnitInfolRequest.toCodeEntities(saveStoreItemUnitInfolRequest.getGridUpdateData());
+            if (gridUpdateData.size() > 0) {
+                storeItemUnitMapper.insertMergStoreItemUnitInfo(userId, entity.getBrandId(), entity.getStoreId(), entity.getContSttDt(),entity.getContEndDt(), gridUpdateData) ;
+            }
+
+        } catch (GlobalException e) {
+            e.getStackTrace();
+            throw new GlobalException(e.getSystemMessageCode());
+        } catch (Exception e) {
+            e.getStackTrace();
+            throw new RuntimeException();
+        }
+    }
 
 }

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

@@ -0,0 +1,48 @@
+package com.oqpo.api.web.dto.request.stinfo.itemUnit;
+
+import com.oqpo.api.web.dto.request.GridRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+
+@Getter
+@Setter
+public class ItemUnitSearchGridRequest extends GridRequest {
+
+
+    @ApiModelProperty(value = "브랜드아이디")
+    private String sBrandId;
+
+    @ApiModelProperty(value = "시작일자")
+    private String fromDt;
+
+    @ApiModelProperty(value = "종료일자")
+    private String toDt;
+
+    @ApiModelProperty(value = "상태")
+    private String sUnitStCd;
+
+    @ApiModelProperty(value = "공급사아이디")
+    private String sSpplyId;
+
+    @ApiModelProperty(value = "분류Level1")
+    private String sClass1;
+
+    @ApiModelProperty(value = "분류Level2")
+    private String sClass2;
+
+    @ApiModelProperty(value = "분류Level3")
+    private String sClass3;
+
+    @ApiModelProperty(value = "분류Level4")
+    private String sClass4;
+
+    @ApiModelProperty(value = "품목명")
+    private String sItemNm;
+
+
+    protected ItemUnitSearchGridRequest(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/request/stinfo/itemUnit/SaveStoreItemUnitInfolRequest.java

@@ -0,0 +1,91 @@
+package com.oqpo.api.web.dto.request.stinfo.itemUnit;
+
+import com.oqpo.api.entity.stinfo.SpplyMgrEntity;
+import com.oqpo.api.entity.stinfo.StoreItemUnitEntity;
+import com.oqpo.api.web.dto.request.stinfo.spply.SaveSpplyRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
+import java.util.List;
+
+@Getter
+@Setter
+public class SaveStoreItemUnitInfolRequest {
+
+    @NotBlank
+    @ApiModelProperty(value = "CRUD")
+    private String viewCd;
+
+    @ApiModelProperty(value = "매장아이디")
+    private String storeId;
+
+    @ApiModelProperty(value = "브랜드아이디")
+    private String brandId;
+
+    @ApiModelProperty(value = "계약시작일자")
+    private String contSttDt;
+
+    @ApiModelProperty(value = "계약종료일자")
+    private String contEndDt;
+
+
+    @ApiModelProperty(value = "매장단가정보리스트")
+    private List<SaveStoreItemUnitInfolRequest.SaveStoreItemUnit> gridUpdateData;
+
+
+    public List<StoreItemUnitEntity> toCodeEntities(List< SaveStoreItemUnitInfolRequest.SaveStoreItemUnit > gridData) {
+        List<StoreItemUnitEntity> entities = new ArrayList<>();
+        if (gridData == null || gridData.size() == 0)
+            return entities;
+
+        gridData.forEach(x -> {
+            StoreItemUnitEntity entity = new StoreItemUnitEntity();
+            entity.setStoreUnitUnqNo(x.getStoreUnitUnqNo());
+            entity.setUnit(x.getUnit());
+            entity.setCurr(x.getCurr());
+            entity.setUnitAmt(x.getUnitAmt());
+            entity.setShortContFileNo(x.getShortContFileNo());
+            entity.setUnitTargetCd(x.getUnitTargetCd());
+            entity.setItemId(x.getItemId());
+            entity.setStddQyt(x.getStddQty());
+            entity.setBrandUnitUnqNo(x.getBrandUnitUnqNo());
+            entities.add(entity);
+        });
+        return entities;
+    }
+
+    @Getter
+    @Builder
+    @AllArgsConstructor(access = AccessLevel.PROTECTED)
+    static class SaveStoreItemUnit {
+
+        @ApiModelProperty(value = "매장단가고유번호")
+        private String storeUnitUnqNo;
+
+        @ApiModelProperty(value = "단위")
+        private String unit;
+
+        @ApiModelProperty(value = "통화")
+        private String curr;
+
+        @ApiModelProperty(value = "단가금액")
+        private Integer unitAmt;
+
+        @ApiModelProperty(value = "계약문서첨부파일번호")
+        private String shortContFileNo;
+
+        @ApiModelProperty(value = "대상여부")
+        private String unitTargetCd;
+
+        @ApiModelProperty(value = "품목아이디")
+        private String itemId;
+
+        @ApiModelProperty(value = "기준수량")
+        private Integer stddQty;
+
+        @ApiModelProperty(value = "브랜드단가고유번호")
+        private String brandUnitUnqNo;
+    }
+}

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

@@ -0,0 +1,23 @@
+package com.oqpo.api.web.dto.request.stinfo.itemUnit;
+
+import com.oqpo.api.web.dto.request.GridRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+
+@Getter
+@Setter
+public class StoreItemUnitSearchGridRequest extends GridRequest {
+
+
+    @ApiModelProperty(value = "브랜드아이디")
+    private String sBrandId;
+
+    @ApiModelProperty(value = "매장아이디")
+    private String sStoreId;
+
+    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/stinfo/itemUnit/StoreItemUnitInfoResponse.java

@@ -0,0 +1,106 @@
+package com.oqpo.api.web.dto.response.stinfo.itemUnit;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.oqpo.api.entity.oper.FileEntity;
+import com.oqpo.api.entity.stinfo.ItemUnitEntity;
+import com.oqpo.api.entity.stinfo.StoreItemUnitEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@JsonInclude(JsonInclude.Include.ALWAYS)
+public class StoreItemUnitInfoResponse {
+
+    private List<StoreItemUnitInfo> storeItemUnitList;
+
+
+    public static StoreItemUnitInfoResponse toDTO(List<StoreItemUnitEntity> entities) {
+        if (entities == null) return null;
+
+        return StoreItemUnitInfoResponse.builder()
+                .storeItemUnitList(entities.stream()
+                        .map(m -> StoreItemUnitInfo.builder()
+                                .storeUnitUnqNo(m.getStoreUnitUnqNo())
+                                .brandId(m.getBrandId())
+                                .itemId(m.getItemId())
+                                .itemNm(m.getItemNm())
+                                .contSttDt(m.getContSttDt() == null ? "" :m.getContSttDt())
+                                .contEndDt(m.getContEndDt() == null ? "" :m.getContEndDt())
+                                .unit(m.getUnit() == null ? "" :m.getUnit())
+                                .unitNm(m.getUnitNm() == null ? "" :m.getUnitNm())
+                                .stddQty(m.getStddQyt() == null ? 0 :m.getStddQyt() )
+                                .curr(m.getCurr() == null ? "" :m.getCurr())
+                                .currNm(m.getCurrNm() == null ? "" :m.getCurrNm())
+                                .unitAmt(m.getUnitAmt() == null ? 0 :m.getUnitAmt())
+                                .unitTargetCd(m.getUnitTargetCd() == null ? "" :m.getUnitTargetCd())
+                                .unitTargetNm(m.getUnitTargetNm() == null ? "" :m.getUnitTargetNm())
+                                .spplyUnitAmt (m.getSpplyUnitAmt() == null ? 0 :m.getSpplyUnitAmt())
+                                .build())
+                        .collect(Collectors.toList()))
+                .build();
+    }
+
+
+    @Getter
+    @Builder
+    @AllArgsConstructor(access = AccessLevel.PROTECTED)
+    static class StoreItemUnitInfo {
+        @ApiModelProperty(value = "매장단가고유번호")
+        private String storeUnitUnqNo;
+
+        @ApiModelProperty(value = "브랜드아이디")
+        private String brandId;
+
+        @ApiModelProperty(value = "품목아이디")
+        private String itemId;
+
+        @ApiModelProperty(value = "품목명")
+        private String itemNm;
+
+        @ApiModelProperty(value = "계약시작일자")
+        private String contSttDt;
+
+        @ApiModelProperty(value = "계약종료일자")
+        private String contEndDt;
+
+        @ApiModelProperty(value = "단위")
+        private String unit;
+
+        @ApiModelProperty(value = "단위명")
+        private String unitNm;
+
+        @ApiModelProperty(value = "기준수량")
+        private Integer stddQty;
+
+        @ApiModelProperty(value = "통화")
+        private String curr;
+
+        @ApiModelProperty(value = "통화명")
+        private String currNm;
+
+        @ApiModelProperty(value = "단가금액")
+        private Integer unitAmt;
+
+        @ApiModelProperty(value = "대상여부")
+        private String unitTargetCd;
+
+        @ApiModelProperty(value = "대상여부명")
+        private String unitTargetNm;
+
+        @ApiModelProperty(value = "공급사단가")
+        private Integer spplyUnitAmt ;
+    }
+
+
+
+
+
+
+}

src/main/java/com/oqpo/api/web/dto/response/stinfo/itemUnit/StoreItemUnitSearchResponse.java

@@ -0,0 +1,41 @@
+package com.oqpo.api.web.dto.response.stinfo.itemUnit;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@JsonInclude(JsonInclude.Include.ALWAYS)
+public class StoreItemUnitSearchResponse {
+
+    @ApiModelProperty(value = "CRUD")
+    private String viewCd;
+
+    @ApiModelProperty(value = "브랜드아이디")
+    private String brandId;
+
+    @ApiModelProperty(value = "브랜드명")
+    private String brandNm;
+
+    @ApiModelProperty(value = "매장아이디")
+    private String storeId;
+
+    @ApiModelProperty(value = "매장명")
+    private String storeNm;
+
+    @ApiModelProperty(value = "계약시작일")
+    private String contSttDt;
+
+    @ApiModelProperty(value = "계약종료일")
+    private String contEndDt;
+
+    @ApiModelProperty(value = "등록일자")
+    private String sysRegDttm;
+
+    @ApiModelProperty(value = "계약품목수")
+    private Integer itemCnt;
+
+}

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

@@ -54,7 +54,7 @@
 
     <select id="selectStoreItemUnitInfo" resultType="com.oqpo.api.entity.stinfo.StoreItemUnitEntity">
         select /*selectStoreItemUnitInfo*/
-                item.brand_id, item.item_id, item.item_nm,
+                unit.store_unit_unq_no, item.brand_id, item.item_id, item.item_nm,
                 case when unit.cont_stt_dt is null or unit.cont_stt_dt = '' then #{contSttDt} else date_format(unit.cont_stt_dt,'%Y.%m.%d') end as cont_stt_dt,
                 case when unit.cont_end_dt is null or unit.cont_end_dt = '' then #{contEndDt} else date_format(unit.cont_end_dt,'%Y.%m.%d') end as cont_end_dt,
                 case when unit.unit is null or  unit.unit = '' then item.unit else unit.unit end as unit   ,
@@ -65,7 +65,7 @@
                 case when unit.unit_amt is null or  unit.unit_amt = 0 then item.store_sale_unit_amt else unit.unit_amt end as unit_amt,
                 case when unit.unit_target_cd is null or unit.unit_target_cd = '' then 'Y' else unit.unit_target_cd end as unit_target_cd,
                 case when unit.unit_target_cd is null or unit.unit_target_cd = '' then fn_code_nm('DSTRBT_COST_UNIT','Y') else  fn_code_nm('DSTRBT_COST_UNIT',unit.unit_target_cd)  end as unit_target_nm,
-                nvl(unit.unit_amt,0) as supply_unit_amt
+                nvl(unit.unit_amt,0) as spply_unit_amt
         from   brand_item_unit_info item
         left outer join store_item_unit_info unit on  item.brand_unit_unq_no = unit.brand_unit_unq_no and  item.brand_id = unit.brand_id and item.item_id = unit.item_id and unit.store_id = #{storeId}
         where item.brand_id = #{brandId}
@@ -100,8 +100,8 @@
                  sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
             values
             <foreach collection="gridUpdateData" item="item" separator=",">
-                ( fn_get_dealno(34,''), #{item.contSttDt}, #{item.contEndDt}, #{item.unit},
-                  #{item.curr}, #{item.unitAmt}, #{item.storeId}, #{item.brandId}, #{item.shortContFileNo},
+                ( fn_get_dealno(34,''), #{contSttDt}, #{contEndDt}, #{item.unit},
+                  #{item.curr}, #{item.unitAmt}, #{storeId}, #{brandId}, #{item.shortContFileNo},
                   #{item.unitTargetCd}, #{item.itemId}, #{item.stddQty}, #{item.brandUnitUnqNo},
                   NOW(), #{userId}, NOW(), #{userId})
             </foreach>