|
@@ -1411,17 +1411,23 @@ class Order
|
|
|
if ($t <= 0) {
|
|
|
$t = 1;
|
|
|
}
|
|
|
+ /*
|
|
|
$goods = Dever::db('agent/order_goods')->getData(array('order_id' => $info['id']));
|
|
|
if (!$goods) {
|
|
|
$goods = Dever::db('setting/role_goods')->getData(array('role_id' => $info['role'], 'give' => $info['order_type']));
|
|
|
} else {
|
|
|
$t = 1;
|
|
|
- }
|
|
|
+ }*/
|
|
|
$process_button = array();
|
|
|
if (isset($process[3]['type']) && is_array($process[3]['type']) && in_array(2, $process[3]['type'])) {
|
|
|
$process_status = 1;
|
|
|
$process_title = '(已发放权益)';
|
|
|
+ $goods = Dever::db('agent/order_goods')->getData(array('order_id' => $info['id']));
|
|
|
+ if ($goods) {
|
|
|
+ $t = 1;
|
|
|
+ }
|
|
|
} else {
|
|
|
+ $goods = Dever::db('setting/role_goods')->getData(array('role_id' => $info['role'], 'give' => $info['order_type']));
|
|
|
$process_status = 2;
|
|
|
$process_title = '(未发放权益)';
|
|
|
|