Changeset 18099


Ignore:
Timestamp:
2009/06/12 20:22:51 (13 years ago)
Author:
Seasoft
Message:

rv r17741, r17376
・次期チェンジセットを投入する前にソースを正式版に近づけるため

Location:
branches/comu-ver2/data/class/pages
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/comu-ver2/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php

    r17741 r18099  
    160160        $where = 'order_id = ?'; 
    161161        $arrUpdate = array('update_date' => 'NOW()'); 
    162     $col = 'customer_id, add_point, use_point, status'; 
    163162 
    164163        $delflg  = '1'; // 削除フラグ 
     
    183182            foreach ( $arrMove as $val ){ 
    184183                if ( $val != "" ) { 
    185         if ( $status_id == ORDER_DELIV ) { 
    186         $arrRet = $objQuery->select($col, $table, $where, array($val)); 
    187         $customer_id = $arrRet[0]['customer_id']; 
    188         $add_point = $arrRet[0]['add_point']; 
    189         $status = $arrRet[0]['status']; 
    190         if($customer_id != "" && $customer_id >= 1) { 
    191             $arrRet = $objQuery->select("point", 'dtb_customer', 'customer_id = ?', array($customer_id)); 
    192             $arrRet[0]['point']+= $add_point; 
    193             $sqlval['point'] = $arrRet[0]['point']; 
    194             $objQuery->update('dtb_customer', $sqlval, 'customer_id = ?', array($customer_id)); 
    195           } 
    196         } 
    197          elseif ( $status_id == ORDER_CANCEL ) { 
    198             $arrRet = $objQuery->select($col, $table, $where, array($val)); 
    199             $customer_id = $arrRet[0]['customer_id']; 
    200             $add_point = $arrRet[0]['add_point']; 
    201             $use_point = $arrRet[0]['use_point']; 
    202             $status = $arrRet[0]['status']; 
    203             if($customer_id != "" && $customer_id >= 1) { 
    204                if($status == 5) { 
    205                $arrRet = $objQuery->select("point", 'dtb_customer', 'customer_id = ?', array($customer_id)); 
    206                $arrRet[0]['point']-= $add_point; 
    207                $arrRet[0]['point']+= $use_point; 
    208                $sqlval['point'] = $arrRet[0]['point']; 
    209                $objQuery->update('dtb_customer', $sqlval, 'customer_id = ?', array($customer_id)); 
    210             } else { 
    211                $arrRet = $objQuery->select("point", 'dtb_customer', 'customer_id = ?', array($customer_id)); 
    212                $arrRet[0]['point']+= $use_point; 
    213                $sqlval['point'] = $arrRet[0]['point']; 
    214                $objQuery->update('dtb_customer', $sqlval, 'customer_id = ?', array($customer_id)); 
    215             } 
    216           } 
    217         } 
    218         else { 
    219             $arrRet = $objQuery->select($col, $table, $where, array($val)); 
    220             $customer_id = $arrRet[0]['customer_id']; 
    221             $add_point = $arrRet[0]['add_point']; 
    222             $use_point = $arrRet[0]['use_point']; 
    223             $status = $arrRet[0]['status']; 
    224             if($customer_id != "" && $customer_id >= 1) { 
    225                if($status == 5) { 
    226                $arrRet = $objQuery->select("point", 'dtb_customer', 'customer_id = ?', array($customer_id)); 
    227                $arrRet[0]['point']-= $add_point; 
    228                $sqlval['point'] = $arrRet[0]['point']; 
    229                $objQuery->update('dtb_customer', $sqlval, 'customer_id = ?', array($customer_id)); 
    230             } 
    231              elseif($status == 3) { 
    232                $arrRet = $objQuery->select("point", 'dtb_customer', 'customer_id = ?', array($customer_id)); 
    233                $arrRet[0]['point']-= $use_point; 
    234                $sqlval['point'] = $arrRet[0]['point']; 
    235                $objQuery->update('dtb_customer', $sqlval, 'customer_id = ?', array($customer_id)); 
    236             } 
    237             else { 
    238                $arrRet = $objQuery->select("point", 'dtb_customer', 'customer_id = ?', array($customer_id)); 
    239                $sqlval['point'] = $arrRet[0]['point']; 
    240                $objQuery->update('dtb_customer', $sqlval, 'customer_id = ?', array($customer_id)); 
    241             } 
    242           } 
    243          } 
    244184                    $objQuery->update($table, $arrUpdate, $where, array($val)); 
    245185                } 
  • branches/comu-ver2/data/class/pages/shopping/LC_Page_Shopping_Complete.php

    r17994 r18099  
    630630        $sqlval['buy_times']++; 
    631631        $sqlval['buy_total']+= $arrData['total']; 
    632         if (USE_POINT !== false) { 
    633             $sqlval['point'] -= $arrData['use_point']; 
    634         } 
     632        $sqlval['point'] = ($sqlval['point'] + $arrData['add_point'] - $arrData['use_point']); 
    635633 
    636634        // ポイントが不足している場合 
Note: See TracChangeset for help on using the changeset viewer.