|
@@ -51,7 +51,7 @@ class Set
|
|
|
return date('Y-m-d', $start) . ' ~ ' . date('Y-m-d', $end);
|
|
return date('Y-m-d', $start) . ' ~ ' . date('Y-m-d', $end);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- public function orderUpdate($id, $name, $data)
|
|
|
|
|
|
|
+ public function orderUpdate_commit($id, $name, $data)
|
|
|
{
|
|
{
|
|
|
Dever::config('base')->hook = true;
|
|
Dever::config('base')->hook = true;
|
|
|
$update = array();
|
|
$update = array();
|
|
@@ -64,7 +64,7 @@ class Set
|
|
|
$state = Dever::db('cash/order')->update(array('where_id' => $id, 'status' => 2, 'operdate' => time(), 'fdate' => time()));
|
|
$state = Dever::db('cash/order')->update(array('where_id' => $id, 'status' => 2, 'operdate' => time(), 'fdate' => time()));
|
|
|
|
|
|
|
|
|
|
|
|
|
- $order = Dever::db('shop/buy_order')->find(array('id' => $info['source_order_id'], 'cache' => false));
|
|
|
|
|
|
|
+ $order = Dever::db('shop/buy_order')->find(array('id' => $info['source_order_id'], 'clear' => true));
|
|
|
if ($state && $info['jstype'] == 2 && isset($order['status']) && $order['status'] == 8) {
|
|
if ($state && $info['jstype'] == 2 && isset($order['status']) && $order['status'] == 8) {
|
|
|
# 如果是退款结算，同时要把主订单也结算
|
|
# 如果是退款结算，同时要把主订单也结算
|
|
|
$where = array();
|
|
$where = array();
|
dever