브랜드 그룹및 브랜드관리 수정

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

@@ -51,6 +51,7 @@ public class BrandEntity implements Serializable {
     private String pgKey;
     private String pgAfflId;
     private String mallId;
+    private String useYn;
 
 
     private List<FileEntity> fileEntity ;

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

@@ -44,7 +44,9 @@ public interface BrandMapper {
 
     String selectPgMallId(@Param("brandId") String brandId) throws Exception;
 
-    int updatePgKiccBaseInfo(@Param("userId") String userId, @Param("brandId") String brandId, @Param("mallId") String mallId)  throws Exception;
+    int updatePgKiccBaseInfo(@Param("userId") String userId, @Param("brandId") String brandId, @Param("mallId") String mallId, @Param("useYn") String useYn)  throws Exception;
 
     BrandEntity selectBrandPgInfo(@Param("brandId") String brandId)throws Exception;
+
+    List<BrandEntity> selectPgMallIdList(@Param("brandId") String brandId)throws Exception;
 }

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

@@ -203,6 +203,7 @@ public class AfflService extends CommonService {
                 userUEntity.setUserId(entity.getAfflShopId());
                 userUEntity.setTelNo(entity.getRprstTelNo());
                 userUEntity.setEmail(entity.getRprstEmai());
+                userUEntity.setUserNm(entity.getOwnerNm());
 
                 if ("S000".equals(entity.getStCd())) {
                     userUEntity.setUserStatCd("10");

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

@@ -235,7 +235,56 @@ public class BrandService extends CommonService {
                 */
             } else if ("U".equals(saveBrandInfolRequest.getViewCd())) {
                 brandMapper.updateBrandInfo(userId, entity);
+                //브랜드에 사용중인 pg정보 가져오기
+                List<BrandEntity> usePgList = brandMapper.selectPgMallIdList(saveBrandInfolRequest.getBrandId());
+
+                int extPgMallCnt = 0 ;
+                int chgMallCnt = 0 ;
+                String preUseMallId = "";
+
+                if (usePgList.size() > 0 ) {
+                    for (int i = 0 ; i < usePgList.size() ; i++) {
+                        BrandEntity tmpPg = usePgList.get(i);
+                        if ("Y".toString().equals(tmpPg.getUseYn())) {
+                            preUseMallId = tmpPg.getMallId();
+                        }
+
+                        //동일한 pg존재 여부 확인
+                        if (saveBrandInfolRequest.getPgAfflId().equals(tmpPg.getMallId())) {
+                            extPgMallCnt = 1;
+                            if ("N".toString().equals(tmpPg.getUseYn())) {
+                                chgMallCnt = 1;
+                            }
+                        }
+                    }
+                   
+                    if (extPgMallCnt == 0 ) {
+                        // 기존거는 삭제 하고 신규로 등록
+                        //기존거 삭제
+                        brandMapper.updatePgKiccBaseInfo(userId, saveBrandInfolRequest.getBrandId(), preUseMallId, "N") ;
+                        //신규등록
+                        PgKiccBaseInfoEntity pgInfoEntity = new PgKiccBaseInfoEntity();
+                        pgInfoEntity.setBrandId(saveBrandInfolRequest.getBrandId());
+                        pgInfoEntity.setMallId(saveBrandInfolRequest.getPgAfflId());
+                        pgInfoEntity.setUseYn("Y");
+                        brandMapper.insertPgKiccBaseInfo(userId, pgInfoEntity);
+                    } else {
+                        if (chgMallCnt > 0 ) {
+                            // 기존 사용건은 N으로 하고 N인것을 Y로 변경한다.
+                            brandMapper.updatePgKiccBaseInfo(userId, saveBrandInfolRequest.getBrandId(), preUseMallId, "N") ;
+                            brandMapper.updatePgKiccBaseInfo(userId, saveBrandInfolRequest.getBrandId(), saveBrandInfolRequest.getPgAfflId(), "Y") ;
+                        }
+                    }
 
+                } else {
+                    PgKiccBaseInfoEntity pgInfoEntity = new PgKiccBaseInfoEntity();
+                    pgInfoEntity.setBrandId(saveBrandInfolRequest.getBrandId());
+                    pgInfoEntity.setMallId(saveBrandInfolRequest.getPgAfflId());
+                    pgInfoEntity.setUseYn("Y");
+                    brandMapper.insertPgKiccBaseInfo(userId, pgInfoEntity);
+                }
+
+/*
                 String mallId = brandMapper.selectPgMallId(saveBrandInfolRequest.getBrandId());
 
                 if (mallId == null || "".equals(mallId)) {
@@ -260,7 +309,7 @@ public class BrandService extends CommonService {
                     }
                 }
 
-
+*/
                 UserMngEntity userUEntity = new UserMngEntity();
                 userUEntity.setUserId(entity.getBrandId());
                 userUEntity.setTelNo(entity.getTelNo());

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

@@ -297,7 +297,7 @@
     <update id="updatePgKiccBaseInfo">
         update pg_kicc_base_info
         set    sys_reg_dttm = date_format(now(),'%Y%m%d')
-          ,    use_yn = 'N'
+          ,    use_yn = #{useYn}
           ,    sys_chg_dttm = now()
           ,    sys_chg_id = #{userId}
         where  brand_id = #{brandId}
@@ -310,4 +310,10 @@
         left outer join pg_kicc_base_info pg on info.brand_id = pg.brand_id and pg.use_yn = 'Y'
         where info.brand_id = #{brandId}
     </select>
+
+    <select id="selectPgMallIdList" resultType="com.oqpo.api.entity.stinfo.BrandEntity">
+        select mall_id, use_yn
+        from   pg_kicc_base_info
+        where  brand_id = #{brandId}
+    </select>
 </mapper>