From f7006de1754f152d838def9db1f361da8c8264a2 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 2 Aug 2013 14:29:10 +0900
Subject: [PATCH] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=9D=BC=20=EB=95=8C=20?=
 =?UTF-8?q?=EB=B3=B4=EA=B4=80=EB=90=9C=20=EC=9E=A5=EB=B0=94=EA=B5=AC?=
 =?UTF-8?q?=EB=8B=88=20=EC=83=81=ED=92=88=20uq=5Fid=20=EB=B3=80=EA=B2=BD?=
 =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/shop.lib.php | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/lib/shop.lib.php b/lib/shop.lib.php
index 53ff9460c..907a2b9a3 100644
--- a/lib/shop.lib.php
+++ b/lib/shop.lib.php
@@ -1264,7 +1264,7 @@ function get_new_od_id()
 // uq_id 설정
 function set_unique_id($direct)
 {
-    global $default;
+    global $g4, $default, $member;
 
     if ($direct) {
         $tmp_uq_id = get_session('ss_uq_direct');
@@ -1275,10 +1275,10 @@ function set_unique_id($direct)
     } else {
         // 비회원장바구니 uq_id 쿠키설정
         if($default['de_guest_cart_use']) {
-            $g_cart_uq_id = get_cookie('ck_guest_cart_uqid');
-            if($g_cart_uq_id) {
-                set_session('ss_uq_id', $g_cart_uq_id);
-                set_cookie('ck_guest_cart_uqid', $g_cart_uq_id, ($default['de_cart_keep_term'] * 86400));
+            $tmp_uq_id = get_cookie('ck_guest_cart_uqid');
+            if($tmp_uq_id) {
+                set_session('ss_uq_id', $tmp_uq_id);
+                set_cookie('ck_guest_cart_uqid', $tmp_uq_id, ($default['de_cart_keep_term'] * 86400));
             } else {
                 $tmp_uq_id = get_uniqid();
                 set_session('ss_uq_id', $tmp_uq_id);
@@ -1291,6 +1291,20 @@ function set_unique_id($direct)
                 set_session('ss_uq_id', $tmp_uq_id);
             }
         }
+
+        // 보관된 회원장바구니 자료 uq_id 변경
+        if($member['mb_id'] && $tmp_uq_id) {
+            $sql = " update {$g4['shop_cart_table']}
+                        set uq_id = '$tmp_uq_id'
+                        where mb_id = '{$member['mb_id']}'
+                          and ct_status = '쇼핑' ";
+            if($default['de_cart_keep_term']) {
+                $ctime = date('Y-m-d H:i:s', G4_SERVER_TIME - ($default['de_cart_keep_term'] * 86400));
+                $sql .= " and ct_time > '$ctime' ";
+            }
+
+            sql_query($sql);
+        }
     }
 }