浏览代码

让列表取消

afa 7 月之前
父节点
当前提交
91955c7b7d
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. 1 1
      application/api/controller/Order.php
  2. 2 1
      application/api/logic/MarketLogic.php

+ 1 - 1
application/api/controller/Order.php

@@ -270,7 +270,7 @@ class Order extends Api
             if(empty($order_info)) throw new Exception(__("参数有误,无可用产品"));
 
             //取消转让订单
-            $marketLogic::cancelTransferOrder($order_info['order_id'],  $order_info['user_id'], $order_info);
+            $marketLogic::cancelTransferOrder($params['order_id'],  $order_info['user_id'], $order_info);
 
             //修改:类型状态
             $order_info->type_id= $productOrder::Transfer; 

+ 2 - 1
application/api/logic/MarketLogic.php

@@ -62,6 +62,7 @@ class MarketLogic
             //是否全部取消
             $rows  = ProductTransfer::where('order_id', $orderId)->find();
             $count = ProductTransfer::where('product_id', $orderInfo['product_id'])->where('status', ProductTransfer::Normal)->count();
+
             if($count == 1){
                   $isUpdate = true;
                   $market->status = ProductMarket::Hidden;
@@ -81,7 +82,7 @@ class MarketLogic
             $rows->save();
 
             //新增记录
-            return ProductOrder::setCreateOrder($orderId, $orderInfo, ProductOrder::Popular, $userId, $orderInfo['from_user'], getOrderSN('R'.$orderInfo['order_id']), 0, $orderInfo->popular_price);
+            return ProductOrder::setCreateOrder($orderInfo['order_id'], $orderInfo, ProductOrder::Popular, $userId, $orderInfo['from_user'], getOrderSN('R'.$orderInfo['order_id']), 0, $orderInfo->popular_price);
       }