Compare commits

..

No commits in common. "33d92eb56d54f87ef753cabc00d2579ebf25334c" and "6c9286626ea48b42f55db4bddd49f5e27b769b28" have entirely different histories.

3 changed files with 7 additions and 71 deletions

View File

@ -54,24 +54,6 @@ public interface UserMapper {
*/ */
int setUserSave(UserRequest userReqList) throws Exception; int setUserSave(UserRequest userReqList) throws Exception;
/**
* 판매점의 정가가격 등록 여부 체크(2차점이상인 판매점만 해당)
*
* @param storeReq
* @return
* @throws Exception
*/
int getStoreUnitPriceChk(StoreRequest storeReq) throws Exception;
/**
* 판매점의 정가가격 등록
*
* @param storeReq
* @return
* @throws Exception
*/
int setStoreUnitPrice(StoreRequest storeReq) throws Exception;
/** /**
* 영업사원 삭제 * 영업사원 삭제
* *

View File

@ -74,14 +74,6 @@ public class UserService {
userMapper.setStoreInfoSave(storeRequest); userMapper.setStoreInfoSave(storeRequest);
userMapper.setStoreSapCdSave(storeRequest); userMapper.setStoreSapCdSave(storeRequest);
userMapper.setStoreNorthModuleSave(storeRequest); userMapper.setStoreNorthModuleSave(storeRequest);
// 2차점 이상인 판매점 신규 등록시 판매점에 정가 가격 추가
if ("1".equals(storeRequest.getSecondAgentFlg())) {
if (userMapper.getStoreUnitPriceChk(storeRequest) == 0) {
// 등록된 가격이 없는경우 정가 가격 등록
userMapper.setStoreUnitPrice(storeRequest);
}
}
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage()); log.error(e.getMessage());
} }

View File

@ -87,9 +87,8 @@
, DISP_FAX = #{dispFax} , DISP_FAX = #{dispFax}
, DISP_MAIL = #{dispMail} , DISP_MAIL = #{dispMail}
, SALE_STORE_LEVEL = #{saleStoreLevel} , SALE_STORE_LEVEL = #{saleStoreLevel}
, PRICE_PATTERN = (CASE WHEN ISNULL(PRICE_PATTERN, '') = '' AND #{secondAgentFlg} = '1' THEN '510' ELSE PRICE_PATTERN END)
, DEL_FLG = #{delFlg} , DEL_FLG = #{delFlg}
, LAST_EDIT_DATETIME = GETDATE() , LAST_EDIT_DATETIME = #{lastEditDatetime}
, LAST_EDIT_USER = #{lastEditUser} , LAST_EDIT_USER = #{lastEditUser}
WHEN NOT MATCHED THEN WHEN NOT MATCHED THEN
INSERT ( INSERT (
@ -108,7 +107,6 @@
, SECOND_AGENT_FLG , SECOND_AGENT_FLG
, FIRST_AGENT_ID , FIRST_AGENT_ID
, PARENT_SALE_AGENT_ID , PARENT_SALE_AGENT_ID
, PRICE_PATTERN
, OUTPUT_COMP_CLASS -- 출력 대비표 분류 , OUTPUT_COMP_CLASS -- 출력 대비표 분류
, INDUSTRIAL_OUTPUT_COMP_CLASS -- 산업출력 대비표 출력 , INDUSTRIAL_OUTPUT_COMP_CLASS -- 산업출력 대비표 출력
, FIXED_PRICE_FLG -- 정가 표시 , FIXED_PRICE_FLG -- 정가 표시
@ -145,7 +143,6 @@
, #{secondAgentFlg} , #{secondAgentFlg}
, #{firstAgentId} , #{firstAgentId}
, #{parentSaleAgentId} , #{parentSaleAgentId}
, (CASE WHEN #{secondAgentFlg} = '1' THEN '510' ELSE NULL END)
, 0 -- 출력 대비표 분류 , 0 -- 출력 대비표 분류
, 0 -- 산업출력 대비표 출력 , 0 -- 산업출력 대비표 출력
, 0 -- 정가 표시 , 0 -- 정가 표시
@ -164,7 +161,7 @@
, #{registDatetime} , #{registDatetime}
, 0 , 0
, 0 -- 적설 , 0 -- 적설
, GETDATE() , #{lastEditDatetime}
, #{lastEditUser} , #{lastEditUser}
); );
</insert> </insert>
@ -178,7 +175,7 @@
WHEN MATCHED THEN WHEN MATCHED THEN
UPDATE SET UPDATE SET
BIZ_NO = #{bizNo} BIZ_NO = #{bizNo}
, LAST_EDIT_DATETIME = GETDATE() , LAST_EDIT_DATETIME = (CASE WHEN #{lastEditDatetime} != '' THEN #{lastEditDatetime} ELSE #{registDatetime} END)
WHEN NOT MATCHED THEN WHEN NOT MATCHED THEN
INSERT ( INSERT (
SALE_STORE_ID SALE_STORE_ID
@ -187,7 +184,7 @@
) VALUES ( ) VALUES (
#{saleStoreId} #{saleStoreId}
, #{bizNo} , #{bizNo}
, GETDATE() , (CASE WHEN #{lastEditDatetime} != '' THEN #{lastEditDatetime} ELSE #{registDatetime} END)
); );
</insert> </insert>
@ -210,7 +207,7 @@
, TEL = #{tel} , TEL = #{tel}
, FAX = #{fax} , FAX = #{fax}
, MAIL = #{mail} , MAIL = #{mail}
, LAST_EDIT_DATETIME = GETDATE() , LAST_EDIT_DATETIME = #{lastEditDatetime}
, LAST_EDIT_USER = #{lastEditUser} , LAST_EDIT_USER = #{lastEditUser}
-- , GROUP_ID -- '70000' , '60000' -- , GROUP_ID -- '70000' , '60000'
-- , MODULE_SELECT_GROUP_ID -- 모듈 선택 그룹 ('G1','GA' ,'G2') -- , MODULE_SELECT_GROUP_ID -- 모듈 선택 그룹 ('G1','GA' ,'G2')
@ -229,8 +226,6 @@
, FAX , FAX
, MAIL , MAIL
, GROUP_ID , GROUP_ID
, MODULE_SELECT_GROUP_ID
, VERSION_MANAGEMENT_ID
, DISP_COST_PRICE , DISP_COST_PRICE
, DISP_SELLING_PRICE , DISP_SELLING_PRICE
, REGIST_DATETIME , REGIST_DATETIME
@ -247,47 +242,14 @@
, #{fax} , #{fax}
, #{mail} , #{mail}
, #{groupId} , #{groupId}
, 'G1' /* 일반 공개용 */
, 'hanbaiten' /* 일반 판매점 */
, 0 , 0
, 0 , 0
, GETDATE() , #{registDatetime}
, GETDATE() , #{lastEditDatetime}
, #{lastEditUser} , #{lastEditUser}
); );
</insert> </insert>
<select id="getStoreUnitPriceChk" parameterType="com.interplug.qcast.biz.user.dto.StoreRequest" resultType="Integer">
/* sqlid : com.interplug.qcast.user.getStoreUnitPriceChk */
SELECT
COUNT(1)
FROM M_SALE_STORE_PRICE
WHERE
SALE_STORE_ID = #{saleStoreId}
</select>
<insert id="setStoreUnitPrice" parameterType="com.interplug.qcast.biz.user.dto.StoreRequest" >
/* sqlid : com.interplug.qcast.user.setStoreUnitPrice */
INSERT INTO M_SALE_STORE_PRICE(
SALE_STORE_ID
, ITEM_ID
, COST_PRICE
, SALE_PRICE
, DISP_FLG
, LAST_EDIT_DATETIME
, LAST_EDIT_USER
)
SELECT #{saleStoreId}
, ITEM_ID
, COST_PRICE
, SALE_PRICE
, '1'
, GETDATE()
, #{lastEditUser}
FROM M_PRICE_PATTERN_MONEY
WHERE PRICE_PATTERN = '510'
</insert>
<insert id="setStoreNorthModuleSave" parameterType="com.interplug.qcast.biz.user.dto.StoreRequest" > <insert id="setStoreNorthModuleSave" parameterType="com.interplug.qcast.biz.user.dto.StoreRequest" >
/* sqlid : com.interplug.qcast.user.setStoreNorthModuleSave */ /* sqlid : com.interplug.qcast.user.setStoreNorthModuleSave */
MERGE INTO M_SALES_STORE_NORTH_MODULE AS A MERGE INTO M_SALES_STORE_NORTH_MODULE AS A