주소 지번과 법정,행정정보 추가

pom.xml

@@ -210,14 +210,17 @@
 			<artifactId>json</artifactId>
 			<version>20180813</version>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-openfeign</artifactId>
 			<version>2.0.4.RELEASE</version>
 		</dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+        </dependency>
 
-	</dependencies>
+    </dependencies>
 	<profiles>
 		<profile>
 			<id>local</id>

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

@@ -56,7 +56,12 @@ public class OqScmStoreChangeReqModel {
 	private String lat;
 	@ApiModelProperty(value = "경도", required = true)
 	private String lng;
-	
+	@ApiModelProperty(value = "지번주소", required = true)
+	private String lotsAddress;
+	@ApiModelProperty(value = "행정동", required = true)
+	private String hjDong;
+	@ApiModelProperty(value = "법정동", required = true)
+	private String bjDong;
 	private String hstNo;
 	
 }

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

@@ -55,5 +55,12 @@ public class OqScmStoreInfoResModel extends OqScmApiResModel{
 	@ApiModelProperty(value = "사용여부", required = true)
 	private String useYn;
 
+	@ApiModelProperty(value = "지번주소", required = true)
+	private String lotsAddress;
+	@ApiModelProperty(value = "행정동", required = true)
+	private String hjDong;
+	@ApiModelProperty(value = "법정동", required = true)
+	private String bjDong;
+
 
 }

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

@@ -58,6 +58,10 @@ public class StoreBaseInfoEntity implements Serializable {
     private String whsUseYn;
     private String owacNm;
 
+    private String lotsAddress;
+    private String hjDong;
+    private String bjDong;
+
     private String code;
     private String message;
 

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

@@ -163,6 +163,9 @@ public class StoreBaseInfoService extends CommonService {
             entity.setAcctNo(saveStoreInfolRequest.getAcctNo());
             entity.setOwacNm(saveStoreInfolRequest.getOwacNm());
             entity.setOwnerNm(saveStoreInfolRequest.getOwnerNm());
+            entity.setLotsAddress(saveStoreInfolRequest.getLotsAddress());
+            entity.setHjDong(saveStoreInfolRequest.getHjDong());
+            entity.setBjDong(saveStoreInfolRequest.getBjDong());
 
             if (StringUtil.isBlankEmpty(saveStoreInfolRequest.getOqBrandId())) {
                 entity.setOqBrandId(null);
@@ -475,6 +478,9 @@ public class StoreBaseInfoService extends CommonService {
         req.setUseYn("Y".equals(infoEntity.getDelYn()) ? "N" : "Y"); // 사용여부
         req.setLat(infoEntity.getLatX());
         req.setLng(infoEntity.getLongY());
+        req.setLotsAddress(infoEntity.getLotsAddress());
+        req.setHjDong(infoEntity.getHjDong());
+        req.setBjDong(infoEntity.getBjDong());
         return req;
     }
 
@@ -584,6 +590,9 @@ public class StoreBaseInfoService extends CommonService {
             storeChgInfo.setOqStoreId(boStoreChgInfoRequest.getStoreNo());
             storeChgInfo.setBrandId(boStoreChgInfoRequest.getBrandId());
             storeChgInfo.setStoreId(boStoreChgInfoRequest.getStoreId());
+            storeChgInfo.setLotsAddress(boStoreChgInfoRequest.getLotsAddress());
+            storeChgInfo.setHjDong(boStoreChgInfoRequest.getHjDong());
+            storeChgInfo.setBjDong(boStoreChgInfoRequest.getBjDong());
 
             storeBaseInfoMapper.updateBoStoreChgInfo(userId, storeChgInfo);
 

src/main/java/com/oqpo/api/web/dto/request/ifmng/BoStoreChgInfoRequest.java

@@ -79,4 +79,13 @@ public class BoStoreChgInfoRequest {
 
     @ApiModelProperty(value = "사용여부 - Y")
     private String useYn;
+
+    @ApiModelProperty(value = "지번주소")
+    private String lotsAddress;
+    @ApiModelProperty(value = "행정동")
+    private String hjDong;
+    @ApiModelProperty(value = "법정동")
+    private String bjDong;
+
+
 }

src/main/java/com/oqpo/api/web/dto/request/stinfo/store/SaveStoreInfolRequest.java

@@ -111,4 +111,13 @@ public class SaveStoreInfolRequest {
 
     @ApiModelProperty(value = "오더퀸 매장코드")
     private String oqStoreId;
+
+    @ApiModelProperty(value = "지번주소")
+    private String lotsAddress;
+
+    @ApiModelProperty(value = "행정동")
+    private String hjDong;
+
+    @ApiModelProperty(value = "법정동")
+    private String bjDong;
 }

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

@@ -143,6 +143,14 @@ public class StoreInfoResponse {
     @ApiModelProperty(value = "오더퀸 매장코드")
     private String oqStoreId;
 
+    @ApiModelProperty(value = "지번주소")
+    private String lotsAddress;
+    @ApiModelProperty(value = "행정동")
+    private String hjDong;
+    @ApiModelProperty(value = "법정동")
+    private String bjDong;
+
+
 
     @ApiModelProperty(value = "등록일")
     private String sysRegDttm;
@@ -206,6 +214,9 @@ public class StoreInfoResponse {
                 .brandOwacNm(entity.getBrandInfo() == null ? "" : entity.getBrandInfo().getOwacNm()  == null ? "" : entity.getBrandInfo().getOwacNm() )
                 .oqBrandId(entity.getOqBrandId() == null ? "" : entity.getOqBrandId())
                 .oqStoreId(entity.getOqStoreId() == null ? "" : entity.getOqStoreId())
+                .lotsAddress(entity.getLotsAddress() == null ? "" : entity.getLotsAddress())
+                .hjDong(entity.getHjDong() == null ? "" : entity.getHjDong())
+                .bjDong(entity.getBjDong() == null ? "" : entity.getBjDong())
                 .build();
     }
 }

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

@@ -132,6 +132,9 @@
                 ,store.bnk_cd , store.acct_no, store.owac_nm
                 ,brand.bnk_cd as 'brandInfo.bnk_cd', fn_code_nm('BNK_CD',brand.bnk_cd) as 'brandInfo.bnk_nm',  brand.acct_no as 'brandInfo.acct_no', brand.owac_nm as 'brandInfo.owac_nm'
                 ,store.whs_use_yn
+                ,store.lots_address
+                ,store.hj_dong
+                ,store.bj_dong
         from store_base_info store
         join brand_base_info brand on store.brand_id = brand.brand_id
         left outer join loan_mgnt_base_info loan on store.loan_mgnt_unq_no = loan.loan_mgnt_unq_no and store.brand_id = loan.brand_id and store.store_id = loan.store_id and loan.use_yn = 'Y'
@@ -149,6 +152,7 @@
             ,emal_addr,store_st_cd,bsns_reg_no,corp_reg_no,ctgr_bsns
             ,bsns_cndt, bnk_cd, acct_no, owac_nm, owner_nm,del_yn,area_cd,lat_x, whs_use_yn
             ,long_y,oq_brand_id,oq_store_id,sys_reg_dttm,sys_reg_id,sys_chg_dttm,sys_chg_id
+            ,lots_address, hj_dong, bj_dong
         )
         values
         (
@@ -159,6 +163,7 @@
             #{entity.bsnsCndt},#{entity.bnkCd}, #{entity.acctNo}, #{entity.owacNm}, #{entity.ownerNm},'N',#{entity.areaCd},#{entity.latX},#{entity.whsUseYn},
             #{entity.longY}, case when  #{entity.oqBrandId} is null or #{entity.oqBrandId} = '' then null else #{entity.oqBrandId}   end
             ,case when  #{entity.oqStoreId} is null or #{entity.oqStoreId} = '' then null else #{entity.oqStoreId}   end ,now(),#{userId},now(),#{userId}
+            ,#{entity.lotsAddress}, #{entity.hjDong}, #{entity.bjDong}
         )
     </insert>
 
@@ -194,6 +199,15 @@
             ,oq_store_id = case when  #{entity.oqStoreId} is null or #{entity.oqStoreId} = '' then null else #{entity.oqStoreId}   end
             ,sys_chg_dttm	= now()
             ,sys_chg_id	= #{userId}
+            <if test="entity.lotsAddress != null and entity.lotsAddress != ''">
+            , lots_address = #{entity.lotsAddress}
+            </if>
+            <if test="entity.hjDong != null and entity.hjDong != ''">
+            ,hj_dong = #{entity.hjDong}
+            </if>
+            <if test="entity.bjDong != null and entity.bjDong != ''">
+            ,bj_dong = #{entity.bjDong}
+            </if>
         where brand_id = #{entity.brandId}
         and   store_id = #{entity.storeId}
     </update>
@@ -258,6 +272,9 @@
             ,del_yn         = #{entity.delYn}
             ,oq_brand_id    = #{entity.oqBrandId}
             ,oq_store_id    = #{entity.oqStoreId}
+            ,lots_address   = #{entity.lotsAddress}
+            ,hj_dong = #{entity.hjDong}
+            ,bj_dong = #{entity.bjDong}
         where brand_id = #{entity.brandId}
         and   store_id = #{entity.storeId}
     </update>