|
|
@@ -180,7 +180,7 @@ class Order extends Api
|
|
|
$popular_order = $productOrder->where('id', $order_info['order_id'])->find();
|
|
|
|
|
|
// 生成订单
|
|
|
- $productOrder::setCreateOrder($params['order_id'], $order_info, $productOrder::Transfer, $this->auth->id, $order_info['user_id'], getOrderSN('Z'), $order_info['fees'], $popular_order->popular_price);
|
|
|
+ $productOrder::setCreateOrder($params['order_id'], $order_info, $productOrder::Transfer, $this->auth->id, $order_info['user_id'], $order_info->order_no, $order_info['fees'], $popular_order->popular_price);
|
|
|
|
|
|
//扣除余额记录
|
|
|
$ledgerWalletModel->changeWalletAccount($this->auth->id, Asset::TOKEN, -$order_info['price'], $ledgerWalletModel::Payment, $order_info['user_id']);
|
|
|
@@ -231,7 +231,7 @@ class Order extends Api
|
|
|
if(bccomp($fees, $chabao, 2) > 0) throw new Exception(__("余额不足请前往充值"), 15001);
|
|
|
|
|
|
//添加记录
|
|
|
- $productOrder::setCreateOrder($params['order_id'], $order_info, $productOrder::Giveaway, $user['id'], $this->auth->id, getOrderSN('G'), $fees, $order_info->popular_price);
|
|
|
+ $productOrder::setCreateOrder($params['order_id'], $order_info, $productOrder::Giveaway, $user['id'], $this->auth->id, $order_info->order_no, $fees, $order_info->popular_price);
|
|
|
|
|
|
//对方Rwa+1
|
|
|
if($order_info->popular_price > config('min_rwa_price')) $userModel::updateForRwaNum($user['id'], $userModel::getByParentId($user['id']), 1, '+');
|
|
|
@@ -275,7 +275,7 @@ class Order extends Api
|
|
|
$productTransfer::where('order_id',$params['order_id'])->setField('status', $productTransfer::STOP);
|
|
|
|
|
|
//新增记录
|
|
|
- $productOrder::setCreateOrder($order_info['order_id'], $order_info, $productOrder::Popular, $order_info['user_id'], $order_info['from_user'], getOrderSN('R'), 0, $order_info->popular_price);
|
|
|
+ $productOrder::setCreateOrder($order_info['order_id'], $order_info, $productOrder::Popular, $order_info['user_id'], $order_info['from_user'], $order_info->order_no, 0, $order_info->popular_price);
|
|
|
|
|
|
//修改:类型状态
|
|
|
$order_info->type_id= $productOrder::Transfer;
|
afa