|
@@ -59,7 +59,12 @@ class Pay
|
|
$update['where_id'] = $order['id'];
|
|
$update['where_id'] = $order['id'];
|
|
$update['status'] = 2;
|
|
$update['status'] = 2;
|
|
if ($order['type'] == 3 && !$order['code']) {
|
|
if ($order['type'] == 3 && !$order['code']) {
|
|
- $code = Dever::load('code/lib/core')->createCodeByOrder($order, -1);
|
|
|
|
|
|
+ if ($order['system'] == 2) {
|
|
|
|
+ $code = Dever::load('code/lib/core')->createCodeByOrder($order);
|
|
|
|
+ } else {
|
|
|
|
+ $code = Dever::load('code/lib/core')->createCodeByOrder($order, -1);
|
|
|
|
+ }
|
|
|
|
+
|
|
if ($code) {
|
|
if ($code) {
|
|
$update['code'] = $code;
|
|
$update['code'] = $code;
|
|
}
|
|
}
|
|
@@ -67,6 +72,10 @@ class Pay
|
|
|
|
|
|
Dever::db('act/order')->update($update);
|
|
Dever::db('act/order')->update($update);
|
|
|
|
|
|
|
|
+ if ($order['system'] == 2) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
$score = false;
|
|
$score = false;
|
|
$num = false;
|
|
$num = false;
|
|
$journal = Dever::load('act/order')->getJournal($order['product_id']);
|
|
$journal = Dever::load('act/order')->getJournal($order['product_id']);
|