매장정보 저장 오더퀸 연동

src/main/java/com/oqpo/api/client/oqlink/OqlinkClient.java

@@ -14,15 +14,24 @@ public interface OqlinkClient {
     @ResponseBody
     OqScmBrandInfoResModel getScmBrandInfo(@RequestHeader("Hmac") String hmac, @RequestBody OqScmBrandInfoReqModel model);
 
-    @PostMapping("/orderqueen_link/oq/scm/menu/reg")
+    @PostMapping("/orderqueen_link/oq/scm/store/info")
     @ResponseBody
-    OqScmMenuRegResModel regScmMenu(@RequestHeader("Hmac") String hmac, @RequestBody OqScmMenuRegReqModel model);
+    OqScmStoreInfoResModel getScmStoreInfo(@RequestHeader("Hmac") String hmac, @RequestBody OqScmStoreInfoReqModel model);
 
     @PostMapping("/orderqueen_link/oq/scm/store/change")
     @ResponseBody
     OqScmStoreChangeResModel changeScmStore(@RequestHeader("Hmac") String hmac, @RequestBody OqScmStoreChangeReqModel model);
 
-    @PostMapping("/orderqueen_link/oq/scm/store/info")
+    @PostMapping("/orderqueen_link/oq/scm/menu/reg")
     @ResponseBody
-    OqScmStoreInfoResModel getScmStoreInfo(@RequestHeader("Hmac") String hmac, @RequestBody OqScmStoreInfoReqModel model);
+    OqScmMenuRegResModel regScmMenu(@RequestHeader("Hmac") String hmac, @RequestBody OqScmMenuRegReqModel model);
+
+    @PostMapping("/orderqueen_link/oq/scm/menu/change")
+    @ResponseBody
+    OqScmMenuRegResModel changeScmMenu(@RequestHeader("Hmac") String hmac, @RequestBody OqScmMenuRegReqModel model);
+
+    @PostMapping("/orderqueen_link/oq/scm/store/price/change")
+    @ResponseBody
+    OqScmStorePriceChangeResModel changeScmStorePrice(@RequestHeader("Hmac") String hmac, @RequestBody OqScmStorePriceChangeReqModel model);
+
 }

src/main/java/com/oqpo/api/client/oqlink/dto/OqScmStorePriceChangeReqModel.java

@@ -0,0 +1,19 @@
+package com.oqpo.api.client.oqlink.dto;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "매장 단가 변경 요청")
+@Data
+public class OqScmStorePriceChangeReqModel {
+
+	@ApiModelProperty(value = "브랜드코드", required = true)
+	private String brandCd;
+	@ApiModelProperty(value = "매장번호", required = true)
+	private String storeNo;
+	@ApiModelProperty(value = "메뉴 리스트", required = true)
+	private List<OqScmMenuModel> menuList;
+}

src/main/java/com/oqpo/api/client/oqlink/dto/OqScmStorePriceChangeResModel.java

@@ -0,0 +1,22 @@
+package com.oqpo.api.client.oqlink.dto;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@ApiModel(description = "매장 단가 변경 응답")
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class OqScmStorePriceChangeResModel extends OqScmApiResModel{
+
+	@ApiModelProperty(value = "브랜드코드", required = true)
+	private String brandCd;
+	@ApiModelProperty(value = "매장번호", required = true)
+	private String storeNo;
+	@ApiModelProperty(value = "메뉴 리스트", required = true)
+	private List<OqScmMenuModel> menuList;
+	
+}

src/main/java/com/oqpo/api/client/oqlink/dto/StoreMenuInboundModel.java

@@ -0,0 +1,61 @@
+package com.oqpo.api.client.oqlink.dto;
+
+import java.util.List;
+
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class StoreMenuInboundModel {
+
+	@ApiModelProperty(value = "입고번호", required = true)
+	private String inboundNo;
+	@ApiModelProperty(value = "브랜드코드", required = true)
+	private String brandCd;
+	@ApiModelProperty(value = "매장번호", required = true)
+	private String storeNo;
+	private String storeNm;
+	@ApiModelProperty(value = "메뉴코드", required = true)
+	private String menuCd;
+	@ApiModelProperty(value = "메뉴명", required = false)
+	private String menuNm;
+	@ApiModelProperty(value = "입고유형(10:입고,20:재고수량수정)", required = true)
+	private String inboundType;
+	private String inboundTypeNm;
+	@ApiModelProperty(value = "입고수량", required = true)
+	private String inboundCnt;
+	@ApiModelProperty(value = "조정수량", required = true)
+	private String adjustCnt;	
+	@ApiModelProperty(value = "입고가", required = true)
+	private String inboundPrice;
+	@ApiModelProperty(value = "판매가", required = true)
+	private String salePrice;
+	@ApiModelProperty(value = "판매수량", required = true)
+	private String saleCnt;
+	@ApiModelProperty(value = "비고", required = false)
+	private String note;
+	@ApiModelProperty(value = "발주요청번호", required = false)
+	private String orderReqNo;
+	@ApiModelProperty(value = "판매완료여부", required = false)
+	private String saleEndYn;
+
+	@ApiModelProperty(value = "알림최소수량(안전재고)", required = false)
+	private String notifyMinCnt;
+
+	@ApiModelProperty(value = "이력순번", required = false)
+	private String hstSeq;
+	
+	private String schStoreNo;
+	private String schClassCd;
+	private String barcodeNo;
+	private String schSDate;
+	private String schEDate;
+	private String delYn;
+	private String regId;
+	private String editId;
+
+}

src/main/java/com/oqpo/api/client/oqlink/dto/StoreMenuInventModel.java

@@ -0,0 +1,77 @@
+package com.oqpo.api.client.oqlink.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class StoreMenuInventModel {
+
+	@ApiModelProperty(value = "브랜드코드", required = true)
+	private String brandCd;
+	@ApiModelProperty(value = "매장번호", required = true)
+	private String storeNo;
+	@ApiModelProperty(value = "메뉴코드", required = true)
+	private String menuCd;
+	@ApiModelProperty(value = "메뉴명", required = true)
+	private String menuNm;
+	@ApiModelProperty(value = "판매일자", required = true)
+	private String saleDate;
+	@ApiModelProperty(value = "기초재고수량", required = true)
+	private String baseInventCnt;
+	@ApiModelProperty(value = "입고수량", required = true)
+	private String inboundCnt;
+	@ApiModelProperty(value = "조정수량", required = true)
+	private String adjustCnt;
+	@ApiModelProperty(value = "판매수량", required = true)
+	private String saleCnt;
+	@ApiModelProperty(value = "반납수량", required = true)
+	private String returnCnt;
+	@ApiModelProperty(value = "폐기수량", required = true)
+	private String disuseCnt;
+
+	@ApiModelProperty(value = "재고수량", required = true)
+	private String inventCnt;
+	@ApiModelProperty(value = "재고변경일시", required = false)
+	private String inventChgDtm;
+	@ApiModelProperty(value = "비고", required = false)
+	private String note;
+
+	@ApiModelProperty(value = "알림최소수량(안전재고)", required = false)
+	private String notifyMinCnt;
+
+	@ApiModelProperty(value = "공급가격", required = false)
+	private String supplyPrice;
+	@ApiModelProperty(value = "이벤트가격", required = false)
+	private String eventPrice;
+
+	@ApiModelProperty(value = "발주단위수량", required = false)
+	private String orderUnitQty;
+	@ApiModelProperty(value = "판매여부", required = false)
+	private String useYn;
+	@ApiModelProperty(value = "발주가능여부", required = true)
+	private String orderPossibleYn;
+
+	private String schStoreNo;
+	private String schClassCd;
+	private String barcodeNo;
+	private String schSDate;
+	private String schEDate;
+	private String schSortType;
+	private String schUseYn;
+	
+	private String excelFullPath; // 엑셀전체경로
+	private String normalYn = "Y"; // 정상여부
+	private String errorMsg; // 오류 메시지
+	private String storeMenuOrderYn; // 매장수발주관리여부
+
+	private String schDate; // 조회일자
+	private String schYear; // 조회년
+	private String schMonth; // 조회월
+	private String schType; // 조회구분(D:일,M:월)
+	private String yyyyMm; // 분할테이블
+
+	private String regId;
+	private String editId;
+}

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

@@ -0,0 +1,52 @@
+package com.oqpo.api.enums;
+
+import lombok.Getter;
+import lombok.Setter;
+
+public enum StoreDvsn {
+
+    DIRECT("S01", "직영", "1"), //
+    FRANCHISEE("S02", "가맹", "2"), //
+    SINGLE("S03", "단독", "3"), //
+    ;
+    // 1:체인직영,2:체인가맹,3:단독매장
+
+    StoreDvsn(String cd, String nm, String oqValue) {
+        this.cd = cd;
+        this.name = nm;
+        this.oqValue = oqValue;
+    }
+
+    @Getter
+    @Setter
+    private String cd;
+
+    @Getter
+    @Setter
+    private String name;
+
+    @Getter
+    @Setter
+    private String oqValue;
+
+    public static String getOqValue(String ccd) {
+        StoreDvsn[] values = StoreDvsn.values();
+        for (StoreDvsn icd : values) {
+            if (icd.cd.equals(ccd)) {
+                return icd.oqValue;
+            }
+        }
+        return ccd;
+    }
+
+    public static String getName(String ccd) {
+        StoreDvsn[] values = StoreDvsn.values();
+        for (StoreDvsn icd : values) {
+            if (icd.cd.equals(ccd)) {
+                return icd.name;
+            }
+        }
+        return ccd;
+    }
+
+}

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

@@ -0,0 +1,51 @@
+package com.oqpo.api.enums;
+
+import lombok.Getter;
+import lombok.Setter;
+
+public enum StoreStCd {
+
+    OPEN("ST01", "오픈", "1"), //
+    HOLD("ST02", "보류", "2"), //
+    CLOSE("ST03", "폐점", "9"), //
+    ;
+
+    StoreStCd(String cd, String nm, String oqValue) {
+        this.cd = cd;
+        this.name = nm;
+        this.oqValue = oqValue;
+    }
+
+    @Getter
+    @Setter
+    private String cd;
+
+    @Getter
+    @Setter
+    private String name;
+
+    @Getter
+    @Setter
+    private String oqValue;
+
+    public static String getOqValue(String ccd) {
+        StoreStCd[] values = StoreStCd.values();
+        for (StoreStCd icd : values) {
+            if (icd.cd.equals(ccd)) {
+                return icd.oqValue;
+            }
+        }
+        return ccd;
+    }
+
+    public static String getName(String ccd) {
+        StoreStCd[] values = StoreStCd.values();
+        for (StoreStCd icd : values) {
+            if (icd.cd.equals(ccd)) {
+                return icd.name;
+            }
+        }
+        return ccd;
+    }
+
+}

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

@@ -10,6 +10,8 @@ import com.oqpo.api.entity.stinfo.StoreBaseInfoEntity;
 import com.oqpo.api.entity.stockmng.WhsMgntBaseInfoEntity;
 import com.oqpo.api.entity.stockmng.WhsMgntBaseLocEntity;
 import com.oqpo.api.enums.IfCode;
+import com.oqpo.api.enums.StoreDvsn;
+import com.oqpo.api.enums.StoreStCd;
 import com.oqpo.api.exception.GlobalException;
 import com.oqpo.api.mapper.loan.LoanMgntMapper;
 import com.oqpo.api.mapper.oper.UserMngMapper;
@@ -17,6 +19,7 @@ import com.oqpo.api.mapper.stinfo.BrandMapper;
 import com.oqpo.api.mapper.stinfo.StoreBaseInfoMapper;
 import com.oqpo.api.service.CommonService;
 import com.oqpo.api.service.stockmng.WhsMngService;
+import com.oqpo.api.util.StringUtil;
 import com.oqpo.api.web.dto.request.GridRequest;
 import com.oqpo.api.web.dto.request.ifmng.BoStoreChgInfoRequest;
 import com.oqpo.api.web.dto.request.stinfo.store.SaveStoreInfolRequest;
@@ -86,7 +89,6 @@ public class StoreBaseInfoService extends CommonService {
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
     }
 
-
     /*
       매장 그리드 리스트 조회
      */
@@ -389,57 +391,9 @@ public class StoreBaseInfoService extends CommonService {
             }
 
             // TODO 백오피스 연동 (store_base_info 테이블 참조)
-            OqScmStoreChangeReqModel req = new OqScmStoreChangeReqModel();
-
-            /*
-            * @ApiModelProperty(value = "브랜드코드", required = true)
-	private String brandCd;
-	@ApiModelProperty(value = "매장번호", required = true)
-	private String storeNo;
-	@ApiModelProperty(value = "브랜드아이디", required = true)
-	private String brandId;
-	@ApiModelProperty(value = "매장아이디", required = true)
-	private String storeId;
-	@ApiModelProperty(value = "매장형태 (1:체인직영,2:체인가맹,3:단독매장)", required = true)
-	private String storeType;
-	@ApiModelProperty(value = "매장상태 (1:오픈,2:보류,9:폐점)", required = true)
-	private String storeStatus;
-	@ApiModelProperty(value = "매장명", required = true)
-	private String storeNm;
-	@ApiModelProperty(value = "사업자번호", required = true)
-	private String bizNo;
-	@ApiModelProperty(value = "업태", required = true)
-	private String bizCat;
-	@ApiModelProperty(value = "업종", required = true)
-	private String bizCon;
-	@ApiModelProperty(value = "대표자", required = true)
-	private String ownerNm;
-	@ApiModelProperty(value = "전화번호", required = true)
-	private String tel;
-	@ApiModelProperty(value = "휴대번호", required = true)
-	private String cell;
-	@ApiModelProperty(value = "팩스", required = true)
-	private String fax;
-	@ApiModelProperty(value = "이메일", required = true)
-	private String email;
-	@ApiModelProperty(value = "우편번호", required = true)
-	private String zipno;
-	@ApiModelProperty(value = "주소1", required = true)
-	private String addr1;
-	@ApiModelProperty(value = "주소2", required = true)
-	private String addr2;
-	@ApiModelProperty(value = "지역코드", required = true)
-	private String areaCd;
-	@ApiModelProperty(value = "오픈일", required = true)
-	private String openDate;
-	@ApiModelProperty(value = "폐점일", required = true)
-	private String closeDate;
-	@ApiModelProperty(value = "사용여부", required = true)
-	private String useYn;
-            *
-            * */
-
-            // oqlinkClient.changeScmStore(HmacUtil.makeHmacValue4OqLink(req), req);
+            StoreBaseInfoEntity infoEntity = storeBaseInfoMapper.selectStoreInfo(saveStoreInfolRequest.getBrandId(), saveStoreInfolRequest.getStoreId());
+            OqScmStoreChangeReqModel req = toOqScmStoreChangeReqModel(infoEntity);
+            oqlinkClient.changeScmStore(HmacUtil.makeHmacValue4OqLink(req), req);
         } catch (GlobalException e) {
             e.printStackTrace();
             throw new GlobalException(e.getSystemMessageCode());
@@ -449,6 +403,32 @@ public class StoreBaseInfoService extends CommonService {
         }
     }
 
+    private OqScmStoreChangeReqModel toOqScmStoreChangeReqModel(StoreBaseInfoEntity infoEntity) {
+        OqScmStoreChangeReqModel req = new OqScmStoreChangeReqModel();
+        req.setBrandCd(infoEntity.getOqBrandId()); // 브랜드코드
+        req.setStoreNo(infoEntity.getOqStoreId()); // 매장번호
+        req.setBrandId(infoEntity.getBrandId()); // 브랜드아이디
+        req.setStoreId(infoEntity.getStoreId()); // 매장아이디
+        req.setStoreType(StoreDvsn.getOqValue(infoEntity.getStoreDvsn())); // 매장형태 (1:체인직영,2:체인가맹,3:단독매장)
+        req.setStoreStatus(StoreStCd.getOqValue(infoEntity.getStoreStCd())); // 매장상태 (1:오픈,2:보류,9:폐점)
+        req.setStoreNm(infoEntity.getStoreNm()); // 매장명
+        req.setBizNo(infoEntity.getBsnsRegNo()); // 사업자번호
+        req.setBizCat(infoEntity.getBsnsCndt()); // 업태
+        req.setBizCon(infoEntity.getCtgrBsns()); // 업종
+        req.setOwnerNm(infoEntity.getOwnerNm()); // 대표자
+        req.setTel(infoEntity.getTelNo()); // 전화번호
+        req.setCell(infoEntity.getMblNo()); // 휴대번호
+        req.setFax(infoEntity.getFaxNo()); // 팩스
+        req.setEmail(infoEntity.getEmalAddr()); // 이메일
+        req.setZipno(infoEntity.getZipNo()); // 우편번호
+        req.setAddr1(infoEntity.getAddr1()); // 주소1
+        req.setAddr2(infoEntity.getAddr2()); // 주소2
+        req.setAreaCd(infoEntity.getAreaCd()); // 지역코드
+        req.setOpenDate(infoEntity.getOpenDt()); // 오픈일
+        req.setCloseDate(infoEntity.getCloseDt()); // 폐점일
+        req.setUseYn("Y".equals(infoEntity.getDelYn()) ? "N" : "Y"); // 사용여부
+        return req;
+    }
 
     /*
    매장 로그인 pw 초기화
@@ -470,7 +450,6 @@ public class StoreBaseInfoService extends CommonService {
         }
     }
 
-
     /*
    오피스 매장변경 정보 수신
    */