From 470698c149aebd398cc800f5ffb74eefcbf0a418 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 30 Jul 2013 14:38:42 +0900
Subject: [PATCH] =?UTF-8?q?=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EC=86=8C?=
 =?UTF-8?q?=EB=A9=B8=EB=82=B4=EC=97=AD=20=EC=82=AD=EC=A0=9C=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC=20=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/point_list_delete.php | 16 ++++++------
 lib/common.lib.php        | 53 ++++++++++++++++++++++++++++++++++-----
 2 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/adm/point_list_delete.php b/adm/point_list_delete.php
index 32cc13681..f9cc2c8cd 100644
--- a/adm/point_list_delete.php
+++ b/adm/point_list_delete.php
@@ -25,14 +25,15 @@ for ($i=0; $i<$count; $i++)
         continue;
 
     if($row['po_point'] < 0) {
-        if($row['po_rel_table'] != '@expire') {
-            $mb_id = $row['mb_id'];
-            $po_point = abs($row['po_point']);
+        $mb_id = $row['mb_id'];
+        $po_point = abs($row['po_point']);
 
+        if($row['po_rel_table'] == '@expire')
+            delete_expire_point($mb_id, $po_point);
+        else
             delete_use_point($mb_id, $po_point);
-        }
     } else {
-        if($row['po_expired'] != 1 && $row['po_use_point'] > 0) {
+        if($row['po_use_point'] > 0) {
             insert_use_point($row['mb_id'], $row['po_use_point'], $row['po_id']);
         }
     }
@@ -44,10 +45,11 @@ for ($i=0; $i<$count; $i++)
     // po_mb_point에 반영
     $sql = " update {$g4['point_table']}
                 set po_mb_point = po_mb_point - '{$row['po_point']}'
-                where mb_id = '$mb_id'
-                  and po_id > '{$row['po_id']}' ";
+                where mb_id = '{$_POST['mb_id'][$k]}'
+                  and po_id > '{$_POST['po_id'][$k]}' ";
     sql_query($sql);
 
+    // 포인트 UPDATE
     $sum_point = get_point_sum($_POST['mb_id'][$k]);
     $sql= " update {$g4['member_table']} set mb_point = '$sum_point' where mb_id = '{$_POST['mb_id'][$k]}' ";
     sql_query($sql);
diff --git a/lib/common.lib.php b/lib/common.lib.php
index 9f82afe3e..b9aa44fb4 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -981,6 +981,7 @@ function delete_use_point($mb_id, $point)
     $sql = " select po_id, po_use_point, po_expired, po_expire_date
                 from {$g4['point_table']}
                 where mb_id = '$mb_id'
+                  and po_expired <> '1'
                   and po_use_point > 0
                 $sql_order ";
     $result = sql_query($sql);
@@ -1010,6 +1011,48 @@ function delete_use_point($mb_id, $point)
     }
 }
 
+// 소멸포인트 삭제
+function delete_expire_point($mb_id, $point)
+{
+    global $g4, $config;
+
+    $point1 = abs($point);
+    $sql = " select po_id, po_use_point, po_expired, po_expire_date
+                from {$g4['point_table']}
+                where mb_id = '$mb_id'
+                  and po_expired = '1'
+                  and po_point >= 0
+                  and po_use_point > 0
+                order by po_expire_date desc, po_id desc ";
+    $result = sql_query($sql);
+    for($i=0; $row=sql_fetch_array($result); $i++) {
+        $point2 = $row['po_use_point'];
+        $po_expired = '0';
+        $po_expire_date = '9999-12-31';
+        if($config['cf_point_term'] > 0)
+            $po_expire_date = date('Y-m-d', strtotime('+'.($config['cf_point_term'] - 1).' days', G4_SERVER_TIME));
+
+        if($point2 > $point1) {
+            $sql = " update {$g4['point_table']}
+                        set po_use_point = po_use_point - '$point1',
+                            po_expired = '$po_expired',
+                            po_expire_date = '$po_expire_date'
+                        where po_id = '{$row['po_id']}' ";
+            sql_query($sql);
+            break;
+        } else {
+            $sql = " update {$g4['point_table']}
+                        set po_use_point = '0',
+                            po_expired = '$po_expired',
+                            po_expire_date = '$po_expire_date'
+                        where po_id = '{$row['po_id']}' ";
+            sql_query($sql);
+
+            $point1 -= $point2;
+        }
+    }
+}
+
 // 포인트 내역 합계
 function get_point_sum($mb_id)
 {
@@ -1104,14 +1147,12 @@ function delete_point($mb_id, $rel_table, $rel_id, $rel_action)
         $row = sql_fetch($sql);
 
         if($row['po_point'] < 0) {
-            if($row['po_rel_table'] != '@expire') {
-                $mb_id = $row['mb_id'];
-                $po_point = abs($row['po_point']);
+            $mb_id = $row['mb_id'];
+            $po_point = abs($row['po_point']);
 
-                delete_use_point($mb_id, $po_point);
-            }
+            delete_use_point($mb_id, $po_point);
         } else {
-            if($row['po_expired'] != 1 && $row['po_use_point'] > 0) {
+            if($row['po_use_point'] > 0) {
                 insert_use_point($row['mb_id'], $row['po_use_point'], $row['po_id']);
             }
         }