Merge pull request #254 from KKangHHee/test

Feat: 결제 후 포인트 적립 api 연결
readyvery · Mar 22, 2024 · c306970 · c306970
2 parents 94d8aa3 + 5c28178
commit c306970
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/components/views/PageComponent/OrderProgress.jsx b/src/components/views/PageComponent/OrderProgress.jsx
@@ -15,12 +15,11 @@ const OrderProgress = () => {
   const [degree, setDegree] = useState(0);
   const [isOpen, setIsOpen] = useState(false);
   const [refreshKey, setRefreshKey] = useState(0);
-  const { estimatedTime, orderNum, progress } = useFetchCurrentOrder(
+  const { estimatedTime, orderNum, progress, expectPoint } = useFetchCurrentOrder(
     orderId,
     refreshKey
   );
   const cancelOrder = useCancelOrder();
-  const point = 175;
   const [rotate, setRotate] = useState(false); //새로고침 클릭시 회전용
   const [debounceTimeout, setDebounceTimeout] = useState(null); // 디바운싱 상태
   const progressList = useMemo(
@@ -238,7 +237,7 @@ const OrderProgress = () => {
         {degree === 3 ? (
           <div className="order_progress__point">
             <span className="order_progress__point_text">
-              <span>{point}</span>원 적립되었습니다
+              <span>{expectPoint}</span>원 적립되었습니다
             </span>
           </div>
         ) : null}

diff --git a/src/hooks/useFetchCurrentOrder.jsx b/src/hooks/useFetchCurrentOrder.jsx
@@ -9,6 +9,7 @@ const useFetchCurrentOrder = (orderId, refreshKey) => {
   // const [orderName, setOrderName] = useState("");
   const [orderNum, setOrderNum] = useState("");
   const [progress, setProgress] = useState("");
+  const [expectPoint, setExpectPoint] = useState(0);
 
   const token = localStorage.getItem("accessToken");
 
@@ -29,6 +30,7 @@ const useFetchCurrentOrder = (orderId, refreshKey) => {
         // setOrderName(response.data.orderName);
         setOrderNum(response.data.orderNum);
         setProgress(response.data.progress);
+        setExpectPoint(response.data.expectPoint);
       } catch (error) {
         console.error("Error fetching current order status:", error);
       }
@@ -38,7 +40,7 @@ const useFetchCurrentOrder = (orderId, refreshKey) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [orderId, refreshKey]); // refreshKey를 의존성 배열에 추가
 
-  return { estimatedTime, orderNum, progress };
+  return { estimatedTime, orderNum, progress, expectPoint };
 };
 
 export default useFetchCurrentOrder;