edit

act/database/order.php

@@ -95,7 +95,7 @@ return array
         'order_id'      => array
         (
             'type'      => 'varchar-100',
-            'name'      => '支付订单ID/订单表ID',
+            'name'      => '支付订单ID',
             'default'   => '',
             'desc'      => '付款订单id',
             'match'     => 'is_string',

act/src/Order.php

@@ -424,7 +424,9 @@ class Order extends Core
 
     public function createOrderId($data, $id)
     {
-        $order_id = 'JM_' . $data['cate_id'] . '_' . $data['product_id'] . '_' . $data['buy_id'] . '_' . $data['uid'] . '_' . $id;
+        $order_id = 'JMC' . $data['cate_id'] . 'P' . $data['product_id'] . 'B' . $data['buy_id'] . 'U' . $data['uid'] . 'I' . $id;
+
+        //$order_id = 'JM_' . $id;
 
         return $order_id;
     }
@@ -441,7 +443,7 @@ class Order extends Core
 
     public function getOrder($order_id)
     {
-        if (is_string($order_id)) {
+        if (!is_numeric($order_id)) {
             $order = Dever::db('act/order')->one(array('order_id' => $order_id));
         } else {
             $order = Dever::db('act/order')->one($order_id);

buy/src/Buy.php

@@ -336,7 +336,6 @@ class Buy extends Base
         }
 
         $order_id = Dever::load('act/order')->createOrderId($order_data, $id);
-        echo $order_id;die;
 
         //$param参数
         $param['id'] = $journal_id;