품목 관련 오더퀸 연동 구현 중

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

@@ -1,6 +1,11 @@
 package com.oqpo.api.service.stinfo;
 
 
+import com.oqpo.api.client.oqlink.OqlinkClient;
+import com.oqpo.api.client.oqlink.dto.OqScmMenuModel;
+import com.oqpo.api.client.oqlink.dto.OqScmMenuRegReqModel;
+import com.oqpo.api.client.oqlink.dto.OqScmMenuRegResModel;
+import com.oqpo.api.client.oqlink.util.HmacUtil;
 import com.oqpo.api.constant.ApiConstants;
 import com.oqpo.api.entity.CodeEntity;
 import com.oqpo.api.entity.oper.FileEntity;
@@ -55,6 +60,9 @@ public class ItemService extends CommonService {
     @Autowired
     private SessionService sessionService;
 
+    @Autowired
+    private OqlinkClient oqlinkClient;
+
     /*
       팝업 품목 리스트 조회
      */
@@ -234,59 +242,19 @@ public class ItemService extends CommonService {
     @Transactional
     public void saveItemInfo(String userId, SaveItemInfolRequest saveItemInfolRequest) throws Exception {
         try {
-
-            ItemEntity entity = new ItemEntity();
-            entity.setBrandId(saveItemInfolRequest.getBrandId());
-            entity.setItemId(saveItemInfolRequest.getItemId());
-            entity.setItemNm(saveItemInfolRequest.getItemNm());
-            entity.setPchUnit(saveItemInfolRequest.getPchUnit());
-            entity.setWeight(saveItemInfolRequest.getWeight());
-            entity.setVolume(saveItemInfolRequest.getVolume());
-            entity.setWidth(saveItemInfolRequest.getWidth());
-            entity.setHeight(saveItemInfolRequest.getHeight());
-            entity.setHigh(saveItemInfolRequest.getHigh());
-            entity.setExpryYn(saveItemInfolRequest.getExpryYn());
-            entity.setExpryPeriod(saveItemInfolRequest.getExpryPeriod());
-            entity.setRtnDvsn(saveItemInfolRequest.getRtnDvsn());
-            entity.setImpDvsn(saveItemInfolRequest.getImpDvsn());
-            entity.setAssetInfo(saveItemInfolRequest.getAssetInfo());
-            entity.setStckUnit(saveItemInfolRequest.getStckUnit());
-            entity.setPodrPssblDvsn(saveItemInfolRequest.getPodrPssblDvsn());
-            entity.setPchItemYn(saveItemInfolRequest.getPchItemYn());
-            entity.setSaleItemYn(saveItemInfolRequest.getSaleItemYn());
-            entity.setItemStCd(saveItemInfolRequest.getItemStCd());
-            entity.setItemType(saveItemInfolRequest.getItemType());
-            entity.setSaleUnit(saveItemInfolRequest.getSaleUnit());
-            entity.setUnit(saveItemInfolRequest.getUnit());
-            entity.setRtnPssblYn(saveItemInfolRequest.getRtnPssblYn());
-            entity.setItemImageFileNo(saveItemInfolRequest.getItemImageFileNo());
-            entity.setOneBoxQty(saveItemInfolRequest.getOneBoxQty());
-            entity.setWeightUnit(saveItemInfolRequest.getWeightUnit());
-            entity.setVolumeUnit(saveItemInfolRequest.getVolumeUnit());
-            entity.setWidthUnit(saveItemInfolRequest.getWidthUnit());
-            entity.setHeightUnit(saveItemInfolRequest.getHeightUnit());
-            entity.setHighUnit(saveItemInfolRequest.getHighUnit());
-            entity.setOqBrandId(saveItemInfolRequest.getOqBrandId());
-            entity.setOqMenuCd(saveItemInfolRequest.getOqMenuCd());
-            entity.setBarcode(saveItemInfolRequest.getBarcode());
-            entity.setStoreDeliType(saveItemInfolRequest.getStoreDeliType());
-
+            ItemEntity entity = toItemEntity(saveItemInfolRequest);
             if ("C".equals(saveItemInfolRequest.getViewCd())) {
-
                 // 품목 아이디 부여  22  entity.setContentsNo(fnGetKeyNo(17));
                 //entity.setItemId(fnGetDealNo(26,""));  // 품목아이디 생성
                 itemMapper.insertItemInfo(userId, entity);
             } else if ("U".equals(saveItemInfolRequest.getViewCd())) {
                 itemMapper.updateItemInfo(userId, entity);
-
                 itemMapper.deleteItemClassInfo(entity.getItemId());
             }
 
             // 품목 class 정보 등록
-
             if (!"".toString().equals(saveItemInfolRequest.getItemClass1())) {
                 ItemClassEntity iClassEntity = new ItemClassEntity();
-
                 iClassEntity.setItemId(entity.getItemId());
                 iClassEntity.setItemNm(entity.getItemNm());
                 iClassEntity.setItemClass1(saveItemInfolRequest.getItemClass1());
@@ -299,6 +267,33 @@ public class ItemService extends CommonService {
                 itemMapper.insertItemClassInfo(userId, iClassEntity);
             }
 
+            // 오더퀸 연동
+            if (!StringUtil.isEmpty(entity.getOqBrandId()) && !StringUtil.isEmpty(entity.getOqMenuCd())) {
+                List<OqScmMenuModel> menuList = new ArrayList<>();
+                OqScmMenuModel menu = new OqScmMenuModel();
+                menu.setItemId(entity.getItemId()); // 품목아이디
+                menu.setItemNm(entity.getItemNm()); // 품목명
+                menu.setMenuCd(entity.getOqMenuCd()); // 메뉴코드
+                menu.setBarcodeNo(entity.getBarcode()); // 바코드번호
+                menu.setSupplyPrice(0); // TODO 공급가격
+                menu.setOrderUnitQty(0); // TODO 발주단위수량
+                menu.setOrderPossibleYn("PO01".equals(entity.getPodrPssblDvsn()) ? "Y" : "N"); // 발주가능여부
+                menuList.add(menu);
+
+                OqScmMenuRegReqModel req = new OqScmMenuRegReqModel();
+                req.setBrandCd(entity.getOqBrandId());
+                req.setMenuList(menuList);
+
+                OqScmMenuRegResModel res = null;
+                if ("C".equals(saveItemInfolRequest.getViewCd())) {
+                    res = oqlinkClient.regScmMenu(HmacUtil.makeHmacValue4OqLink(req), req);
+                } else if ("U".equals(saveItemInfolRequest.getViewCd())) {
+                    res = oqlinkClient.changeScmMenu(HmacUtil.makeHmacValue4OqLink(req), req);
+                }
+                if (SystemMessageCode.BO_IF_OK.getId() != Integer.parseInt(res.getCode())) {
+                    throw new GlobalException(SystemMessageCode.valueOf(Integer.valueOf(res.getCode())));
+                }
+            }
         } catch (GlobalException e) {
             e.getStackTrace();
             throw new GlobalException(e.getSystemMessageCode());
@@ -308,49 +303,60 @@ public class ItemService extends CommonService {
         }
     }
 
+    private ItemEntity toItemEntity(SaveItemInfolRequest saveItemInfolRequest) {
+        ItemEntity entity = new ItemEntity();
+        entity.setBrandId(saveItemInfolRequest.getBrandId());
+        entity.setItemId(saveItemInfolRequest.getItemId());
+        entity.setItemNm(saveItemInfolRequest.getItemNm());
+        entity.setPchUnit(saveItemInfolRequest.getPchUnit());
+        entity.setWeight(saveItemInfolRequest.getWeight());
+        entity.setVolume(saveItemInfolRequest.getVolume());
+        entity.setWidth(saveItemInfolRequest.getWidth());
+        entity.setHeight(saveItemInfolRequest.getHeight());
+        entity.setHigh(saveItemInfolRequest.getHigh());
+        entity.setExpryYn(saveItemInfolRequest.getExpryYn());
+        entity.setExpryPeriod(saveItemInfolRequest.getExpryPeriod());
+        entity.setRtnDvsn(saveItemInfolRequest.getRtnDvsn());
+        entity.setImpDvsn(saveItemInfolRequest.getImpDvsn());
+        entity.setAssetInfo(saveItemInfolRequest.getAssetInfo());
+        entity.setStckUnit(saveItemInfolRequest.getStckUnit());
+        entity.setPodrPssblDvsn(saveItemInfolRequest.getPodrPssblDvsn());
+        entity.setPchItemYn(saveItemInfolRequest.getPchItemYn());
+        entity.setSaleItemYn(saveItemInfolRequest.getSaleItemYn());
+        entity.setItemStCd(saveItemInfolRequest.getItemStCd());
+        entity.setItemType(saveItemInfolRequest.getItemType());
+        entity.setSaleUnit(saveItemInfolRequest.getSaleUnit());
+        entity.setUnit(saveItemInfolRequest.getUnit());
+        entity.setRtnPssblYn(saveItemInfolRequest.getRtnPssblYn());
+        entity.setItemImageFileNo(saveItemInfolRequest.getItemImageFileNo());
+        entity.setOneBoxQty(saveItemInfolRequest.getOneBoxQty());
+        entity.setWeightUnit(saveItemInfolRequest.getWeightUnit());
+        entity.setVolumeUnit(saveItemInfolRequest.getVolumeUnit());
+        entity.setWidthUnit(saveItemInfolRequest.getWidthUnit());
+        entity.setHeightUnit(saveItemInfolRequest.getHeightUnit());
+        entity.setHighUnit(saveItemInfolRequest.getHighUnit());
+        entity.setOqBrandId(saveItemInfolRequest.getOqBrandId());
+        entity.setOqMenuCd(saveItemInfolRequest.getOqMenuCd());
+        entity.setBarcode(saveItemInfolRequest.getBarcode());
+        entity.setStoreDeliType(saveItemInfolRequest.getStoreDeliType());
+        return entity;
+    }
+
     @Transactional
     public void saveItemList(String userId, SaveItemListRequest saveItemListRequest) throws Exception {
         try {
             List<SaveItemListData> list = saveItemListRequest.getList();
             for (SaveItemListData item : list) {
-                ItemEntity entity = new ItemEntity();
-                entity.setItemNm(item.getItemNm());
-                entity.setItemStCd("IS00"); // 사용
-                entity.setBrandId(saveItemListRequest.getBrandId());
-                entity.setUnit(DstrbtCostUnit.getCd(item.getUnitNm())); // 단위
-                // entity.setPchUnit(item.getPchUnit()); // 구매단위
-                // entity.setSaleUnit(item.getSaleUnit()); // 판매단위
-                // entity.setStckUnit(item.getStckUnit()); // 재고단위
-                entity.setWeight(item.getWeight());
-                entity.setWeightUnit(WeightUnit.getCd(item.getWeightUnitNm()));
-                entity.setVolume(item.getVolume());
-                entity.setVolumeUnit(VolumeUnit.getCd(item.getVolumeUnitNm()));
-                entity.setWidth(item.getWidth());
-                entity.setWidthUnit(WidthUnit.getCd(item.getWidthUnitNm()));
-                entity.setHeight(item.getHeight());
-                entity.setHeightUnit(HeightUnit.getCd(item.getHeightUnitNm()));
-                entity.setHigh(item.getHigh());
-                entity.setHighUnit(HighUnit.getCd(item.getHighUnitNm()));
-                entity.setPodrPssblDvsn(PodrPssblDvsn.getCd(item.getPodrPssblDvsnNm()));
-                entity.setRtnPssblYn(item.getRtnPssblYn());
-                entity.setExpryYn(item.getExpryYn());
-                entity.setExpryPeriod(item.getExpryPeriod());
-                entity.setRtnDvsn(RtnDvsn.getCd(item.getRtnDvsnNm()));
-                entity.setImpDvsn(ImpDvsn.getCd(item.getImpDvsnNm()));
-                entity.setPchItemYn(item.getPchItemYn());
-                entity.setSaleItemYn(item.getSaleItemYn());
-                entity.setItemType( ItemType.getCd( item.getItemTypeNm() )  );
-                entity.setBarcode(item.getBarcode());
-                entity.setStoreDeliTypeNm(item.getStoreDeliTypeNm());
-                entity.setStoreDeliType(item.getStoreDeliTypeNm()=="본사배송" ? "10":"20" );
-                entity.setSysRegId(userId);
-                entity.setSysChgId(userId);
+                ItemEntity entity = toItemEntity(userId, saveItemListRequest, item);
 
                 // 품목 아이디 부여  22  entity.setContentsNo(fnGetKeyNo(17));
                 // entity.setItemId(fnGetDealNo(26, ""));  // 품목아이디 생성
                 entity.setItemId(sessionService.getKeyInfo("It").getKeyData());  // 품목아이디 생성
                 itemMapper.insertItemInfo(userId, entity);
             }
+
+            // TODO 오더퀸 연동 - 오더퀸연동 정보가 없어 진행불가
+
         } catch (GlobalException e) {
             e.getStackTrace();
             throw new GlobalException(e.getSystemMessageCode());
@@ -360,6 +366,42 @@ public class ItemService extends CommonService {
         }
     }
 
+    private ItemEntity toItemEntity(String userId, SaveItemListRequest saveItemListRequest, SaveItemListData item) {
+        ItemEntity entity = new ItemEntity();
+        entity.setItemNm(item.getItemNm());
+        entity.setItemStCd("IS00"); // 사용
+        entity.setBrandId(saveItemListRequest.getBrandId());
+        entity.setUnit(DstrbtCostUnit.getCd(item.getUnitNm())); // 단위
+        // entity.setPchUnit(item.getPchUnit()); // 구매단위
+        // entity.setSaleUnit(item.getSaleUnit()); // 판매단위
+        // entity.setStckUnit(item.getStckUnit()); // 재고단위
+        entity.setWeight(item.getWeight());
+        entity.setWeightUnit(WeightUnit.getCd(item.getWeightUnitNm()));
+        entity.setVolume(item.getVolume());
+        entity.setVolumeUnit(VolumeUnit.getCd(item.getVolumeUnitNm()));
+        entity.setWidth(item.getWidth());
+        entity.setWidthUnit(WidthUnit.getCd(item.getWidthUnitNm()));
+        entity.setHeight(item.getHeight());
+        entity.setHeightUnit(HeightUnit.getCd(item.getHeightUnitNm()));
+        entity.setHigh(item.getHigh());
+        entity.setHighUnit(HighUnit.getCd(item.getHighUnitNm()));
+        entity.setPodrPssblDvsn(PodrPssblDvsn.getCd(item.getPodrPssblDvsnNm()));
+        entity.setRtnPssblYn(item.getRtnPssblYn());
+        entity.setExpryYn(item.getExpryYn());
+        entity.setExpryPeriod(item.getExpryPeriod());
+        entity.setRtnDvsn(RtnDvsn.getCd(item.getRtnDvsnNm()));
+        entity.setImpDvsn(ImpDvsn.getCd(item.getImpDvsnNm()));
+        entity.setPchItemYn(item.getPchItemYn());
+        entity.setSaleItemYn(item.getSaleItemYn());
+        entity.setItemType(ItemType.getCd(item.getItemTypeNm()));
+        entity.setBarcode(item.getBarcode());
+        entity.setStoreDeliTypeNm(item.getStoreDeliTypeNm());
+        entity.setStoreDeliType(item.getStoreDeliTypeNm() == "본사배송" ? "10" : "20");
+        entity.setSysRegId(userId);
+        entity.setSysChgId(userId);
+        return entity;
+    }
+
     //
     /*
        품목분류 리스트 조회
@@ -499,19 +541,17 @@ public class ItemService extends CommonService {
 
     /* 바코드 품목 정보 조회 */
     public BarcodeItemInfoResponse selectBarcodeItemMInfo(String sBrandId, String sStoreId, String sBarcode) throws Exception {
-        ItemUnitEntity entity = null ;
+        ItemUnitEntity entity = null;
 
         if (StringUtil.isEmpty(sStoreId)) {
             entity = itemUnitMapper.selectBarcodeItemBrandUnitInfo(sBrandId, sBarcode);
         } else {
-            entity = itemUnitMapper.selectBarcodeItemStoreUnitInfo(sBrandId, sStoreId,sBarcode);
+            entity = itemUnitMapper.selectBarcodeItemStoreUnitInfo(sBrandId, sStoreId, sBarcode);
         }
-          return BarcodeItemInfoResponse.toDTO(entity);
+        return BarcodeItemInfoResponse.toDTO(entity);
     }
 
 
-
-
     public StroeWishListResponse selectPopWishGridList(String sStoreId) throws Exception {
         List<ItemUnitEntity> entities = itemUnitMapper.selectPopWishGridList(sStoreId);
         return StroeWishListResponse.toDTO(entities);
@@ -529,7 +569,7 @@ public class ItemService extends CommonService {
 
         gridRecords = itemUnitMapper.selectPopItemStoreUnitWishGridCnt(sBrandId, sStoreId, sWishListMgntNo);
         gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
-        List<ItemUnitEntity>  entities = itemUnitMapper.selectPopItemStoreUnitWishGridList(sBrandId, sStoreId, sWishListMgntNo, gridRequest);
+        List<ItemUnitEntity> entities = itemUnitMapper.selectPopItemStoreUnitWishGridList(sBrandId, sStoreId, sWishListMgntNo, gridRequest);
 
         List<Object> gridRows = entities.stream()
                 .map(m -> ItemPopSearchResponse.builder()
@@ -554,7 +594,6 @@ public class ItemService extends CommonService {
     }
 
 
-
     /*
       팝업 품목 리스트 조회
      */
@@ -566,10 +605,10 @@ public class ItemService extends CommonService {
         int gridTotal = 0;
         List<ItemUnitEntity> entities = new ArrayList<ItemUnitEntity>();
 
-        int podrNum = ApiConstants.LACK_STOCK_PODR_NUM ;
+        int podrNum = ApiConstants.LACK_STOCK_PODR_NUM;
 
         if (StringUtil.isEmpty(sStoreId)) {
-            gridRecords = itemUnitMapper.selectPopBrandItemLackStockGridCnt(sBrandId,  sWhsId);
+            gridRecords = itemUnitMapper.selectPopBrandItemLackStockGridCnt(sBrandId, sWhsId);
             gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
             entities = itemUnitMapper.selectPopBrandItemLackStockGridList(sBrandId, sWhsId, podrNum, gridRequest);
         } else {

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

@@ -396,9 +396,9 @@ public class StoreBaseInfoService extends CommonService {
             StoreBaseInfoEntity infoEntity = storeBaseInfoMapper.selectStoreInfo(saveStoreInfolRequest.getBrandId(), saveStoreInfolRequest.getStoreId());
             if (!StringUtil.isEmpty(infoEntity.getOqBrandId()) && !StringUtil.isEmpty(infoEntity.getOqStoreId())) {
                 OqScmStoreChangeReqModel req = toOqScmStoreChangeReqModel(infoEntity);
-                OqScmStoreChangeResModel result = oqlinkClient.changeScmStore(HmacUtil.makeHmacValue4OqLink(req), req);
-                if (SystemMessageCode.BO_IF_OK.getId() != Integer.parseInt(result.getCode())) {
-                    throw new GlobalException(SystemMessageCode.valueOf(Integer.valueOf(result.getCode())));
+                OqScmStoreChangeResModel res = oqlinkClient.changeScmStore(HmacUtil.makeHmacValue4OqLink(req), req);
+                if (SystemMessageCode.BO_IF_OK.getId() != Integer.parseInt(res.getCode())) {
+                    throw new GlobalException(SystemMessageCode.valueOf(Integer.valueOf(res.getCode())));
                 }
             }
         } catch (GlobalException e) {