Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-api

src/main/java/com/oqpo/api/entity/pomng/PchWishListItemEntity.java

@@ -23,6 +23,8 @@ public class PchWishListItemEntity implements Serializable {
     private String unitAmt; 
     private String unit;
     private String brandUnitUnqNo; 
+    private String storeUnitUnqNo; 
+    private String unitGubun; 
 }
 
     

src/main/java/com/oqpo/api/service/pomng/PchReqService.java

@@ -633,6 +633,8 @@ public class PchReqService extends CommonService {
                     .unitAmt(m.getUnitAmt())
                     .unit(m.getUnit())
                     .brandUnitUnqNo(m.getBrandUnitUnqNo())
+                    .storeUnitUnqNo(m.getStoreUnitUnqNo())
+                    .unitGubun(m.getUnitGubun())
                 .build()).collect(Collectors.toList()
             );
         return SelectResponse.toDTO(selectRows);

src/main/java/com/oqpo/api/web/dto/response/pomng/pchReq/PchWishListItem.java

@@ -28,5 +28,9 @@ public class PchWishListItem {
     private String unit;  
     @ApiModelProperty(value = "품목식별자")
     private String brandUnitUnqNo;  
+    @ApiModelProperty(value = "매장단가")
+    private String storeUnitUnqNo;  
+    @ApiModelProperty(value = "구분")
+    private String unitGubun;  
 
 }

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

@@ -281,7 +281,7 @@
         from np_auth_info
         where auth_tp_cd = #{authTpCd}
         <if test="shmtColProcType == '10'">
-        and   autn_no not like concat('%','_SL')
+        and   auth_no not like concat('%','_SL')
         </if>
         <if test="shmtColProcType == '20'">
         and   auth_no not in ('BRAND_MPOMNG' ,  'BRAND_MRTNMNG' ,  'BRAND_POMNG' ,  'BRAND_RTNMNG')

src/main/resources/mybatis/sqlmaps/pomng/PchReq.xml

@@ -343,7 +343,8 @@
     <select id="selectWishListItem" resultType="com.oqpo.api.entity.pomng.PchWishListItemEntity">
         SELECT mgnt.WISH_LIST_MGNT_NO, mgnt.WISH_LIST_NM
             , mgnt.STORE_ID, FN_STORE_NM(#{brandId}, #{storeId}) AS store_nm
-            , ptcl.ITEM_ID, item.ITEM_NM, unit.UNIT_AMT, unit.UNIT
+            , ptcl.ITEM_ID, item.ITEM_NM, unit.UNIT_AMT, unit.UNIT, unit.STORE_UNIT_UNQ_NO, 'S' as UNIT_GUBUN
+            , fn_code_nm('PODR_PSSBL_DVSN',item.podr_pssbl_dvsn) AS podr_pssbl_dvsn_nm
             , bitem.BRAND_UNIT_UNQ_NO
         FROM 
             store_wish_list_mgnt mgnt
@@ -352,7 +353,7 @@
             INNER JOIN store_item_unit_info unit 
                 ON mgnt.STORE_ID = unit.STORE_ID AND ptcl.ITEM_ID = unit.ITEM_ID AND DATE_FORMAT(NOW(), '%Y%m%d') BETWEEN unit.CONT_STT_DT AND unit.CONT_END_DT
             INNER JOIN item_base_info item
-                ON ptcl.ITEM_ID = item.ITEM_ID
+                ON ptcl.ITEM_ID = item.ITEM_ID AND item.podr_pssbl_dvsn='PO01'
             INNER JOIN brand_item_unit_info bitem 
                 ON bitem.ITEM_ID=ptcl.ITEM_ID AND bitem.BRAND_ID=unit.BRAND_ID
         WHERE 1 = 1