From 893a208c821ea193d525aadc656244bdc9009e41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=8C=80=ED=99=98?= Date: Tue, 19 May 2026 16:31:02 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=B0=EC=A0=9C=20-=20=ED=8C=8C=EB=9D=BC?= =?UTF-8?q?=EB=AF=B8=ED=84=B0=20=EC=B6=94=EA=B0=80(HS=20Code,=20=EC=8B=A4?= =?UTF-8?q?=EB=AC=B4=EA=B2=8C,=20=EB=B6=80=ED=94=BC=EB=AC=B4=EA=B2=8C,=20?= =?UTF-8?q?=ED=8F=AC=EC=9E=A5=EA=B0=AF=EC=88=98)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goods/purchs/service/BOOrderService.java | 5 ++ .../goods/purchs/vo/BOOrderItemOptnVO.java | 8 +++ .../gcone/goods/purchs/vo/BOOrderItemVO.java | 2 + .../gcone/goods/purchs/BOPurchsMapper.xml | 64 +++++++++++++------ 4 files changed, 61 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOOrderService.java b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOOrderService.java index 8274ead7..f262969b 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOOrderService.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOOrderService.java @@ -1094,6 +1094,7 @@ public class BOOrderService { itemVO.setGoodsKndCd((String) goods.get("goodsKndCd")); itemVO.setGoodsImgCours((String) goods.get("goodsImgWithoutHostImage")); itemVO.setGoodsNm((String) goods.get("goodsNm")); + itemVO.setGoodsNmEn((String) goods.get("goodsNmEn")); itemVO.setTaxtTrgetAt((String) goods.get("taxtTrgetAt")); itemVO.setSubscrptWthdrawPosblAt((String) goods.get("subscrptWthdrawPosblAt")); itemVO.setIndvdlzCanclPosblAt((String) goods.get("indvdlzCanclPosblAt")); @@ -1922,6 +1923,10 @@ public class BOOrderService { itemOptnVO.setOptnCd2((String) goodsOptn.get("optnCd2")); itemOptnVO.setOptnCd3((String) goodsOptn.get("optnCd3")); itemOptnVO.setOptnCd4((String) goodsOptn.get("optnCd4")); + itemOptnVO.setHscode((String) goodsOptn.get("hscode")); + itemOptnVO.setRealWt((BigDecimal) goodsOptn.get("realWt")); + itemOptnVO.setVolWt((BigInteger) goodsOptn.get("volWt")); + itemOptnVO.setPackageCnt((Integer) goodsOptn.get("packageCnt")); itemOptnVO.setOptnInfo((String) goodsOptn.get("optnInfo")); itemOptnVO.setCnsmrpric((BigDecimal) goodsOptn.get("cnsmrpric")); // 소비자가 itemOptnVO.setSlepric((BigDecimal) goodsOptn.get("slepric")); // 판매가 diff --git a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderItemOptnVO.java b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderItemOptnVO.java index 4d326fbd..41dbe538 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderItemOptnVO.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderItemOptnVO.java @@ -142,6 +142,14 @@ public class BOOrderItemOptnVO extends AbstractVO { private BigDecimal step85 = new BigDecimal(0); + private String hscode; + + private BigDecimal realWt; + + private BigInteger volWt; + + private Integer packageCnt; + private String restUpdtDv; private BigDecimal updtRestAmt = new BigDecimal(0); diff --git a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderItemVO.java b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderItemVO.java index 2105de36..b5ccb40c 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderItemVO.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderItemVO.java @@ -23,6 +23,8 @@ public class BOOrderItemVO extends AbstractVO { private String goodsNm; + private String goodsNmEn; + private String goodsKndCd; private String taxtTrgetAt; diff --git a/src/main/resources/mybatis/xml/mapper/gcone/goods/purchs/BOPurchsMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/goods/purchs/BOPurchsMapper.xml index 32a4c365..d9fb4434 100644 --- a/src/main/resources/mybatis/xml/mapper/gcone/goods/purchs/BOPurchsMapper.xml +++ b/src/main/resources/mybatis/xml/mapper/gcone/goods/purchs/BOPurchsMapper.xml @@ -202,6 +202,7 @@ , GOODS_INNB , GOODS_IMG_COURS , GOODS_NM + , GOODS_NM_EN , SUBSCRPT_WTHDRAW_POSBL_AT , INDVDLZ_CANCL_POSBL_AT , INDVDLZ_DLIVY_POSBL_AT @@ -216,6 +217,7 @@ , #{goodsInnb} , #{goodsImgCours} , #{goodsNm} + , #{goodsNmEn} , #{subscrptWthdrawPosblAt} , #{indvdlzCanclPosblAt} , #{indvdlzDlivyPosblAt} @@ -305,6 +307,10 @@ , STEP85 , COMPNB_DSCNT_AT , SCTN_DSCNT_AT + , HSCODE + , REAL_WT + , VOL_WT + , PACKAGE_CNT , PURCHS_DCSN_AT , PURCHS_DCSN_QY , RETURN_DLVY_APPLC_AT @@ -334,8 +340,8 @@ , #{relateOrdrGoodsOptnInnb} , #{ordrQy} , #{mlgAccmlCn} - ,SP.MLG_VALID_PD - ,SP.MLG_VALID_PD_AT + , SP.MLG_VALID_PD + , SP.MLG_VALID_PD_AT , #{npayGoodsOrdrnb} , #{npayBundleDlvyNb} , #{posGoodsCd} @@ -368,8 +374,12 @@ , #{step65} , #{step75} , #{step85} - ,GI.COMPNB_DSCNT_AT - ,GI.SCTN_DSCNT_AT + , GI.COMPNB_DSCNT_AT + , GI.SCTN_DSCNT_AT + , #{hscode} + , #{realWt} + , #{volWt} + , #{packageCnt} , 'N' , 0 , SG.RETURN_DLVY_APPLC_AT @@ -1499,6 +1509,7 @@ FROM ( SELECT FG.SOPMAL_CD , FG.GOODS_INNB , FG.GOODS_NM + , FG.GOODS_NM_EN , FG.GOODS_KND_CD , FG.GOODS_STTUS_CD , FN_GET_COMMCODE_NAME('GOODS_STTUS', FG.GOODS_STTUS_CD) AS GOODS_STTUS_NM @@ -1509,9 +1520,9 @@ FROM ( , FORMAT(IFNULL(FGO.CNSMRPRIC, 0), 0) AS CNSMRPRIC , FORMAT(IFNULL(FGO.SLEPRIC, 0), 0) AS SLEPRIC , CONCAT(OPTN1, IF(FGO.OPTN2 IS NULL , '', CONCAT('/', OPTN2)) - , IF(FGO.OPTN3 IS NULL , '', CONCAT('/', OPTN3)) - , IF(FGO.OPTN4 IS NULL , '', CONCAT('/', OPTN4))) AS OPTN - ,IMG.IMG AS GOODS_IMG_COURS + , IF(FGO.OPTN3 IS NULL , '', CONCAT('/', OPTN3)) + , IF(FGO.OPTN4 IS NULL , '', CONCAT('/', OPTN4))) AS OPTN + , IMG.IMG AS GOODS_IMG_COURS , ( SELECT FGI.IMG AS GOODS_IMG FROM GC_GOODS_IMAGE FGI @@ -1557,17 +1568,17 @@ FROM ( , FGO.CNSMRPRIC , FGO.SLEPRIC , CASE WHEN FGO.OPTN_NM_1 != '' AND FGO.OPTN_VAL_1 != '' - THEN CONCAT(FGO.OPTN_NM_1,':',FGO.OPTN_VAL_1) - END OPTN1 - , CASE WHEN FGO.OPTN_NM_2 != '' AND FGO.OPTN_VAL_2 != '' - THEN CONCAT(FGO.OPTN_NM_2,':',FGO.OPTN_VAL_2) - END OPTN2 - , CASE WHEN FGO.OPTN_NM_3 != '' AND FGO.OPTN_VAL_3 != '' - THEN CONCAT(FGO.OPTN_NM_3,':',FGO.OPTN_VAL_3) - END OPTN3 - , CASE WHEN FGO.OPTN_NM_4 != '' AND FGO.OPTN_VAL_4 != '' - THEN CONCAT(FGO.OPTN_NM_4,':',FGO.OPTN_VAL_4) - END OPTN4 + THEN CONCAT(FGO.OPTN_NM_1,':',FGO.OPTN_VAL_1) + END OPTN1 + , CASE WHEN FGO.OPTN_NM_2 != '' AND FGO.OPTN_VAL_2 != '' + THEN CONCAT(FGO.OPTN_NM_2,':',FGO.OPTN_VAL_2) + END OPTN2 + , CASE WHEN FGO.OPTN_NM_3 != '' AND FGO.OPTN_VAL_3 != '' + THEN CONCAT(FGO.OPTN_NM_3,':',FGO.OPTN_VAL_3) + END OPTN3 + , CASE WHEN FGO.OPTN_NM_4 != '' AND FGO.OPTN_VAL_4 != '' + THEN CONCAT(FGO.OPTN_NM_4,':',FGO.OPTN_VAL_4) + END OPTN4 FROM GC_GOODS_OPTION FGO WHERE FGO.OPTN_EXPSR_AT = 'Y' AND FGO.STDR_DV_AT = 'Y' @@ -1939,6 +1950,10 @@ FROM ( , FGO.OPTN_CD_2 , FGO.OPTN_CD_3 , FGO.OPTN_CD_4 + , FGO.HSCODE + , FGO.REAL_WT + , FGO.VOL_WT + , FGO.PACKAGE_CNT , FGO.OPTN_INFO , FGO.OPTN_RELATE_NB FROM ( @@ -1974,6 +1989,10 @@ FROM ( , FGO.OPTN_CD_2 , FGO.OPTN_CD_3 , FGO.OPTN_CD_4 + , FGO.HSCODE + , FGO.REAL_WT + , FGO.VOL_WT + , FGO.PACKAGE_CNT , FGO.OPTN_INFO , FGO.OPTN_RELATE_NB FROM GC_GOODS_OPTION FGO @@ -2000,11 +2019,16 @@ FROM ( ELSE FN_GET_COMMCODE_NAME('GOODS_STTUS', FG.GOODS_STTUS_CD) END AS GOODS_STTUS_NM , FG.GOODS_NM + , FG.GOODS_NM_EN , FGO.GOODS_OPTN_INNB , FGO.OPTN_TY , FGO.OPTN_RELATE_NB , FGO.COMPNB_DSCNT_AT , FGO.SCTN_DSCNT_AT + , FGO.HSCODE + , FGO.REAL_WT + , FGO.VOL_WT + , FGO.PACKAGE_CNT , NULLIF(FGO.OPTN_ESSNTL_AT, '') AS OPTN_ESSNTL_AT , FORMAT(IFNULL(FGO.CNSMRPRIC, 0) * #{qy}, 0) AS SUB_CNSMRPRIC_BY_FORMAT , IFNULL(FGO.CNSMRPRIC, 0) * #{qy} AS SUB_CNSMRPRIC @@ -2065,6 +2089,10 @@ FROM ( , FGO.OPTN_RELATE_NB , FGO.COMPNB_DSCNT_AT , FGO.SCTN_DSCNT_AT + , HSCODE + , REAL_WT + , VOL_WT + , PACKAGE_CNT FROM GC_GOODS_OPTION FGO WHERE FGO.GOODS_OPTN_INNB = #{goodsOptnInnb} ) FGO ON FGO.GOODS_INNB = FG.GOODS_INNB