브랜드관리 부분 수정 및 기존 버그 수정

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

@@ -15,10 +15,14 @@ public class BrandEntity implements Serializable {
     private String brandId;
     private String brandNm;
     private String stCd;
+    private String stNm;
     private String brandType;
+    private String brandTypeNm;
     private String zipNo;
     private String addr1;
     private String addr2;
+    private String latX;
+    private String longY;
     private String telNo;
     private String faxNo;
     private String regDt;
@@ -33,6 +37,7 @@ public class BrandEntity implements Serializable {
     private String brandLogoFileNo;
     private String bsnsRegNo;
     private String corpRegNo;
+    private String oqBrandId;
     private String sysRegDttm;
     private String sysRegId;
     private String sysChgDttm;

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

@@ -1,6 +1,7 @@
 package com.oqpo.api.mapper.stinfo;
 
 
+import com.oqpo.api.entity.oper.SaleMgrMgntEntity;
 import com.oqpo.api.entity.stinfo.BrandEntity;
 import com.oqpo.api.web.dto.request.GridRequest;
 import org.apache.ibatis.annotations.Mapper;
@@ -18,4 +19,14 @@ public interface BrandMapper {
 
     List<BrandEntity> selectAfflBrandList(@Param("afflShopId") String afflShopId)throws Exception;
 
+    List<BrandEntity> selectBrandGridList(@Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sBrandNm") String sBrandNm, @Param("sBrandType") String sBrandType , @Param("sStCd") String sStCd  , GridRequest gridRequest)throws Exception;
+    int selectBrandGridCnt(@Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sBrandNm") String sBrandNm, @Param("sBrandType") String sBrandType , @Param("sStCd") String sStCd )throws Exception;
+
+    BrandEntity selectBrandInfo(@Param("brandId") String brandId)throws Exception;
+
+    int insertBrandInfo(@Param("userId") String userId, BrandEntity entity) throws Exception;
+    int updateBrandInfo(@Param("userId") String userId, BrandEntity entity) throws Exception;
+
+    String selectBrandInitPw(@Param("brandId") String brandId )throws Exception;
+
 }

src/main/java/com/oqpo/api/service/oper/AfflService.java

@@ -162,6 +162,7 @@ public class AfflService extends CommonService {
                 afflMapper.updateAfflShopBaseInfo(userId, entity);
 
                 UserMngEntity userUEntity = new UserMngEntity();
+                userUEntity.setUserId(entity.getAfflShopId());
                 userUEntity.setTelNo(entity.getRprstTelNo());
                 userUEntity.setEmail(entity.getRprstEmai());
 

src/main/java/com/oqpo/api/service/oper/SaleMgrMgnService.java

@@ -50,7 +50,6 @@ public class SaleMgrMgnService extends CommonService {
 
         int gridRecords = saleMgrMgnMapper.selectPopSaleMgrMgnGridCnt(sSaleMgrNm);
 
-        System.out.println("============><========================================") ;
         int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
         List<SaleMgrMgntEntity> entities = saleMgrMgnMapper.selectPopSaleMgrMgnGridList(sSaleMgrNm, gridRequest);
         List<Object> gridRows = entities.stream()
@@ -97,7 +96,6 @@ public class SaleMgrMgnService extends CommonService {
     }
 
     /* 영업담당자 저장 */
-
     @Transactional
     public void saveSaleMgrMgn(String userId, SaveSaleMgrMgnlRequest saveSaleMgrMgnlRequest) throws Exception {
         try {
@@ -148,6 +146,7 @@ public class SaleMgrMgnService extends CommonService {
                 saleMgrMgnMapper.updateSaleMgrMgn(userId, entity);
 
                 UserMngEntity userUEntity = new UserMngEntity();
+                userUEntity.setUserId(entity.getSaleMgrId());
                 userUEntity.setTelNo(entity.getRprstTelNo());
                 userUEntity.setEmail(entity.getRprstEmai());
 
@@ -175,13 +174,15 @@ public class SaleMgrMgnService extends CommonService {
      영업담당자 아이디 중복체크
      */
     public String selectSaleMgrIdDupYn(String saleMgrId) throws Exception {
-        return saleMgrMgnMapper.selectSaleMgrIdDupYn(saleMgrId);
+        return userMngMapper.selectUserIdDupYn(saleMgrId);
+        //return saleMgrMgnMapper.selectSaleMgrIdDupYn(saleMgrId);
     }
 
 
     /*
   영업담당자 비번  초기화
    */
+    @Transactional
     public String selectSaleMgrInitPw(String userId, String saleMgrId) throws Exception {
         // 사용자 정보를 가져옴
         String initPw  = saleMgrMgnMapper.selectSaleMgrInitPw(saleMgrId);

src/main/java/com/oqpo/api/service/oper/UserMngService.java

@@ -143,6 +143,7 @@ public class UserMngService extends CommonService {
     /*
    사용자 pw 초기화
     */
+    @Transactional
     public String updateInitUserPw(String userId) throws Exception {
         // 사용자 정보를 가져옴
         UserMngEntity entity = userMngMapper.selectUserInfo(userId);
@@ -261,6 +262,7 @@ public class UserMngService extends CommonService {
     /*
    사용자 pw 변경
     */
+    @Transactional
     public void updateChgUserPw(String userId, String newPw) throws Exception {
         String password = passwordEncoder.encode(newPw);//aes256.aesEncode(entity.getTelNo());
         userMngMapper.updateInitUserPw(userId, password);

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

@@ -2,18 +2,27 @@ package com.oqpo.api.service.stinfo;
 
 
 
-import com.oqpo.api.entity.CodeEntity;
+import com.oqpo.api.entity.oper.SaleMgrMgntEntity;
+import com.oqpo.api.entity.oper.UserMngEntity;
 import com.oqpo.api.entity.stinfo.BrandEntity;
+import com.oqpo.api.exception.GlobalException;
+import com.oqpo.api.mapper.oper.UserMngMapper;
 import com.oqpo.api.mapper.stinfo.BrandMapper;
 import com.oqpo.api.service.CommonService;
 import com.oqpo.api.web.dto.request.GridRequest;
+import com.oqpo.api.web.dto.request.oper.salemgr.SaveSaleMgrMgnlRequest;
+import com.oqpo.api.web.dto.request.stinfo.brand.SaveBrandInfolRequest;
 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.BrandSearchResponse;
+import com.oqpo.api.web.dto.response.oper.salemgr.SaleMgrMgnInfoResponse;
+import com.oqpo.api.web.dto.response.stinfo.brand.BrandInfoResponse;
+import com.oqpo.api.web.dto.response.stinfo.brand.BrandSearchListResponse;
+import com.oqpo.api.web.dto.response.stinfo.brand.BrandSearchResponse;
 import com.oqpo.api.web.dto.response.stinfo.brand.AfflBrandSearchResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -24,6 +33,12 @@ public class BrandService extends CommonService {
     @Autowired
     private BrandMapper brandMapper;
 
+    @Autowired
+    private PasswordEncoder passwordEncoder;
+
+    @Autowired
+    private UserMngMapper userMngMapper;
+
     /*
       session 브랜드 리스트 조회
      */
@@ -61,4 +76,132 @@ public class BrandService extends CommonService {
         return AfflBrandSearchResponse.toDTO(entities);
     }
 
+    /*
+      브랜드 그리드 리스트 조회
+     */
+    public GridResponse selectBrandGridList( String fromDt, String toDt, String sBrandNm, String sBrandType, String sStCd, GridRequest gridRequest) throws Exception {
+        int gridPage = gridRequest.getGridPage();
+        int gridSize = gridRequest.getGridSize();
+
+        fromDt = fromDt == null ? null : fromDt.replace(".", "");
+        toDt = toDt == null ? null : toDt.replace(".", "");
+
+        int gridRecords = brandMapper.selectBrandGridCnt( fromDt, toDt,  sBrandNm, sBrandType, sStCd);
+        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+        List<BrandEntity> entities = brandMapper.selectBrandGridList(fromDt, toDt,  sBrandNm, sBrandType, sStCd, gridRequest);
+        List<Object> gridRows = entities.stream()
+                .map(m -> BrandSearchListResponse.builder()
+                        .viewCd("R")
+                        .afflShopId(m.getAfflShopId())
+                        .afflShopNm(m.getAfflShopNm())
+                        .brandId(m.getBrandId())
+                        .brandNm(m.getBrandNm())
+                        .stNm(m.getStNm())
+                        .brandTypeNm(m.getBrandTypeNm())
+                        .regDt(m.getRegDt())
+                        .build())
+                .collect(Collectors.toList());
+        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
+    }
+
+    /* 브랜드 정보 */
+    public BrandInfoResponse selectSaleMgrMgn(String brandId) throws Exception {
+        return BrandInfoResponse.toDTO(brandMapper.selectBrandInfo(brandId));
+    }
+
+    /* 브랜드 저장 */
+    @Transactional
+    public void saveBrandInfo(String userId, SaveBrandInfolRequest saveBrandInfolRequest) throws Exception {
+        try {
+
+            BrandEntity entity = new BrandEntity();
+            entity.setBrandId(saveBrandInfolRequest.getBrandId());
+            entity.setBrandNm(saveBrandInfolRequest.getBrandNm());
+            entity.setStCd(saveBrandInfolRequest.getStCd());
+            entity.setBrandType(saveBrandInfolRequest.getBrandType());
+            entity.setZipNo(saveBrandInfolRequest.getZipNo());
+            entity.setAddr1(saveBrandInfolRequest.getAddr1());
+            entity.setAddr2(saveBrandInfolRequest.getAddr2());
+            entity.setLatX(saveBrandInfolRequest.getLatX());
+            entity.setLongY(saveBrandInfolRequest.getLongY());
+            entity.setTelNo(saveBrandInfolRequest.getTelNo().replaceAll("-",""));
+            entity.setFaxNo(saveBrandInfolRequest.getFaxNo().replaceAll("-",""));
+            entity.setEmalAddr(saveBrandInfolRequest.getEmalAddr());
+            entity.setBnkCd(saveBrandInfolRequest.getBnkCd());
+            entity.setAcctNo(saveBrandInfolRequest.getAcctNo());
+            entity.setOwacNm(saveBrandInfolRequest.getOwacNm());
+            entity.setAfflShopId(saveBrandInfolRequest.getAfflShopId());
+            entity.setBrandLogoFileNo(saveBrandInfolRequest.getBrandLogoFileNo());
+            entity.setBsnsRegNo(saveBrandInfolRequest.getBsnsRegNo().replaceAll("-",""));
+            entity.setCorpRegNo(saveBrandInfolRequest.getCorpRegNo().replaceAll("-",""));
+
+            if ("C".equals(saveBrandInfolRequest.getViewCd())) {
+
+                // 브랜드 아이디 부여  22  entity.setContentsNo(fnGetKeyNo(17));
+                entity.setBrandId(fnGetKeyNo(23));  // 브랜드아이디 생성
+                brandMapper.insertBrandInfo(userId, entity);
+
+                //사용자 계정 정보 생성 및 권한생성
+                UserMngEntity userEntity = new UserMngEntity();
+                userEntity.setUserId(entity.getBrandId());
+                userEntity.setUserNm(entity.getBrandNm());
+                userEntity.setTelNo(entity.getTelNo());
+                userEntity.setEmail(entity.getEmalAddr());
+
+                if ("S000".equals(entity.getStCd())) {
+                    userEntity.setUserStatCd("10");
+                } else if ("S001".equals(entity.getStCd())) {
+                    userEntity.setUserStatCd("90");
+                } else {   //S002
+                    userEntity.setUserStatCd("30");
+                }
+
+                userEntity.setAuthTpCd("40");
+                //패스워드 암호화
+                String password = passwordEncoder.encode(entity.getBsnsRegNo().replace("-",""));
+                userEntity.setUserPw(password);
+                userMngMapper.insertUserInfo(userId, userEntity);
+
+                // 사용자 권한 등록
+                userMngMapper.insertUserTypeAuth(entity.getBrandId(), userId, "40");
+
+            } else if ("U".equals(saveBrandInfolRequest.getViewCd())) {
+                brandMapper.updateBrandInfo(userId, entity);
+
+                UserMngEntity userUEntity = new UserMngEntity();
+                userUEntity.setUserId(entity.getBrandId());
+                userUEntity.setTelNo(entity.getTelNo());
+                userUEntity.setEmail(entity.getEmalAddr());
+
+                if ("S000".equals(entity.getStCd())) {
+                    userUEntity.setUserStatCd("10");
+                } else if ("S001".equals(entity.getStCd())) {
+                    userUEntity.setUserStatCd("90");
+                } else {   //S002
+                    userUEntity.setUserStatCd("30");
+                }
+                userMngMapper.updateUserInfo(userId, userUEntity);
+            }
+
+        } catch (GlobalException e) {
+            e.getStackTrace();
+            throw new GlobalException(e.getSystemMessageCode());
+        } catch (Exception e) {
+            e.getStackTrace();
+            throw new RuntimeException();
+        }
+    }
+
+    /*
+  브랜드 로그인 pw 초기화
+   */
+    @Transactional
+    public String updateInitUserPw(String brandId) throws Exception {
+        // 사용자 정보를 가져옴
+        String initPw  = brandMapper.selectBrandInitPw(brandId);
+        String password = passwordEncoder.encode(initPw);
+        userMngMapper.updateInitUserPw(brandId, password);
+        return password;
+    }
+
 }

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

@@ -1,10 +1,18 @@
 package com.oqpo.api.web.controller.stinfo;
 
+import com.oqpo.api.enums.SystemMessageCode;
 import com.oqpo.api.service.stinfo.BrandService;
+import com.oqpo.api.web.dto.request.oper.affl.AfflShopBaseInfoGridRequest;
+import com.oqpo.api.web.dto.request.oper.affl.SaveAfflRequest;
 import com.oqpo.api.web.dto.request.stinfo.brand.BrandGridRequest;
+import com.oqpo.api.web.dto.request.stinfo.brand.BrandSearchGridRequest;
+import com.oqpo.api.web.dto.request.stinfo.brand.SaveBrandInfolRequest;
 import com.oqpo.api.web.dto.response.GridResponse;
+import com.oqpo.api.web.dto.response.SaveResponse;
 import com.oqpo.api.web.dto.response.code.CodeSearchListResponse;
+import com.oqpo.api.web.dto.response.oper.affl.AfflShopInfoResponse;
 import com.oqpo.api.web.dto.response.stinfo.brand.AfflBrandSearchResponse;
+import com.oqpo.api.web.dto.response.stinfo.brand.BrandInfoResponse;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -57,4 +65,80 @@ public class BrandController {
         return ResponseEntity.ok(brandService.selectAfflBrandList(afflShopId));
     }
 
+
+    /**
+     * 설명 : 브랜드 그리드 리스트
+     *
+     * @param brandSearchGridRequest
+     * @return
+     * @throws Exception
+     */
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = " 브랜드 그리드 리스트")
+    @PostMapping("/detail-grid-list")
+    public ResponseEntity<GridResponse> detailGridList(@RequestBody @Valid BrandSearchGridRequest brandSearchGridRequest) throws Exception {
+        return ResponseEntity.ok(brandService.selectBrandGridList( brandSearchGridRequest.getFromDt(), brandSearchGridRequest.getToDt(), brandSearchGridRequest.getSBrandNm(), brandSearchGridRequest.getSBrandType(), brandSearchGridRequest.getSStCd(),  brandSearchGridRequest.toDTO(brandSearchGridRequest)));
+    }
+
+
+
+    /**
+     * 설명 : 브랜드 정보
+     *
+     * @param brandId
+     * @return
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header"),
+            @ApiImplicitParam(name = "brandId", value = "브랜드번호", required = true, dataType = "String", paramType = "query")
+    })
+    @ApiOperation(value = "브랜드 정보")
+    @GetMapping("/info-brand")
+    public ResponseEntity<BrandInfoResponse> infoBrand(@RequestParam(value = "brandId") String brandId) throws Exception {
+        return ResponseEntity.ok(brandService.selectSaleMgrMgn(brandId));
+    }
+
+
+    /**
+     * 설명 : 브랜드 정보 저장
+     *
+     * @param userId
+     * @param SaveBrandInfolRequest
+     * @return SaveResponse
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = "브랜드정보  저장")
+    @PostMapping("/save-brand")
+    public ResponseEntity<SaveResponse> saveBrand(@ApiIgnore String userId, @RequestBody @Valid SaveBrandInfolRequest saveBrandInfolRequest) throws Exception {
+        brandService.saveBrandInfo(userId, saveBrandInfolRequest);
+        return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
+    }
+
+
+    /**
+     * 설명 : 브랜드 패스워드 초기화
+     *
+     * @param userId
+     * @param
+     * @return SaveResponse
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header"),
+            @ApiImplicitParam(name = "brandId", value = "브랜드아이디", required = true, dataType = "String", paramType = "query")
+    })
+    @ApiOperation(value = "브랜드 패스워드 초기화")
+    @GetMapping("/inti-brandPw")
+    public ResponseEntity<SaveResponse> initBrandPw(@RequestParam(value = "brandId") String brandId) throws Exception {
+        brandService.updateInitUserPw(brandId);
+        return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.INIT_PW_OK));
+    }
+
 }

src/main/java/com/oqpo/api/web/dto/request/stinfo/brand/BrandSearchGridRequest.java

@@ -0,0 +1,33 @@
+package com.oqpo.api.web.dto.request.stinfo.brand;
+
+import com.oqpo.api.web.dto.request.GridRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+
+@Getter
+@Setter
+public class BrandSearchGridRequest extends GridRequest {
+
+    @ApiModelProperty(value = "시작일자")
+    private String fromDt;
+
+    @ApiModelProperty(value = "종료일자")
+    private String toDt;
+
+    @ApiModelProperty(value = "브랜드명")
+    private String sBrandNm;
+
+    @ApiModelProperty(value = "브랜드타입")
+    private String sBrandType;
+
+    @ApiModelProperty(value = "상태")
+    private String sStCd;
+
+
+
+    protected BrandSearchGridRequest(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/brand/SaveBrandInfolRequest.java

@@ -0,0 +1,80 @@
+package com.oqpo.api.web.dto.request.stinfo.brand;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+public class SaveBrandInfolRequest {
+    @NotBlank
+    @ApiModelProperty(value = "CRUD")
+    private String viewCd;
+
+    @ApiModelProperty(value = "브랜명아이디")
+    private String brandId ;
+
+    @NotBlank
+    @ApiModelProperty(value = "브랜드명")
+    private String brandNm ;
+
+    @NotBlank
+    @ApiModelProperty(value = "상태코드")
+    private String stCd ;
+
+    @ApiModelProperty(value = "브랜드타입")
+    private String brandType ;
+
+    @ApiModelProperty(value = "우편번호")
+    private String zipNo;
+
+    @ApiModelProperty(value = "주소1")
+    private String addr1 ;
+
+    @ApiModelProperty(value = "주소2")
+    private String addr2 ;
+
+    @ApiModelProperty(value = "x위도")
+    private String latX;
+
+    @ApiModelProperty(value = "y경도")
+    private String longY;
+
+    @NotBlank
+    @ApiModelProperty(value = "전화번호")
+    private String telNo ;
+
+    @ApiModelProperty(value = "팩스번호")
+    private String faxNo ;
+
+    @ApiModelProperty(value = "이메일")
+    private String emalAddr ;
+
+    @NotBlank
+    @ApiModelProperty(value = "은행코드")
+    private String bnkCd ;
+
+    @NotBlank
+    @ApiModelProperty(value = "은행계좌번호")
+    private String acctNo;
+
+    @NotBlank
+    @ApiModelProperty(value = "예금주명")
+    private String owacNm ;
+
+    @NotBlank
+    @ApiModelProperty(value = "가맹점아이디")
+    private String afflShopId ;
+
+    @ApiModelProperty(value = "브랜드로고파일번호")
+    private String brandLogoFileNo ;
+
+    @NotBlank
+    @ApiModelProperty(value = "사업자번호")
+    private String bsnsRegNo ;
+
+    @ApiModelProperty(value = "법인번호")
+    private String corpRegNo;
+}

src/main/java/com/oqpo/api/web/dto/response/stinfo/brand/BrandInfoResponse.java

@@ -0,0 +1,138 @@
+package com.oqpo.api.web.dto.response.stinfo.brand;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.oqpo.api.entity.oper.SaleMgrMgntEntity;
+import com.oqpo.api.entity.stinfo.BrandEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@JsonInclude(JsonInclude.Include.ALWAYS)
+public class BrandInfoResponse {
+
+    @ApiModelProperty(value = "브랜명아이디")
+    private String brandId ;
+
+    @ApiModelProperty(value = "브랜드명")
+    private String brandNm ;
+
+    @ApiModelProperty(value = "상태코드")
+    private String stCd ;
+
+    @ApiModelProperty(value = "싱태명")
+    private String stNm ;
+
+    @ApiModelProperty(value = "브랜드타입")
+    private String brandType ;
+
+    @ApiModelProperty(value = "브랜드타입명")
+    private String brandTypeNm ;
+
+    @ApiModelProperty(value = "우편번호")
+    private String zipNo;
+
+    @ApiModelProperty(value = "주소1")
+    private String addr1 ;
+
+    @ApiModelProperty(value = "주소2")
+    private String addr2 ;
+
+    @ApiModelProperty(value = "x위도")
+    private String latX;
+
+    @ApiModelProperty(value = "y경도")
+    private String longY;
+
+    @ApiModelProperty(value = "전화번호")
+    private String telNo ;
+
+    @ApiModelProperty(value = "팩스번호")
+    private String faxNo ;
+
+    @ApiModelProperty(value = "등록일")
+    private String regDt;
+
+    @ApiModelProperty(value = "등록자")
+    private String regId ;
+
+    @ApiModelProperty(value = "이메일")
+    private String emalAddr ;
+
+    @ApiModelProperty(value = "은행코드")
+    private String bnkCd ;
+
+    @ApiModelProperty(value = "은행명")
+    private String bnkCdNm ;
+
+    @ApiModelProperty(value = "은행계좌번호")
+    private String acctNo;
+
+    @ApiModelProperty(value = "예금주명")
+   private String owacNm ;
+
+    @ApiModelProperty(value = "가맹점아이디")
+    private String afflShopId ;
+
+    @ApiModelProperty(value = "브랜드로고파일번호")
+    private String brandLogoFileNo ;
+
+    @ApiModelProperty(value = "사업자번호")
+    private String bsnsRegNo ;
+
+    @ApiModelProperty(value = "법인번호")
+    private String corpRegNo;
+
+    @ApiModelProperty(value = "오더퀸브랜드아이디")
+    private String oqBrandId ;
+
+    @ApiModelProperty(value = "시스템등록일")
+    private String sysRegDttm;
+
+    @ApiModelProperty(value = "시스템등록자")
+    private String sysRegId;
+
+    @ApiModelProperty(value = "시스템변경일")
+    private String sysChgDttm;
+
+    @ApiModelProperty(value = "시스템변경자")
+    private String sysChgId;
+
+    public static BrandInfoResponse toDTO(BrandEntity entity) {
+        if (entity == null) return null;
+        return BrandInfoResponse.builder()
+                .brandId(entity.getBrandId())
+                .brandNm(entity.getBrandNm())
+                .stCd(entity.getStCd())
+                .stNm(entity.getStNm())
+                .brandType(entity.getBrandType() == null ? "" :entity.getBrandType())
+                .brandTypeNm(entity.getBrandTypeNm() == null ? "" :entity.getBrandTypeNm())
+                .zipNo(entity.getZipNo() == null ? "" :entity.getZipNo())
+                .addr1(entity.getAddr1() == null ? "" :entity.getAddr1())
+                .addr2(entity.getAddr2() == null ? "" :entity.getAddr2())
+                .latX(entity.getLatX() == null ? "" :entity.getLatX())
+                .longY(entity.getLongY() == null ? "" :entity.getLongY())
+                .telNo(entity.getTelNo() == null ? "" :entity.getTelNo())
+                .faxNo(entity.getFaxNo() == null ? "" :entity.getFaxNo())
+                .regDt(entity.getRegDt() == null ? "" :entity.getRegDt())
+                .regId(entity.getRegId() == null ? "" :entity.getRegId())
+                .emalAddr(entity.getEmalAddr() == null ? "" :entity.getEmalAddr())
+                .bnkCd(entity.getBnkCd() == null ? "" :entity.getBnkCd())
+                .bnkCdNm(entity.getBrandNm() == null ? "" :entity.getBrandNm())
+                .acctNo(entity.getBrandNm() == null ? "" :entity.getBrandNm())
+                .owacNm(entity.getOwacNm() == null ? "" :entity.getOwacNm())
+                .afflShopId(entity.getAfflShopId() == null ? "" :entity.getAfflShopId())
+                .brandLogoFileNo(entity.getBrandLogoFileNo() == null ? "" :entity.getBrandLogoFileNo())
+                .bsnsRegNo(entity.getBsnsRegNo() == null ? "" :entity.getBsnsRegNo())
+                .corpRegNo(entity.getCorpRegNo() == null ? "" :entity.getCorpRegNo())
+                .oqBrandId(entity.getOqBrandId() == null ? "" :entity.getOqBrandId())
+                .sysRegDttm(entity.getSysRegDttm())
+                .sysRegId(entity.getRegId())
+                .sysChgDttm(entity.getSysChgDttm())
+                .sysChgId(entity.getSysChgId())
+                .build();
+    }
+}

src/main/java/com/oqpo/api/web/dto/response/stinfo/brand/BrandSearchListResponse.java

@@ -0,0 +1,38 @@
+package com.oqpo.api.web.dto.response.stinfo.brand;
+
+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 BrandSearchListResponse {
+
+    @ApiModelProperty(value = "CRUD")
+    private String viewCd;
+
+    @ApiModelProperty(value = "가맹점아이디")
+    private String afflShopId;
+
+    @ApiModelProperty(value = "가맹점명")
+    private String afflShopNm;
+
+    @ApiModelProperty(value = "브랜드아이디")
+    private String brandId;
+
+    @ApiModelProperty(value = "브랜드명")
+    private String brandNm;
+
+    @ApiModelProperty(value = "등록일")
+    private String regDt;
+
+    @ApiModelProperty(value = "브랜드상태명")
+    private String stNm;
+
+    @ApiModelProperty(value = "브랜드타입")
+    private String brandTypeNm;
+
+}

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

@@ -1,4 +1,4 @@
-package com.oqpo.api.web.dto.response.stinfo;
+package com.oqpo.api.web.dto.response.stinfo.brand;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;

src/main/resources/mybatis/sqlmaps/oper/Affl.xml

@@ -125,7 +125,7 @@
         select  /* selectAfflShopBaseIdDupYn */
                 case when count(*) <![CDATA[ > ]]> 0 then 'Y' else 'N' end as dup_yn
         from affl_shop_base_info
-        where affl_abbr = #{afflAbbr}
+        where affl_abbr in ('AFS','BRD','STR',#{afflAbbr})
     </select>
 
     <insert id="insertAfflShopBaseInfo" >

src/main/resources/mybatis/sqlmaps/oper/UserMng.xml

@@ -78,6 +78,7 @@
         select case when count(*) <![CDATA[ > ]]> 0 then 'Y' else 'N' end as cnt /* selectUserIdDupYn */
         from np_user_info
         where user_id = #{userId}
+        or left(upper(#{userId}),3) in ('AFS', 'BRD','STR' )
     </select>
 
     <insert id="insertUserInfo" >

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

@@ -83,5 +83,124 @@
         and affl_shop_id = #{afflShopId}
     </select>
 
+    <select id="selectBrandGridList" resultType="com.oqpo.api.entity.stinfo.BrandEntity">
+        select /*selectBrandGridList*/
+                affl.affl_shop_id, affl.affl_shop_nm, brand.brand_id, brand.brand_nm
+                , fn_code_nm(upper('st_cd'), brand.st_cd) as st_nm
+                , date_format(brand.reg_dt, '%y.%m.%d') as reg_dt
+                , fn_code_nm(upper('brand_type'), brand.brand_type) as brand_type_nm
+        from brand_base_info brand
+            , affl_shop_base_info affl
+        where 1 = 1
+        and brand.affl_shop_id = affl.affl_shop_id
+        and  brand.st_cd = 'S000'
+        and brand.del_yn = 'N'
+        and affl.del_yn = 'N'
+        <if test="fromDt != null and fromDt != '' and toDt != null and toDt != '' ">
+        and brand.reg_dt between #{fromDt} and #{toDt}
+        </if>
+        <if test="sBrandNm != null and sBrandNm != ''">
+        and brand.brand_nm like concat('%', #{sBrandNm}, '%')
+        </if>
+        <if test="sBrandType != null and sBrandType != ''">
+        and brand.brand_type = #{sBrandType}
+        </if>
+        <if test="sStCd != null and sStCd != ''">
+            and brand.st_cd = #{sStCd}
+        </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 brand_nm asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by brand_nm desc
+                    </if>
+                </if>
+            </when>
+            <otherwise>
+                order by brand_nm asc
+            </otherwise>
+        </choose>
+        <if test="gridRequest.pagingYn == true">
+            limit #{gridRequest.gridFirst}, #{gridRequest.gridSize}
+        </if>
+    </select>
+
+    <select id="selectBrandGridCnt" resultType="int">
+        select /*selectBrandGridCnt*/
+                count(*)
+        from brand_base_info
+        where 1 = 1
+        and st_cd = 'S000'
+        and del_yn = 'N'
+        <if test="fromDt != null and fromDt != '' and toDt != null and toDt != '' ">
+            and reg_dt between #{fromDt} and #{toDt}
+        </if>
+        <if test="sBrandType != null and sBrandType != ''">
+            and brand_nm like concat('%', #{sBrandType}, '%')
+        </if>
+        <if test="sBrandType != null and sBrandType != ''">
+            and brand_type = #{sBrandType}
+        </if>
+        <if test="sStCd != null and sStCd != ''">
+            and st_cd = #{sStCd}
+        </if>
+    </select>
+
+    <select id="selectBrandInfo" resultType="com.oqpo.api.entity.stinfo.BrandEntity">
+        select brand_id, brand_nm, st_cd, fn_code_nm(upper('st_cd'), st_cd) as st_cd_nm, brand_type, fn_code_nm(upper('brand_type'), brand_type) as brand_type_nm, zip_no
+                , addr1, addr2, lat_x, long_y, fn_get_telno(tel_no) as tel_no, fn_get_telno(fax_no) as fax_no, date_format(reg_dt, '%y.%m.%d') as reg_dt
+                , reg_id, emal_addr, del_yn, bnk_cd, fn_code_nm(upper('bnk_cd'), bnk_cd) as bnk_cd_nm, acct_no
+                , owac_nm, affl_shop_id, brand_logo_file_no, fn_get_regno(1, bsns_reg_no) as bsns_reg_no, fn_get_regno(2, corp_reg_no) as corp_reg_no
+                , oq_brand_id, sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id
+        from brand_base_info
+        where brand_id = #{brandId}
+    </select>
+
+    <insert id="insertBrandInfo" >
+        insert into brand_base_info
+            ( brand_id, brand_nm, st_cd, brand_type, zip_no
+            , addr1, addr2, tel_no, fax_no, reg_dt
+            , reg_id, emal_addr, del_yn, bnk_cd, acct_no
+            , owac_nm, affl_shop_id, brand_logo_file_no, bsns_reg_no, corp_reg_no
+            , oq_brand_id, sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id )
+        values
+            ( #{entity.brandId}, #{entity.brandNm}, #{entity.stCd}, #{entity.brandType}, #{entity.zipNo}
+            , #{entity.addr1}, #{entity.addr2}, #{entity.telNo}, #{entity.faxNo}, #{entity.regDt}
+            , #{userId}, #{entity.emalAddr}, 'N', #{entity.bnkCd}, #{entity.acctNo}
+            , #{entity.owacNm}, #{entity.afflShopId}, #{entity.brandLogoFileNo}, #{entity.bsnsRegNo}, #{entity.corpRegNo}
+            , #{entity.oqBrandId}, now(), #{userId}, now(), #{userId})
+    </insert>
+
+    <update id="updateBrandInfo">
+        update brand_base_info
+        set brand_nm = #{entity.brandNm}
+          , st_cd = #{entity.stCd}
+          , brand_type = #{entity.brandType}
+          , zip_no = #{entity.zipNo}
+          , addr1 = #{entity.addr1}
+          , addr2 = #{entity.addr2}
+          , tel_no = #{entity.telNo}
+          , fax_no = #{entity.faxNo}
+          , emal_addr = #{entity.emalAddr}
+          , bnk_cd = #{entity.bnkCd}
+          , acct_no = #{entity.acctNo}
+          , owac_nm = #{entity.owacNm}
+          , brand_logo_file_no = #{entity.brandLogoFileNo}
+          , bsns_reg_no = #{entity.bsnsRegNo}
+          , corp_reg_no = #{entity.corpRegNo}
+          , oq_brand_id = #{entity.oqBrandId}
+          , sys_chg_dttm = NOW()
+          , sys_chg_id = #{userId}
+        where brand_id = #{entity.brandId}
+    </update>
+
+    <select id="selectBrandInitPw" resultType="String">
+        select bsns_reg_no
+         from brand_base_info
+         where brand_id  = #{brandId}
+    </select>
 
 </mapper>