|
@@ -7,8 +7,6 @@ use app\common\controller\Api;
|
|
|
use app\common\model\AnnouncementModel;
|
|
use app\common\model\AnnouncementModel;
|
|
|
use app\common\model\UserCollect;
|
|
use app\common\model\UserCollect;
|
|
|
use app\common\model\ProductBuying;
|
|
use app\common\model\ProductBuying;
|
|
|
-use app\common\model\ParametersModel;
|
|
|
|
|
-use app\common\model\ProductOrder;
|
|
|
|
|
use app\common\model\UserModel;
|
|
use app\common\model\UserModel;
|
|
|
use app\common\model\LedgerWalletModel;
|
|
use app\common\model\LedgerWalletModel;
|
|
|
use app\common\model\ProductTransfer;
|
|
use app\common\model\ProductTransfer;
|
|
@@ -16,8 +14,6 @@ use app\api\logic\MarketLogic;
|
|
|
use app\common\model\UserBuying;
|
|
use app\common\model\UserBuying;
|
|
|
use fast\Action;
|
|
use fast\Action;
|
|
|
use fast\Asset;
|
|
use fast\Asset;
|
|
|
-use fast\Http;
|
|
|
|
|
-use fast\RechargeStatus;
|
|
|
|
|
use think\Db;
|
|
use think\Db;
|
|
|
use think\Exception;
|
|
use think\Exception;
|
|
|
|
|
|
|
@@ -124,7 +120,7 @@ class Market extends Api
|
|
|
} catch (Exception $e) {
|
|
} catch (Exception $e) {
|
|
|
// 回滚事务
|
|
// 回滚事务
|
|
|
Db::rollback();
|
|
Db::rollback();
|
|
|
- return $e->getMessage();
|
|
|
|
|
|
|
+ return $this->error($e->getMessage());
|
|
|
}
|
|
}
|
|
|
$this->success('ok');
|
|
$this->success('ok');
|
|
|
}
|
|
}
|
|
@@ -175,7 +171,7 @@ class Market extends Api
|
|
|
} catch (Exception $e) {
|
|
} catch (Exception $e) {
|
|
|
// 回滚事务
|
|
// 回滚事务
|
|
|
Db::rollback();
|
|
Db::rollback();
|
|
|
- return $e->getMessage();
|
|
|
|
|
|
|
+ return $this->error($e->getMessage());
|
|
|
}
|
|
}
|
|
|
$this->success('ok');
|
|
$this->success('ok');
|
|
|
|
|
|
|
@@ -206,7 +202,7 @@ class Market extends Api
|
|
|
} catch (Exception $e) {
|
|
} catch (Exception $e) {
|
|
|
// 回滚事务
|
|
// 回滚事务
|
|
|
Db::rollback();
|
|
Db::rollback();
|
|
|
- return $e->getMessage();
|
|
|
|
|
|
|
+ return $this->error($e->getMessage());
|
|
|
}
|
|
}
|
|
|
$this->success('ok');
|
|
$this->success('ok');
|
|
|
}
|
|
}
|