|
@@ -2,6 +2,7 @@
|
|
|
declare(strict_types=1);
|
|
declare(strict_types=1);
|
|
|
namespace SixShop\Lakala\Service;
|
|
namespace SixShop\Lakala\Service;
|
|
|
|
|
|
|
|
|
|
+use SixShop\Lakala\Log;
|
|
|
use SixShop\Lakala\OpenAPISDK\V3\Api\LakalaApi;
|
|
use SixShop\Lakala\OpenAPISDK\V3\Api\LakalaApi;
|
|
|
use SixShop\Lakala\OpenAPISDK\V3\Api\QueryTradequeryApi;
|
|
use SixShop\Lakala\OpenAPISDK\V3\Api\QueryTradequeryApi;
|
|
|
use SixShop\Lakala\OpenAPISDK\V3\Api\TransPreorderApi;
|
|
use SixShop\Lakala\OpenAPISDK\V3\Api\TransPreorderApi;
|
|
@@ -15,7 +16,6 @@ use SixShop\Lakala\OpenAPISDK\V3\Model\TradePreorderWechaGoodsDetail;
|
|
|
use SixShop\Lakala\OpenAPISDK\V3\Model\TransPreorderRequest;
|
|
use SixShop\Lakala\OpenAPISDK\V3\Model\TransPreorderRequest;
|
|
|
use SixShop\Lakala\Config;
|
|
use SixShop\Lakala\Config;
|
|
|
use SixShop\Lakala\Dto\LocationInfo;
|
|
use SixShop\Lakala\Dto\LocationInfo;
|
|
|
-use think\facade\Log;
|
|
|
|
|
use function SixShop\Core\throw_logic_exception;
|
|
use function SixShop\Core\throw_logic_exception;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -28,7 +28,7 @@ class TransactionService
|
|
|
private QueryTradequeryApi $queryTradequeryApi;
|
|
private QueryTradequeryApi $queryTradequeryApi;
|
|
|
|
|
|
|
|
private LakalaApi $lakalaApi;
|
|
private LakalaApi $lakalaApi;
|
|
|
- public function __construct(private Config $config)
|
|
|
|
|
|
|
+ public function __construct(private Config $config, private Log $log)
|
|
|
{
|
|
{
|
|
|
$this->transPreorderApi = new TransPreorderApi($config->getV3Config());
|
|
$this->transPreorderApi = new TransPreorderApi($config->getV3Config());
|
|
|
$this->queryTradequeryApi = new QueryTradequeryApi($config->getV3Config());
|
|
$this->queryTradequeryApi = new QueryTradequeryApi($config->getV3Config());
|
|
@@ -85,9 +85,9 @@ class TransactionService
|
|
|
$request->setRemark($remark);
|
|
$request->setRemark($remark);
|
|
|
$request->setAccBusiFields($accBusiFields);
|
|
$request->setAccBusiFields($accBusiFields);
|
|
|
$request->setCompleteNotifyUrl($this->config->complete_notify_url);
|
|
$request->setCompleteNotifyUrl($this->config->complete_notify_url);
|
|
|
- Log::debug('preOrder request:'.json_encode($request));
|
|
|
|
|
|
|
+ $this->log->debug('preOrder request:'.json_encode($request));
|
|
|
$response = $this->transPreorderApi->transPreorder($request);
|
|
$response = $this->transPreorderApi->transPreorder($request);
|
|
|
- Log::debug('preOrder response:'.json_encode($response->getRespData()));
|
|
|
|
|
|
|
+ $this->log->debug('preOrder response:'.json_encode($response->getRespData()));
|
|
|
if ($response->getCode() == 'BBS00000') {
|
|
if ($response->getCode() == 'BBS00000') {
|
|
|
return $response->getRespData();
|
|
return $response->getRespData();
|
|
|
} else {
|
|
} else {
|