Prechádzať zdrojové kódy

refactor: 统一代码风格

runphp 2 týždňov pred
rodič
commit
8820f50c17
100 zmenil súbory, kde vykonal 1015 pridanie a 831 odobranie
  1. 2 1
      config.php
  2. 2 1
      info.php
  3. 2 2
      route/admin.php
  4. 2 1
      route/api.php
  5. 1 2
      src/Config.php
  6. 13 12
      src/Controller/Admin/ProfitShareOrderController.php
  7. 3 2
      src/Controller/Admin/ProfitShareReceiverController.php
  8. 4 1
      src/Controller/Admin/TradeOrderController.php
  9. 3 5
      src/Controller/Api/IndexController.php
  10. 5 4
      src/Controller/Api/ProfitShareOrderController.php
  11. 6 3
      src/Controller/Api/ProfitShareReceiverController.php
  12. 2 2
      src/Cron/ProfitShareOrderCron.php
  13. 3 3
      src/Cron/WechatOrderCron.php
  14. 4 3
      src/Dto/LocationInfo.php
  15. 3 2
      src/Entity/LakalaWechatPaymentEntity.php
  16. 3 2
      src/Entity/ProfitShareOrderEntity.php
  17. 5 5
      src/Entity/ProfitShareReceiverEntity.php
  18. 1 1
      src/Enum/ProfitShareOrderCMDTypeEnum.php
  19. 3 1
      src/Enum/ProfitShareOrderStatusEnum.php
  20. 3 1
      src/Enum/ReceiverActionEnum.php
  21. 4 2
      src/Enum/ReceiverStatusEnum.php
  22. 4 2
      src/Enum/UploadFileTypeEnum.php
  23. 4 2
      src/Enum/WechatOrderStateEnum.php
  24. 2 1
      src/Extension.php
  25. 3 1
      src/Facade/Config.php
  26. 2 2
      src/Facade/LaepIndustryService.php
  27. 3 1
      src/Facade/LedgerService.php
  28. 3 1
      src/Facade/MMSService.php
  29. 3 1
      src/Facade/SACSService.php
  30. 3 1
      src/Facade/TransactionService.php
  31. 4 3
      src/Hook/LakalaHook.php
  32. 3 1
      src/Hook/OrderHook.php
  33. 3 1
      src/Model/LakalaWechatPaymentModel.php
  34. 3 2
      src/Model/ProfitShareOrderModel.php
  35. 5 2
      src/Model/ProfitShareReceiverModel.php
  36. 6 5
      src/OpenAPISDK/V2/Api/V2EncryptMode.php
  37. 25 20
      src/OpenAPISDK/V2/Api/V2LakalaApi.php
  38. 12 9
      src/OpenAPISDK/V2/Api/V2LakalaNotifyApi.php
  39. 17 15
      src/OpenAPISDK/V2/Model/V2ModelRequest.php
  40. 28 24
      src/OpenAPISDK/V2/Model/V2ModelResponse.php
  41. 11 7
      src/OpenAPISDK/V2/Model/V2ModelTradeNotify.php
  42. 24 23
      src/OpenAPISDK/V2/Model/V2TermExtInfo.php
  43. 2 1
      src/OpenAPISDK/V2/Model/V2TradeLocationInfo.php
  44. 7 6
      src/OpenAPISDK/V2/Util/V2HttpService.php
  45. 34 33
      src/OpenAPISDK/V2/Util/V2LakalaSM4.php
  46. 2 1
      src/OpenAPISDK/V2/V2ApiException.php
  47. 22 13
      src/OpenAPISDK/V2/V2Configuration.php
  48. 2 1
      src/OpenAPISDK/V2/V2ObjectSerializer.php
  49. 5 5
      src/OpenAPISDK/V3/Api/EncryptMode.php
  50. 25 21
      src/OpenAPISDK/V3/Api/LakalaApi.php
  51. 12 9
      src/OpenAPISDK/V3/Api/LakalaNotifyApi.php
  52. 2 2
      src/OpenAPISDK/V3/Api/QueryTradequeryApi.php
  53. 2 2
      src/OpenAPISDK/V3/Api/RelationRefundApi.php
  54. 2 2
      src/OpenAPISDK/V3/Api/TransMicropayApi.php
  55. 3 4
      src/OpenAPISDK/V3/Api/TransPreorderApi.php
  56. 2 1
      src/OpenAPISDK/V3/ApiException.php
  57. 22 13
      src/OpenAPISDK/V3/Configuration.php
  58. 8 6
      src/OpenAPISDK/V3/Model/ModelRequest.php
  59. 11 7
      src/OpenAPISDK/V3/Model/ModelResponse.php
  60. 11 7
      src/OpenAPISDK/V3/Model/ModelTradeNotify.php
  61. 19 14
      src/OpenAPISDK/V3/Model/QueryTradequeryRequest.php
  62. 53 52
      src/OpenAPISDK/V3/Model/QueryTradequeryResponse.php
  63. 35 24
      src/OpenAPISDK/V3/Model/RelationRefundRequest.php
  64. 32 31
      src/OpenAPISDK/V3/Model/RelationRefundResponse.php
  65. 2 2
      src/OpenAPISDK/V3/Model/TradeAccBusiFields.php
  66. 2 2
      src/OpenAPISDK/V3/Model/TradeExtendParams.php
  67. 2 2
      src/OpenAPISDK/V3/Model/TradeGoodsDetail.php
  68. 8 7
      src/OpenAPISDK/V3/Model/TradeLocationInfo.php
  69. 16 15
      src/OpenAPISDK/V3/Model/TradeMicropayAlipayAccBusiFields.php
  70. 8 7
      src/OpenAPISDK/V3/Model/TradeMicropayAlipayExtendParams.php
  71. 21 20
      src/OpenAPISDK/V3/Model/TradeMicropayAlipayGoodsDetail.php
  72. 16 15
      src/OpenAPISDK/V3/Model/TradeMicropayWechaAccBusiFields.php
  73. 5 6
      src/OpenAPISDK/V3/Model/TradeMicropayWechaDetail.php
  74. 12 11
      src/OpenAPISDK/V3/Model/TradeMicropayWechaGoodsDetail.php
  75. 20 19
      src/OpenAPISDK/V3/Model/TradePreorderAlipayAccBusiFields.php
  76. 10 9
      src/OpenAPISDK/V3/Model/TradePreorderAlipayExtendParams.php
  77. 20 19
      src/OpenAPISDK/V3/Model/TradePreorderAlipayGoodsDetail.php
  78. 3 2
      src/OpenAPISDK/V3/Model/TradePreorderNucspayAccBusiFields.php
  79. 20 19
      src/OpenAPISDK/V3/Model/TradePreorderUnionPayAccBusiFields.php
  80. 14 13
      src/OpenAPISDK/V3/Model/TradePreorderUnionPayAcqAddnDataGoodsInfo.php
  81. 8 7
      src/OpenAPISDK/V3/Model/TradePreorderUnionPayAcqAddnDataOrderInfo.php
  82. 8 7
      src/OpenAPISDK/V3/Model/TradePreorderUnionPayAddnInfo.php
  83. 13 12
      src/OpenAPISDK/V3/Model/TradePreorderUnionPayRiskInfo.php
  84. 22 21
      src/OpenAPISDK/V3/Model/TradePreorderWechaAccBusiFields.php
  85. 5 6
      src/OpenAPISDK/V3/Model/TradePreorderWechaDetail.php
  86. 12 11
      src/OpenAPISDK/V3/Model/TradePreorderWechaGoodsDetail.php
  87. 55 42
      src/OpenAPISDK/V3/Model/TransMicropayRequest.php
  88. 39 38
      src/OpenAPISDK/V3/Model/TransMicropayResponse.php
  89. 30 15
      src/OpenAPISDK/V3/Model/TransPreorderRequest.php
  90. 2 1
      src/OpenAPISDK/V3/Model/TransPreorderResponse.php
  91. 8 3
      src/OpenAPISDK/V3/ObjectSerializer.php
  92. 7 6
      src/OpenAPISDK/V3/Util/HttpService.php
  93. 34 33
      src/OpenAPISDK/V3/Util/LakalaSM4.php
  94. 5 4
      src/PaymentProvider.php
  95. 5 2
      src/Service/LaepIndustryService.php
  96. 8 6
      src/Service/LedgerService.php
  97. 5 3
      src/Service/MMSService.php
  98. 4 1
      src/Service/NotifyService.php
  99. 8 8
      src/Service/PaymentRecordService.php
  100. 3 2
      src/Service/SACSService.php

+ 2 - 1
config.php

@@ -1,4 +1,5 @@
 <?php
+
 // Lakala Payment Extension Configuration
 $uploadProps = [
     "action" => "{{API_BASE_URL}}/admin/filesystem/file",
@@ -396,4 +397,4 @@ return [
             'labelWidth' => '200px'
         ]
     ],
-];
+];

+ 2 - 1
info.php

@@ -1,8 +1,9 @@
 <?php
+
 // Lakala Payment Extension Information
 return [
     'id' => 'lakala',
     'name' => '拉卡拉支付扩展',
     'category' => 'pay',
     'description' => '与拉卡拉支付系统的集成,提供了小程序支付、分账以及提现等功能',
-];
+];

+ 2 - 2
route/admin.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use think\facade\Route;
@@ -8,7 +9,6 @@ use SixShop\Lakala\Controller\Admin\{
     TradeOrderController
 };
 
-
 // Admin路由
 // 路由前缀: /admin/lakala
 //
@@ -28,4 +28,4 @@ Route::resource('profit_share_order', ProfitShareOrderController::class, functio
 
 Route::resource('trade_order', TradeOrderController::class, function () {
     Route::put('express_company', [TradeOrderController::class, 'updateExpressCompany']);
-})->middleware(['auth']);
+})->middleware(['auth']);

+ 2 - 1
route/api.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use think\facade\Route;
@@ -18,4 +19,4 @@ Route::resource('profit_share_order', ProfitShareOrderController::class)
 Route::resource('profit_share_receiver', ProfitShareReceiverController::class)
     ->middleware(['auth']);
 
-Route::post('notify', [IndexController::class, 'notify']);
+Route::post('notify', [IndexController::class, 'notify']);

+ 1 - 2
src/Config.php

@@ -2,7 +2,6 @@
 
 namespace SixShop\Lakala;
 
-use SixShop\Lakala\Extension;
 use SixShop\Lakala\OpenAPISDK\V2\V2Configuration;
 use SixShop\Lakala\OpenAPISDK\V3\Configuration;
 use SixShop\System\Trait\ConfigTrait;
@@ -109,4 +108,4 @@ class Config
     {
         return rtrim(public_path(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . ltrim($relativePath, DIRECTORY_SEPARATOR);
     }
-}
+}

+ 13 - 12
src/Controller/Admin/ProfitShareOrderController.php

@@ -1,5 +1,7 @@
 <?php
+
 declare(strict_types=1);
+
 namespace SixShop\Lakala\Controller\Admin;
 
 use SixShop\Balpay\Entity\ExtensionBalpayLogEntity;
@@ -12,6 +14,7 @@ use SixShop\Lakala\Service\LaepIndustryService;
 use SixShop\Lakala\Service\SACSService;
 use think\facade\Db;
 use think\Response;
+
 use function SixShop\Core\page_response;
 use function SixShop\Core\success_response;
 use function SixShop\Core\throw_logic_exception;
@@ -22,8 +25,7 @@ class ProfitShareOrderController
         Request $request,
         ProfitShareOrderEntity $profitShareOrderEntity,
         LaepIndustryService $laepIndustryService
-    ): Response
-    {
+    ): Response {
         $params = $request->get([
             'status/s',
             'out_separate_no/s',
@@ -45,15 +47,14 @@ class ProfitShareOrderController
         LaepIndustryService $laepIndustryService,
         SACSService $sacsService,
         Config $config,
-    ): Response
-    {
+    ): Response {
         $entity = $profitShareOrderEntity->where(['id' => $id, 'status' => ProfitShareOrderStatusEnum::PENDING])->findOrEmpty();
         if ($entity->isEmpty()) {
             throw_logic_exception('订单不存在或状态异常');
         }
-        $balance = $laepIndustryService->ewalletBalanceQuery(merchantNo: $entity->merchant_no,payType: '03');
+        $balance = $laepIndustryService->ewalletBalanceQuery(merchantNo: $entity->merchant_no, payType: '03');
         if ($balance->acctSt != 'NORMAL') {
-            throw_logic_exception(match ($balance->acctSt){
+            throw_logic_exception(match ($balance->acctSt) {
                 'CLOSE' => '商户已经销户',
                 'FREEZE' => '商户账户被冻结',
                 'STOPPAY' => '商户账户被停付',
@@ -61,11 +62,11 @@ class ProfitShareOrderController
             });
         }
         // 只分给分账接收方
-        $curBalance = (int)round($balance->curBalance * 100,0);
+        $curBalance = (int)round($balance->curBalance * 100, 0);
         if ($curBalance < $entity->separate_value) {
             throw_logic_exception('分账商户余额不足');
         }
-        Db::transaction(function () use ($entity, $sacsService, $config){
+        Db::transaction(function () use ($entity, $sacsService, $config) {
             $response = $sacsService->balanceSeparate([
                 'merchant_no' => $entity->merchant_no,
                 'out_separate_no' => $entity->out_separate_no,
@@ -91,14 +92,14 @@ class ProfitShareOrderController
         int $id,
         Request $request,
         ProfitShareOrderEntity $profitShareOrderEntity,
-        ExtensionBalpayLogEntity $extensionBalpayLogEntity): Response
-    {
+        ExtensionBalpayLogEntity $extensionBalpayLogEntity
+    ): Response {
         $reason = $request->put('reason/s');
         $entity = $profitShareOrderEntity->where(['id' => $id, 'status' => ProfitShareOrderStatusEnum::PENDING])->findOrEmpty();
         if ($entity->isEmpty()) {
             throw_logic_exception('订单不存在或状态异常');
         }
-        $profitShareOrderEntity->transaction(function () use ($entity, $extensionBalpayLogEntity, $id, $reason){
+        $profitShareOrderEntity->transaction(function () use ($entity, $extensionBalpayLogEntity, $id, $reason) {
             $entity->status = ProfitShareOrderStatusEnum::FAIL;
             $entity->fail_reason = $reason;
             $entity->save();
@@ -108,4 +109,4 @@ class ProfitShareOrderController
         });
         return success_response($entity);
     }
-}
+}

+ 3 - 2
src/Controller/Admin/ProfitShareReceiverController.php

@@ -1,12 +1,13 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\Lakala\Controller\Admin;
 
 use SixShop\Core\Request;
-use SixShop\Lakala\Config;
 use SixShop\Lakala\Entity\ProfitShareReceiverEntity;
 use think\Response;
+
 use function SixShop\Core\page_response;
 use function SixShop\Core\success_response;
 
@@ -40,4 +41,4 @@ class ProfitShareReceiverController
     {
         return success_response($entity->modify($id));
     }
-}
+}

+ 4 - 1
src/Controller/Admin/TradeOrderController.php

@@ -1,11 +1,14 @@
 <?php
+
 declare(strict_types=1);
+
 namespace SixShop\Lakala\Controller\Admin;
 
 use SixShop\Core\Request;
 use SixShop\Lakala\Entity\LakalaWechatPaymentEntity;
 use SixShop\Lakala\Service\PaymentRecordService;
 use think\Response;
+
 use function SixShop\Core\page_response;
 use function SixShop\Core\success_response;
 
@@ -37,4 +40,4 @@ class TradeOrderController
             ['id' => $id]
         ));
     }
-}
+}

+ 3 - 5
src/Controller/Api/IndexController.php

@@ -1,13 +1,11 @@
 <?php
+
 declare(strict_types=1);
+
 namespace SixShop\Lakala\Controller\Api;
 
-use SixShop\Core\Request;
 use SixShop\Lakala\Service\NotifyService;
-use think\facade\Log;
 use think\response\Json;
-use function SixShop\Core\error_response;
-use function SixShop\Core\success_response;
 
 class IndexController
 {
@@ -16,4 +14,4 @@ class IndexController
         $notifyService->notify();
         return json(['code' => 'SUCCESS', 'message' => '执行成功']);
     }
-}
+}

+ 5 - 4
src/Controller/Api/ProfitShareOrderController.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\Lakala\Controller\Api;
@@ -10,6 +11,7 @@ use SixShop\Core\Request;
 use SixShop\Lakala\Config;
 use SixShop\Lakala\Entity\ProfitShareOrderEntity;
 use think\Response;
+
 use function SixShop\Core\page_response;
 use function SixShop\Core\success_response;
 use function SixShop\Core\throw_logic_exception;
@@ -29,8 +31,7 @@ class ProfitShareOrderController
         ProfitShareOrderEntity $profitShareOrderEntity,
         ExtensionBalpayLogEntity $extensionBalpayLogEntity,
         Config $config,
-    ): Response
-    {
+    ): Response {
         $userID = (int)$request->userID;
         $amount = $request->post('amount/f', 0);
         if ($amount < $config->profit_share_min) {
@@ -50,7 +51,7 @@ class ProfitShareOrderController
             $userID,
             $receiverID,
             $amount
-        ){
+        ) {
             $profitShareOrder = $profitShareOrderEntity->createOrder($userID, $receiverID, $amount);
             $extensionBalpayLogEntity->change($userID, $amount, BalpayLogTypeEnum::PROFIT_SHARE, '分账', $profitShareOrder->id);
 
@@ -59,4 +60,4 @@ class ProfitShareOrderController
 
         return success_response($result);
     }
-}
+}

+ 6 - 3
src/Controller/Api/ProfitShareReceiverController.php

@@ -1,5 +1,7 @@
 <?php
+
 declare(strict_types=1);
+
 namespace SixShop\Lakala\Controller\Api;
 
 use app\model\User;
@@ -9,6 +11,7 @@ use SixShop\Lakala\Entity\ProfitShareReceiverEntity;
 use SixShop\Lakala\Enum\ReceiverActionEnum;
 use SixShop\Lakala\Enum\ReceiverStatusEnum;
 use think\Response;
+
 use function SixShop\Core\page_response;
 use function SixShop\Core\success_response;
 use function SixShop\Core\throw_logic_exception;
@@ -48,13 +51,13 @@ class ProfitShareReceiverController
         );
     }
 
-    public function read(int $id, Request $request, ProfitShareReceiverEntity $entity):Response
+    public function read(int $id, Request $request, ProfitShareReceiverEntity $entity): Response
     {
         $params = ['user_id' => $request->userID, 'id' => $id];
         return success_response($entity->getReceiver($params));
     }
 
-    public function update(int $id, Request $request, ProfitShareReceiverEntity $entity):Response
+    public function update(int $id, Request $request, ProfitShareReceiverEntity $entity): Response
     {
         $params = [
             'user_id' => $request->userID,
@@ -74,4 +77,4 @@ class ProfitShareReceiverController
         ])->count() > 0 && throw_logic_exception('有待处理的变更申请,请勿重复提交');
         return success_response($entity->updateReceiver($params, $data));
     }
-}
+}

+ 2 - 2
src/Cron/ProfitShareOrderCron.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\Lakala\Cron;
@@ -6,7 +7,6 @@ namespace SixShop\Lakala\Cron;
 use SixShop\Core\Attribute\Cron;
 use SixShop\Lakala\Entity\ProfitShareOrderEntity;
 use SixShop\Lakala\Enum\ProfitShareOrderStatusEnum;
-use function Symfony\Component\Translation\t;
 
 class ProfitShareOrderCron
 {
@@ -29,4 +29,4 @@ class ProfitShareOrderCron
             $this->profitShareOrderEntity->queryProfitShareOrderResult($profitShareOrder->id);
         }
     }
-}
+}

+ 3 - 3
src/Cron/WechatOrderCron.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\Lakala\Cron;
@@ -17,8 +18,7 @@ class WechatOrderCron
     public function __construct(
         private PaymentRecordService $paymentRecordService,
         private ExpressService       $expressService,
-    )
-    {
+    ) {
         $this->expressService->getAllDelivery();
     }
 
@@ -100,4 +100,4 @@ class WechatOrderCron
                 }
             });
     }
-}
+}

+ 4 - 3
src/Dto/LocationInfo.php

@@ -1,5 +1,7 @@
 <?php
+
 declare(strict_types=1);
+
 namespace SixShop\Lakala\Dto;
 
 class LocationInfo implements \JsonSerializable
@@ -21,8 +23,7 @@ class LocationInfo implements \JsonSerializable
         private string $requestIP,
         private string $baseStation = '',
         private string $location = ''
-    )
-    {
+    ) {
     }
 
     public function jsonSerialize(): array
@@ -33,4 +34,4 @@ class LocationInfo implements \JsonSerializable
             'location' => $this->location
         ];
     }
-}
+}

+ 3 - 2
src/Entity/LakalaWechatPaymentEntity.php

@@ -1,5 +1,7 @@
 <?php
+
 declare(strict_types=1);
+
 namespace SixShop\Lakala\Entity;
 
 use SixShop\Core\Entity\BaseEntity;
@@ -9,5 +11,4 @@ use SixShop\Core\Entity\BaseEntity;
  */
 class LakalaWechatPaymentEntity extends BaseEntity
 {
-
-}
+}

+ 3 - 2
src/Entity/ProfitShareOrderEntity.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\Lakala\Entity;
@@ -10,13 +11,13 @@ use SixShop\Lakala\Enum\ProfitShareOrderCMDTypeEnum;
 use SixShop\Lakala\Enum\ProfitShareOrderStatusEnum;
 use SixShop\Lakala\Enum\ReceiverStatusEnum;
 use SixShop\Lakala\Facade\Config;
-use SixShop\Lakala\Facade\LaepIndustryService;
 use SixShop\Lakala\Facade\LedgerService;
 use SixShop\Lakala\Facade\SACSService;
 use SixShop\Lakala\Model\ProfitShareOrderModel;
 use SixShop\Lakala\Model\ProfitShareReceiverModel;
 use think\db\Query;
 use think\Paginator;
+
 use function SixShop\Core\throw_logic_exception;
 
 /**
@@ -141,4 +142,4 @@ class ProfitShareOrderEntity extends BaseEntity
         }
         return $entity;
     }
-}
+}

+ 5 - 5
src/Entity/ProfitShareReceiverEntity.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\Lakala\Entity;
@@ -8,15 +9,14 @@ use SixShop\Core\Exception\LogicException;
 use SixShop\Lakala\Enum\ReceiverActionEnum;
 use SixShop\Lakala\Enum\UploadFileTypeEnum;
 use SixShop\Lakala\Facade\Config;
-use SixShop\Lakala\Enum\ProfitShareOrderStatusEnum;
 use SixShop\Lakala\Enum\ReceiverStatusEnum;
 use SixShop\Lakala\Facade\LedgerService;
 use SixShop\Lakala\Facade\MMSService;
 use SixShop\Lakala\Model\ProfitShareReceiverModel;
 use think\db\Query;
 use think\facade\Db;
-use think\Model;
 use think\Paginator;
+
 use function SixShop\Core\throw_logic_exception;
 
 /**
@@ -178,7 +178,7 @@ class ProfitShareReceiverEntity extends BaseEntity
         return $entity;
     }
 
-    public function updateReceiver(array $params, array $data):self
+    public function updateReceiver(array $params, array $data): self
     {
         /* @var self $entity */
         $entity = $this->where($params)->findOrEmpty();
@@ -186,7 +186,7 @@ class ProfitShareReceiverEntity extends BaseEntity
             throw_logic_exception('分账接收方申请记录不存在!');
         }
         $saveData = $entity->toArray();
-        if($saveData['receiver_name'] == $data['receiver_name']
+        if ($saveData['receiver_name'] == $data['receiver_name']
             && $saveData['contact_mobile'] == $data['contact_mobile']
             && $saveData['acct_type_code'] == $data['acct_type_code']
             && $saveData['acct_open_bank_name'] == $data['acct_open_bank_name']
@@ -238,4 +238,4 @@ class ProfitShareReceiverEntity extends BaseEntity
         }
         return $entity;
     }
-}
+}

+ 1 - 1
src/Enum/ProfitShareOrderCMDTypeEnum.php

@@ -2,7 +2,7 @@
 
 namespace SixShop\Lakala\Enum;
 
-enum ProfitShareOrderCMDTypeEnum:string
+enum ProfitShareOrderCMDTypeEnum: string
 {
     case SEPARATE = 'SEPARATE';
     case CANCEL = 'CANCEL';

+ 3 - 1
src/Enum/ProfitShareOrderStatusEnum.php

@@ -1,8 +1,10 @@
 <?php
+
 declare(strict_types=1);
+
 namespace SixShop\Lakala\Enum;
 
-enum ProfitShareOrderStatusEnum:string
+enum ProfitShareOrderStatusEnum: string
 {
     case PENDING = 'PENDING';
     case PROCESSING = 'PROCESSING';

+ 3 - 1
src/Enum/ReceiverActionEnum.php

@@ -1,8 +1,10 @@
 <?php
+
 declare(strict_types=1);
+
 namespace SixShop\Lakala\Enum;
 
-enum ReceiverActionEnum:string
+enum ReceiverActionEnum: string
 {
     case ADD = 'add';
     case UPDATE = 'update';

+ 4 - 2
src/Enum/ReceiverStatusEnum.php

@@ -1,8 +1,10 @@
 <?php
+
 declare(strict_types=1);
+
 namespace SixShop\Lakala\Enum;
 
-enum ReceiverStatusEnum:int
+enum ReceiverStatusEnum: int
 {
     case PENDING = 1;
     case SUBMITTING = 2;
@@ -25,4 +27,4 @@ enum ReceiverStatusEnum:int
             default => '未知状态',
         };
     }
-}
+}

+ 4 - 2
src/Enum/UploadFileTypeEnum.php

@@ -1,8 +1,10 @@
 <?php
+
 declare(strict_types=1);
+
 namespace SixShop\Lakala\Enum;
 
-enum UploadFileTypeEnum:string
+enum UploadFileTypeEnum: string
 {
     /**
      * 法人身份证正面
@@ -76,4 +78,4 @@ enum UploadFileTypeEnum:string
      * 其他
      */
     case OTHERS = 'OTHERS';
-}
+}

+ 4 - 2
src/Enum/WechatOrderStateEnum.php

@@ -1,8 +1,10 @@
 <?php
+
 declare(strict_types=1);
+
 namespace SixShop\Lakala\Enum;
 
-enum WechatOrderStateEnum:int
+enum WechatOrderStateEnum: int
 {
     /**
      * 待发货
@@ -46,4 +48,4 @@ enum WechatOrderStateEnum:int
             default => '未知状态',
         };
     }
-}
+}

+ 2 - 1
src/Extension.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\Lakala;
@@ -42,4 +43,4 @@ class Extension extends ExtensionAbstract implements PaymentExtensionInterface
             WechatOrderCron::class,
         ];
     }
-}
+}

+ 3 - 1
src/Facade/Config.php

@@ -1,5 +1,7 @@
 <?php
+
 declare(strict_types=1);
+
 namespace SixShop\Lakala\Facade;
 
 use think\Facade;
@@ -13,4 +15,4 @@ class Config extends Facade
     {
         return \SixShop\Lakala\Config::class;
     }
-}
+}

+ 2 - 2
src/Facade/LaepIndustryService.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\Lakala\Facade;
@@ -10,9 +11,8 @@ use think\Facade;
  */
 class LaepIndustryService extends Facade
 {
-
     protected static function getFacadeClass()
     {
         return \SixShop\Lakala\Service\LaepIndustryService::class;
     }
-}
+}

+ 3 - 1
src/Facade/LedgerService.php

@@ -1,5 +1,7 @@
 <?php
+
 declare(strict_types=1);
+
 namespace SixShop\Lakala\Facade;
 
 use think\Facade;
@@ -13,4 +15,4 @@ class LedgerService extends Facade
     {
         return \SixShop\Lakala\Service\LedgerService::class;
     }
-}
+}

+ 3 - 1
src/Facade/MMSService.php

@@ -1,5 +1,7 @@
 <?php
+
 declare(strict_types=1);
+
 namespace SixShop\Lakala\Facade;
 
 use think\Facade;
@@ -13,4 +15,4 @@ class MMSService extends Facade
     {
         return \SixShop\Lakala\Service\MMSService::class;
     }
-}
+}

+ 3 - 1
src/Facade/SACSService.php

@@ -1,5 +1,7 @@
 <?php
+
 declare(strict_types=1);
+
 namespace SixShop\Lakala\Facade;
 
 use think\Facade;
@@ -13,4 +15,4 @@ class SACSService extends Facade
     {
         return \SixShop\Lakala\Service\SACSService::class;
     }
-}
+}

+ 3 - 1
src/Facade/TransactionService.php

@@ -1,5 +1,7 @@
 <?php
+
 declare(strict_types=1);
+
 namespace SixShop\Lakala\Facade;
 
 use think\Facade;
@@ -13,4 +15,4 @@ class TransactionService extends Facade
     {
         return \SixShop\Lakala\Service\TransactionService::class;
     }
-}
+}

+ 4 - 3
src/Hook/LakalaHook.php

@@ -1,8 +1,9 @@
 <?php
+
 declare(strict_types=1);
+
 namespace SixShop\Lakala\Hook;
 
-use app\model\User;
 use SixShop\Core\Attribute\Hook;
 use SixShop\Payment\Event\GatheringPaymentEvent;
 use SixShop\Payment\PaymentInfo;
@@ -21,8 +22,8 @@ class LakalaHook
             '拉卡拉',
             '拉卡拉',
             params: [
-                'openid' => $event->request->userID?WechatUser::openid($event->request->userID):null,
+                'openid' => $event->request->userID ? WechatUser::openid($event->request->userID) : null,
             ]
         );
     }
-}
+}

+ 3 - 1
src/Hook/OrderHook.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\Lakala\Hook;
@@ -10,6 +11,7 @@ use SixShop\Core\Attribute\Hook;
 use SixShop\Lakala\Enum\WechatOrderStateEnum;
 use SixShop\Payment\Model\ExtensionPaymentModel;
 use SixShop\Wechat\Service\ExpressService;
+
 use function SixShop\Core\throw_logic_exception;
 
 class OrderHook
@@ -76,4 +78,4 @@ class OrderHook
             }
         }
     }
-}
+}

+ 3 - 1
src/Model/LakalaWechatPaymentModel.php

@@ -1,5 +1,7 @@
 <?php
+
 declare(strict_types=1);
+
 namespace SixShop\Lakala\Model;
 
 use SixShop\Lakala\Enum\WechatOrderStateEnum;
@@ -21,4 +23,4 @@ class LakalaWechatPaymentModel extends Model
     {
         return $data['order_state']->toString();
     }
-}
+}

+ 3 - 2
src/Model/ProfitShareOrderModel.php

@@ -1,11 +1,12 @@
 <?php
+
 declare(strict_types=1);
+
 namespace SixShop\Lakala\Model;
 
 use app\model\User;
 use SixShop\Lakala\Enum\ProfitShareOrderCMDTypeEnum;
 use SixShop\Lakala\Enum\ProfitShareOrderStatusEnum;
-use SixShop\Lakala\Enum\ReceiverStatusEnum;
 use SixShop\Payment\Enum\NumberBizEnum;
 use think\Model;
 use think\model\relation\BelongsTo;
@@ -53,4 +54,4 @@ class ProfitShareOrderModel extends Model
     {
         return $this->belongsTo(User::class, 'user_id', 'id');
     }
-}
+}

+ 5 - 2
src/Model/ProfitShareReceiverModel.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\Lakala\Model;
@@ -46,7 +47,9 @@ class ProfitShareReceiverModel extends Model
 
     public function searchStatusAttr(Query $query, $value, $data)
     {
-        if ($value === null) return;
+        if ($value === null) {
+            return;
+        }
         $status = ReceiverStatusEnum::tryFrom($value);
         $status && $query->where('status', $value);
     }
@@ -60,4 +63,4 @@ class ProfitShareReceiverModel extends Model
     {
         return $this->belongsTo(User::class, 'user_id', 'id');
     }
-}
+}

+ 6 - 5
src/OpenAPISDK/V2/Api/V2EncryptMode.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\Lakala\OpenAPISDK\V2\Api;
@@ -10,11 +11,11 @@ namespace SixShop\Lakala\OpenAPISDK\V2\Api;
 class V2EncryptMode
 {
     // 普通无加解密:请求为明文,返回也是明文
-    const NONE = 'none';
+    public const NONE = 'none';
     // 只请求加密,返回为明文
-    const REQUEST = 'request';
+    public const REQUEST = 'request';
     // 请求明文、响应需解密
-    const RESPONSE = 'response';
+    public const RESPONSE = 'response';
     // 请求需加密、返回需解密
-    const BOTH = 'both';
-}
+    public const BOTH = 'both';
+}

+ 25 - 20
src/OpenAPISDK/V2/Api/V2LakalaApi.php

@@ -5,11 +5,8 @@ namespace SixShop\Lakala\OpenAPISDK\V2\Api;
 use SixShop\Lakala\OpenAPISDK\V2\V2ApiException;
 use SixShop\Lakala\OpenAPISDK\V2\V2ObjectSerializer;
 use SixShop\Lakala\OpenAPISDK\V2\V2Configuration;
-use SixShop\Lakala\OpenAPISDK\V2\Util\V2HttpService;
 use SixShop\Lakala\OpenAPISDK\V2\Util\V2LakalaSM4;
-
 use SixShop\Lakala\OpenAPISDK\V2\Model\V2ModelRequest;
-use SixShop\Lakala\OpenAPISDK\V2\Model\V2ModelResponse;
 
 /**
  * LakalaApi Class
@@ -21,7 +18,6 @@ use SixShop\Lakala\OpenAPISDK\V2\Model\V2ModelResponse;
  */
 class V2LakalaApi
 {
-
     /**
      * @var string 随机字符串集
      */
@@ -53,16 +49,18 @@ class V2LakalaApi
         $this->resourcePath = $resourcePath;
         return $this;
     }
-    
+
     public function getResourcePath()
     {
         return $this->resourcePath;
     }
 
-    public function tradeApi($resourcePath, V2ModelRequest $v2ModelRequest,
-                                            $returnType = '\SixShop\Lakala\OpenAPISDK\V2\Model\V2ModelResponse',
-                                            $method = 'POST')
-    {
+    public function tradeApi(
+        $resourcePath,
+        V2ModelRequest $v2ModelRequest,
+        $returnType = '\SixShop\Lakala\OpenAPISDK\V2\Model\V2ModelResponse',
+        $method = 'POST'
+    ) {
         $headerParams = [];
 
         if (!$v2ModelRequest->valid()) {
@@ -76,9 +74,13 @@ class V2LakalaApi
         return $this->apiWithBody($resourcePath, $httpBody, $headerParams, $method, $returnType);
     }
 
-    public function apiWithBody($resourcePath, $httpBody, $headerParams = [], $method = 'POST',
-                                               $returnType = '\SixShop\Lakala\OpenAPISDK\V2\Model\V2ModelResponse')
-    {
+    public function apiWithBody(
+        $resourcePath,
+        $httpBody,
+        $headerParams = [],
+        $method = 'POST',
+        $returnType = '\SixShop\Lakala\OpenAPISDK\V2\Model\V2ModelResponse'
+    ) {
         $this->setResourcePath($resourcePath);
 
         if (!is_string($httpBody)) {
@@ -138,7 +140,7 @@ class V2LakalaApi
             );
         }
         // 请求咱解密
-        if($this->v2EncryptMode == V2EncryptMode::RESPONSE || $this->v2EncryptMode == V2EncryptMode::BOTH) {
+        if ($this->v2EncryptMode == V2EncryptMode::RESPONSE || $this->v2EncryptMode == V2EncryptMode::BOTH) {
             // echo "\n<!-- \n" . $response['body'] . "\n--->\n";
             $sm4 = new V2LakalaSM4();
             $body = $sm4->decrypt(base64_decode($this->config->getSm4Key()), $response['body']);
@@ -159,7 +161,7 @@ class V2LakalaApi
         $url = $this->config->getHost() . $this->getResourcePath();
 
         // SM4加密请求体
-        if($this->v2EncryptMode == V2EncryptMode::REQUEST || $this->v2EncryptMode == V2EncryptMode::BOTH) {
+        if ($this->v2EncryptMode == V2EncryptMode::REQUEST || $this->v2EncryptMode == V2EncryptMode::BOTH) {
             $sm4 = new V2LakalaSM4();
             $httpBody = $sm4->encrypt(base64_decode($this->config->getSm4Key()), $httpBody);
         }
@@ -220,21 +222,23 @@ class V2LakalaApi
         return $authorization;
     }
 
-    protected function getRandomString($length = 10) {
+    protected function getRandomString($length = 10)
+    {
         $randomString = '';
         $charsetLength = strlen($this->charset);
-    
+
         // 生成随机字符串
         for ($i = 0; $i < $length; $i++) {
             $randomChar = $this->charset[rand(0, $charsetLength - 1)];  // 随机选择字符
             $randomString .= $randomChar;
         }
-    
+
         return $randomString;
     }
 
     //生成 sha256WithRSA 签名
-    protected function rsaSign($content) {
+    protected function rsaSign($content)
+    {
         $privateContent = file_get_contents($this->config->getMerchantPrivateKeyPath());
         $privateKey = openssl_pkey_get_private($privateContent);
         if (!$privateKey) {
@@ -250,7 +254,8 @@ class V2LakalaApi
         return base64_encode($sign);
     }
 
-    protected function responseVerifySign($headers, $body) {
+    protected function responseVerifySign($headers, $body)
+    {
         $sign = $headers['Lklapi-Signature'];
         $sign = base64_decode($sign);
         $data = $headers['Lklapi-Appid'] . "\n"
@@ -265,4 +270,4 @@ class V2LakalaApi
         $result = openssl_verify($data, $sign, $key, OPENSSL_ALGO_SHA256) === 1;
         return $result;
     }
-}
+}

+ 12 - 9
src/OpenAPISDK/V2/Api/V2LakalaNotifyApi.php

@@ -4,9 +4,6 @@ namespace SixShop\Lakala\OpenAPISDK\V2\Api;
 
 use SixShop\Lakala\OpenAPISDK\V2\V2ApiException;
 use SixShop\Lakala\OpenAPISDK\V2\V2Configuration;
-use SixShop\Lakala\OpenAPISDK\V2\V2ObjectSerializer;
-
-use SixShop\Lakala\OpenAPISDK\V2\Model\V2ModelTradeNotify;
 
 /**
  * V2LakalaNotifyApi Class
@@ -25,7 +22,8 @@ class V2LakalaNotifyApi
         $this->config = $config;
     }
 
-    public function notiApi() {
+    public function notiApi()
+    {
         $headers = getallheaders();
         $body = file_get_contents('php://input');
 
@@ -42,10 +40,13 @@ class V2LakalaNotifyApi
         return $notify;
     }
 
-    protected function requestVerifySign($authorization, $body) {
+    protected function requestVerifySign($authorization, $body)
+    {
         $pattern = '/timestamp="(\d+)",nonce_str="(\w+)",signature="([^"]+)"/';
         preg_match($pattern, $authorization, $matches);
-        if (count($matches) == 0) return false;
+        if (count($matches) == 0) {
+            return false;
+        }
 
         $timestamp = $matches[1];
         $nonce_str = $matches[2];
@@ -62,15 +63,17 @@ class V2LakalaNotifyApi
         return $result;
     }
 
-    public function success() {
+    public function success()
+    {
         echo '{"code":"SUCCESS","message":"执行成功"}';
     }
 
-    public function fail($msg) {
+    public function fail($msg)
+    {
         $ret = [
             'code' => 'FAIL',
             'message' => $msg
         ];
         echo json_encode($ret, JSON_UNESCAPED_UNICODE);
     }
-}
+}

+ 17 - 15
src/OpenAPISDK/V2/Model/V2ModelRequest.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * V2ModelRequest
  * PHP version 7.4
@@ -11,7 +12,8 @@
 
 namespace SixShop\Lakala\OpenAPISDK\V2\Model;
 
-class V2ModelRequest {
+class V2ModelRequest
+{
     // 请求时间	M	String(14)	请求时间,格式yyyyMMddHHmmss
     protected $timestamp;
     // 随机数	C	String(32)	随机数
@@ -43,73 +45,73 @@ class V2ModelRequest {
         $this->timestamp = $timestamp;
         return $this;
     }
-    
+
     public function getTimestamp()
     {
         return $this->timestamp;
     }
-    
+
     public function setRnd($rnd)
     {
         $this->rnd = $rnd;
         return $this;
     }
-    
+
     public function getRnd()
     {
         return $this->rnd;
     }
-    
+
     public function setVer($ver)
     {
         $this->ver = $ver;
         return $this;
     }
-    
+
     public function getVer()
     {
         return $this->ver;
     }
-    
+
     public function setReqId($reqId)
     {
         $this->reqId = $reqId;
         return $this;
     }
-    
+
     public function getReqId()
     {
         return $this->reqId;
     }
-    
+
     public function setReqData($reqData)
     {
         $this->reqData = $reqData;
         return $this;
     }
-    
+
     public function getReqData()
     {
         return $this->reqData;
     }
-    
+
     public function setLocationInfo($locationInfo)
     {
         $this->locationInfo = $locationInfo;
         return $this;
     }
-    
+
     public function getLocationInfo()
     {
         return $this->locationInfo;
     }
-    
+
     public function setTermExtInfo($termExtInfo)
     {
         $this->termExtInfo = $termExtInfo;
         return $this;
     }
-    
+
     public function getTermExtInfo()
     {
         return $this->termExtInfo;
@@ -150,4 +152,4 @@ class V2ModelRequest {
             'termExtInfo' => $this->termExtInfo === null ? $this->termExtInfo : $this->termExtInfo->jsonSerialize(),
         ];
     }
-}
+}

+ 28 - 24
src/OpenAPISDK/V2/Model/V2ModelResponse.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * V2ModelResponse
  * PHP version 7.4
@@ -11,7 +12,8 @@
 
 namespace SixShop\Lakala\OpenAPISDK\V2\Model;
 
-class V2ModelResponse {
+class V2ModelResponse
+{
     protected $retCode;
     protected $retMsg;
     protected $sign;
@@ -23,101 +25,101 @@ class V2ModelResponse {
     protected $respData;
     protected $headers;
     protected $originalText;
-    
+
     public function setRetCode($retCode)
     {
         $this->retCode = $retCode;
         return $this;
     }
-    
+
     public function getRetCode()
     {
         return $this->retCode;
     }
-    
+
     public function setRetMsg($retMsg)
     {
         $this->retMsg = $retMsg;
         return $this;
     }
-    
+
     public function getRetMsg()
     {
         return $this->retMsg;
     }
-    
+
     public function setSign($sign)
     {
         $this->sign = $sign;
         return $this;
     }
-    
+
     public function getSign()
     {
         return $this->sign;
     }
-    
+
     public function setTimestamp($timestamp)
     {
         $this->timestamp = $timestamp;
         return $this;
     }
-    
+
     public function getTimestamp()
     {
         return $this->timestamp;
     }
-    
+
     public function setRnd($rnd)
     {
         $this->rnd = $rnd;
         return $this;
     }
-    
+
     public function getRnd()
     {
         return $this->rnd;
     }
-    
+
     public function setReqId($reqId)
     {
         $this->reqId = $reqId;
         return $this;
     }
-    
+
     public function getReqId()
     {
         return $this->reqId;
     }
-    
+
     public function setRespId($respId)
     {
         $this->respId = $respId;
         return $this;
     }
-    
+
     public function getRespId()
     {
         return $this->respId;
     }
-    
+
     public function setVer($ver)
     {
         $this->ver = $ver;
         return $this;
     }
-    
+
     public function getVer()
     {
         return $this->ver;
     }
-    
+
     public function setRespData($respData)
     {
         $this->respData = $respData;
         return $this;
     }
-    
+
     public function getRespData()
     {
         return $this->respData;
@@ -128,23 +130,25 @@ class V2ModelResponse {
         $this->headers = $headers;
         return $this;
     }
-    
+
     public function getHeaders()
     {
         return $this->headers;
     }
 
-    public function setOriginalText($originalText) {
+    public function setOriginalText($originalText)
+    {
         $this->originalText = $originalText;
         return $this;
     }
 
-    public function getOriginalText() {
+    public function getOriginalText()
+    {
         return $this->originalText;
     }
 
     public function jsonSerialize()
     {
-       return V2ObjectSerializer::sanitizeForSerialization($this);
+        return V2ObjectSerializer::sanitizeForSerialization($this);
     }
-}
+}

+ 11 - 7
src/OpenAPISDK/V2/Model/V2ModelTradeNotify.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
  * V2ModelTradeNotify
  * 交易回调Model
- * 
+ *
  * PHP version 7.4
  *
  * @category Class
@@ -13,7 +14,8 @@
 
 namespace SixShop\Lakala\OpenAPISDK\V2\Model;
 
-class V2ModelTradeNotify {
+class V2ModelTradeNotify
+{
     // 响应头信息
     protected $headers;
     // 响应原文
@@ -24,23 +26,25 @@ class V2ModelTradeNotify {
         $this->headers = $headers;
         return $this;
     }
-    
+
     public function getHeaders()
     {
         return $this->headers;
     }
 
-    public function setOriginalText($originalText) {
+    public function setOriginalText($originalText)
+    {
         $this->originalText = $originalText;
         return $this;
     }
 
-    public function getOriginalText() {
+    public function getOriginalText()
+    {
         return $this->originalText;
     }
 
     public function jsonSerialize()
     {
-       return ObjectSerializer::sanitizeForSerialization($this);
+        return ObjectSerializer::sanitizeForSerialization($this);
     }
-}
+}

+ 24 - 23
src/OpenAPISDK/V2/Model/V2TermExtInfo.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 终端信息
  * V2TermExtInfo
@@ -25,123 +26,123 @@ class V2TermExtInfo implements \JsonSerializable
     protected $appCode;
     protected $appVer;
     protected $termFP;
-    
+
     public function setTermSN($termSN)
     {
         $this->termSN = $termSN;
         return $this;
     }
-    
+
     public function getTermSN()
     {
         return $this->termSN;
     }
-    
+
     public function setTermBaseStation($termBaseStation)
     {
         $this->termBaseStation = $termBaseStation;
         return $this;
     }
-    
+
     public function getTermBaseStation()
     {
         return $this->termBaseStation;
     }
-    
+
     public function setTermLoc($termLoc)
     {
         $this->termLoc = $termLoc;
         return $this;
     }
-    
+
     public function getTermLoc()
     {
         return $this->termLoc;
     }
-    
+
     public function setTermIp($termIp)
     {
         $this->termIp = $termIp;
         return $this;
     }
-    
+
     public function getTermIp()
     {
         return $this->termIp;
     }
-    
+
     public function setTermSerialNo($termSerialNo)
     {
         $this->termSerialNo = $termSerialNo;
         return $this;
     }
-    
+
     public function getTermSerialNo()
     {
         return $this->termSerialNo;
     }
-    
+
     public function setTermType($termType)
     {
         $this->termType = $termType;
         return $this;
     }
-    
+
     public function getTermType()
     {
         return $this->termType;
     }
-    
+
     public function setTermModel($termModel)
     {
         $this->termModel = $termModel;
         return $this;
     }
-    
+
     public function getTermModel()
     {
         return $this->termModel;
     }
-    
+
     public function setTermManu($termManu)
     {
         $this->termManu = $termManu;
         return $this;
     }
-    
+
     public function getTermManu()
     {
         return $this->termManu;
     }
-    
+
     public function setAppCode($appCode)
     {
         $this->appCode = $appCode;
         return $this;
     }
-    
+
     public function getAppCode()
     {
         return $this->appCode;
     }
-    
+
     public function setAppVer($appVer)
     {
         $this->appVer = $appVer;
         return $this;
     }
-    
+
     public function getAppVer()
     {
         return $this->appVer;
     }
-    
+
     public function setTermFP($termFP)
     {
         $this->termFP = $termFP;
         return $this;
     }
-    
+
     public function getTermFP()
     {
         return $this->termFP;
@@ -163,4 +164,4 @@ class V2TermExtInfo implements \JsonSerializable
             'termFP' => $this->termFP,
         ];
     }
-}
+}

+ 2 - 1
src/OpenAPISDK/V2/Model/V2TradeLocationInfo.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 地址位置信息
  * TradeLocationInfo
@@ -64,4 +65,4 @@ class V2TradeLocationInfo implements \JsonSerializable
             'location' => $this->location,
         ];
     }
-}
+}

+ 7 - 6
src/OpenAPISDK/V2/Util/V2HttpService.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * V2HttpService
  * PHP version 7.4
@@ -19,10 +20,10 @@ namespace SixShop\Lakala\OpenAPISDK\V2\Util;
 class V2HttpService
 {
     // Response types
-    const RESPOND_TYPE_SIMPLE = 'simple';
-    const RESPOND_TYPE_ORIGINAL = 'original';
-    const RESPOND_TYPE_ARRAY = 'array';
-    const RESPOND_TYPE_JSON = 'json';
+    public const RESPOND_TYPE_SIMPLE = 'simple';
+    public const RESPOND_TYPE_ORIGINAL = 'original';
+    public const RESPOND_TYPE_ARRAY = 'array';
+    public const RESPOND_TYPE_JSON = 'json';
 
     /**
      * Send a GET request
@@ -60,7 +61,7 @@ class V2HttpService
     public static function request($method, $url, array $options = [])
     {
         $curl = curl_init();
-// print_r($options);
+        // print_r($options);
         // Set GET parameters
         if (!empty($options['query'])) {
             $url .= (strpos($url, '?') === false ? '?' : '&') . http_build_query($options['query']);
@@ -160,4 +161,4 @@ class V2HttpService
         }
         return $headers;
     }
-}
+}

+ 34 - 33
src/OpenAPISDK/V2/Util/V2LakalaSM4.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * V2LakalaSM4
  * PHP version 7.4
@@ -13,7 +14,7 @@ namespace SixShop\Lakala\OpenAPISDK\V2\Util;
 
 class V2LakalaSM4
 {
-    const SM4_CK = [
+    public const SM4_CK = [
         0x00070e15, 0x1c232a31, 0x383f464d, 0x545b6269,
         0x70777e85, 0x8c939aa1, 0xa8afb6bd, 0xc4cbd2d9,
         0xe0e7eef5, 0xfc030a11, 0x181f262d, 0x343b4249,
@@ -24,7 +25,7 @@ class V2LakalaSM4
         0x10171e25, 0x2c333a41, 0x484f565d, 0x646b7279
     ];
 
-    const SM4_SBOX = [
+    public const SM4_SBOX = [
         0xd6,0x90,0xe9,0xfe,0xcc,0xe1,0x3d,0xb7,0x16,0xb6,0x14,0xc2,0x28,0xfb,0x2c,0x05,
         0x2b,0x67,0x9a,0x76,0x2a,0xbe,0x04,0xc3,0xaa,0x44,0x13,0x26,0x49,0x86,0x06,0x99,
         0x9c,0x42,0x50,0xf4,0x91,0xef,0x98,0x7a,0x33,0x54,0x0b,0x43,0xed,0xcf,0xac,0x62,
@@ -43,7 +44,7 @@ class V2LakalaSM4
         0x18,0xf0,0x7d,0xec,0x3a,0xdc,0x4d,0x20,0x79,0xee,0x5f,0x3e,0xd7,0xcb,0x39,0x48
     ];
 
-    const SM4_FK = [0xA3B1BAC6, 0x56AA3350, 0x677D9197, 0xB27022DC];
+    public const SM4_FK = [0xA3B1BAC6, 0x56AA3350, 0x677D9197, 0xB27022DC];
 
     public $_rk = [];
     public $_block_size = 16;
@@ -102,22 +103,22 @@ class V2LakalaSM4
     private function sm4Decrypt($cipherText)
     {
         $x = [];
-        for ($j=0; $j<4; $j++) {
-            $x[$j]=($cipherText[$j*4]<<24)  |($cipherText[$j*4+1]<<16)| ($cipherText[$j*4+2]<<8)|($cipherText[$j*4+3]);
+        for ($j = 0; $j < 4; $j++) {
+            $x[$j] = ($cipherText[$j * 4] << 24)  | ($cipherText[$j * 4 + 1] << 16) | ($cipherText[$j * 4 + 2] << 8) | ($cipherText[$j * 4 + 3]);
         }
 
-        for ($i=0; $i<32; $i++) {
-            $tmp = $x[$i+1]^$x[$i+2]^$x[$i+3]^$this->_rk[31-$i];
-            $buf= (self::SM4_SBOX[($tmp >> 24) & 0xFF]) << 24 |(self::SM4_SBOX[($tmp >> 16) & 0xFF]) << 16 |(self::SM4_SBOX[($tmp >> 8) & 0xFF]) << 8 |(self::SM4_SBOX[$tmp & 0xFF]);
-            $x[$i+4]=$x[$i]^($buf^$this->sm4Rotl32(($buf), 2)^ $this->sm4Rotl32(($buf), 10) ^ $this->sm4Rotl32(($buf), 18)^ $this->sm4Rotl32(($buf), 24));
+        for ($i = 0; $i < 32; $i++) {
+            $tmp = $x[$i + 1] ^ $x[$i + 2] ^ $x[$i + 3] ^ $this->_rk[31 - $i];
+            $buf = (self::SM4_SBOX[($tmp >> 24) & 0xFF]) << 24 | (self::SM4_SBOX[($tmp >> 16) & 0xFF]) << 16 | (self::SM4_SBOX[($tmp >> 8) & 0xFF]) << 8 | (self::SM4_SBOX[$tmp & 0xFF]);
+            $x[$i + 4] = $x[$i] ^ ($buf ^ $this->sm4Rotl32(($buf), 2) ^ $this->sm4Rotl32(($buf), 10) ^ $this->sm4Rotl32(($buf), 18) ^ $this->sm4Rotl32(($buf), 24));
         }
 
         $plainText = [];
-        for ($k=0; $k<4; $k++) {
-            $plainText[4*$k]=($x[35-$k]>> 24)& 0xFF;
-            $plainText[4*$k+1]=($x[35-$k]>> 16)& 0xFF;
-            $plainText[4*$k+2]=($x[35-$k]>> 8)& 0xFF;
-            $plainText[4*$k+3]=($x[35-$k])& 0xFF;
+        for ($k = 0; $k < 4; $k++) {
+            $plainText[4 * $k] = ($x[35 - $k] >> 24) & 0xFF;
+            $plainText[4 * $k + 1] = ($x[35 - $k] >> 16) & 0xFF;
+            $plainText[4 * $k + 2] = ($x[35 - $k] >> 8) & 0xFF;
+            $plainText[4 * $k + 3] = ($x[35 - $k]) & 0xFF;
         }
 
         return $this->bytesToString($plainText);
@@ -126,22 +127,22 @@ class V2LakalaSM4
     private function sm4Encrypt($plainText)
     {
         $x = [];
-        for ($j=0; $j<4; $j++) {
-            $x[$j]=($plainText[$j*4]<<24)  |($plainText[$j*4+1]<<16)| ($plainText[$j*4+2]<<8)|($plainText[$j*4+3]);
+        for ($j = 0; $j < 4; $j++) {
+            $x[$j] = ($plainText[$j * 4] << 24)  | ($plainText[$j * 4 + 1] << 16) | ($plainText[$j * 4 + 2] << 8) | ($plainText[$j * 4 + 3]);
         }
 
-        for ($i=0; $i<32; $i++) {
-            $tmp = $x[$i+1]^$x[$i+2]^$x[$i+3]^$this->_rk[$i];
-            $buf= (self::SM4_SBOX[($tmp >> 24) & 0xFF]) << 24 |(self::SM4_SBOX[($tmp >> 16) & 0xFF]) << 16 |(self::SM4_SBOX[($tmp >> 8) & 0xFF]) << 8 |(self::SM4_SBOX[$tmp & 0xFF]);
-            $x[$i+4]=$x[$i]^($buf^$this->sm4Rotl32(($buf), 2)^ $this->sm4Rotl32(($buf), 10) ^ $this->sm4Rotl32(($buf), 18)^ $this->sm4Rotl32(($buf), 24));
+        for ($i = 0; $i < 32; $i++) {
+            $tmp = $x[$i + 1] ^ $x[$i + 2] ^ $x[$i + 3] ^ $this->_rk[$i];
+            $buf = (self::SM4_SBOX[($tmp >> 24) & 0xFF]) << 24 | (self::SM4_SBOX[($tmp >> 16) & 0xFF]) << 16 | (self::SM4_SBOX[($tmp >> 8) & 0xFF]) << 8 | (self::SM4_SBOX[$tmp & 0xFF]);
+            $x[$i + 4] = $x[$i] ^ ($buf ^ $this->sm4Rotl32(($buf), 2) ^ $this->sm4Rotl32(($buf), 10) ^ $this->sm4Rotl32(($buf), 18) ^ $this->sm4Rotl32(($buf), 24));
         }
 
         $cipherText = [];
-        for ($k=0; $k<4; $k++) {
-            $cipherText[4*$k]=($x[35-$k]>> 24)& 0xFF;
-            $cipherText[4*$k+1]=($x[35-$k]>> 16)& 0xFF;
-            $cipherText[4*$k+2]=($x[35-$k]>> 8)& 0xFF;
-            $cipherText[4*$k+3]=($x[35-$k])& 0xFF;
+        for ($k = 0; $k < 4; $k++) {
+            $cipherText[4 * $k] = ($x[35 - $k] >> 24) & 0xFF;
+            $cipherText[4 * $k + 1] = ($x[35 - $k] >> 16) & 0xFF;
+            $cipherText[4 * $k + 2] = ($x[35 - $k] >> 8) & 0xFF;
+            $cipherText[4 * $k + 3] = ($x[35 - $k]) & 0xFF;
         }
 
         return $this->bytesToString($cipherText);
@@ -177,7 +178,7 @@ class V2LakalaSM4
 
     private function sm4Rotl32($buf, $n)
     {
-        return (($buf << $n) & 0xffffffff) | ($buf >> (32-$n));
+        return (($buf << $n) & 0xffffffff) | ($buf >> (32 - $n));
     }
 
     private function sm4KeySchedule($key)
@@ -186,16 +187,16 @@ class V2LakalaSM4
         $key = array_values(unpack("C*", $key));
 
         $k = [];
-        for ($i=0; $i<4; $i++) {
-            $k[$i] = self::SM4_FK[$i]^(($key[4*$i]<<24) | ($key[4*$i+1]<<16) |($key[4*$i+2]<<8) | ($key[4*$i+3]));
+        for ($i = 0; $i < 4; $i++) {
+            $k[$i] = self::SM4_FK[$i] ^ (($key[4 * $i] << 24) | ($key[4 * $i + 1] << 16) | ($key[4 * $i + 2] << 8) | ($key[4 * $i + 3]));
         }
 
-        for ($j=0; $j<32; $j++) {
-            $tmp = $k[$j+1]^$k[$j+2]^$k[$j+3]^ self::SM4_CK[$j];
-            $buf = (self::SM4_SBOX[($tmp >> 24) & 0xFF]) << 24 |(self::SM4_SBOX[($tmp >> 16) & 0xFF]) << 16 |(self::SM4_SBOX[($tmp >> 8) & 0xFF]) << 8 |(self::SM4_SBOX[$tmp & 0xFF]);
+        for ($j = 0; $j < 32; $j++) {
+            $tmp = $k[$j + 1] ^ $k[$j + 2] ^ $k[$j + 3] ^ self::SM4_CK[$j];
+            $buf = (self::SM4_SBOX[($tmp >> 24) & 0xFF]) << 24 | (self::SM4_SBOX[($tmp >> 16) & 0xFF]) << 16 | (self::SM4_SBOX[($tmp >> 8) & 0xFF]) << 8 | (self::SM4_SBOX[$tmp & 0xFF]);
 
-            $k[$j+4]=$k[$j]^(($buf)^($this->sm4Rotl32(($buf), 13))^($this->sm4Rotl32(($buf), 23)));
-            $this->_rk[$j]=$k[$j+4];
+            $k[$j + 4] = $k[$j] ^ (($buf) ^ ($this->sm4Rotl32(($buf), 13)) ^ ($this->sm4Rotl32(($buf), 23)));
+            $this->_rk[$j] = $k[$j + 4];
         }
     }
 }

+ 2 - 1
src/OpenAPISDK/V2/V2ApiException.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * V2ApiException
  * PHP version 7.4
@@ -34,4 +35,4 @@ class V2ApiException extends Exception
     {
         return $this->responseHeaders;
     }
-}
+}

+ 22 - 13
src/OpenAPISDK/V2/V2Configuration.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * V2Configuration
  * PHP version 7.4
@@ -23,44 +24,51 @@ class V2Configuration
             $this->config['app_debug'] = strtolower($this->config['app_debug']);
             $this->config['merchant_private_key_path'] = realpath($dir . '/' . $this->config['merchant_private_key_path']);
             $this->config['lkl_certificate_path'] = realpath($dir . '/' . $this->config['lkl_certificate_path']);
-        }
-        else if (is_array($configfile)) {
+        } elseif (is_array($configfile)) {
             $this->config = $configfile;
         }
     }
 
-    public function getAppId() {
+    public function getAppId()
+    {
         return $this->getConfig('app_id');
     }
 
-    public function getSerialNo() {
+    public function getSerialNo()
+    {
         return $this->getConfig('serial_no');
     }
 
-    public function getSm4Key() {
+    public function getSm4Key()
+    {
         return $this->getConfig('sm4_key');
     }
 
-    public function getMerchantPrivateKeyPath() {
+    public function getMerchantPrivateKeyPath()
+    {
         return $this->getConfig('merchant_private_key_path');
     }
 
-    public function getLklCertificatePath() {
+    public function getLklCertificatePath()
+    {
         return $this->getConfig('lkl_certificate_path');
     }
 
-    private function getConfig($key) {
+    private function getConfig($key)
+    {
         return $this->config[$key];
     }
 
-    public function getHost() {
+    public function getHost()
+    {
         if ($this->config['app_debug'] === 'true' || $this->config['app_debug'] === true) {
             return $this->getConfig('host_test');
         }
         return $this->getConfig('host_pro');
     }
 
-    public function getDefaultHeaders() {
+    public function getDefaultHeaders()
+    {
         return [
             'Lkl-Op-Appid: ' . $this->getAppId(),
             'Lkl-Op-Sdk: lkl-php-sdk-2.0.0',
@@ -68,10 +76,11 @@ class V2Configuration
         ];
     }
 
-    public function readenv($env) {
+    public function readenv($env)
+    {
         $envData = file_get_contents($env);
         $lines = explode("\n", $envData);
-    
+
         $config = array();
         foreach ($lines as $line) {
             $parts = explode('=', $line, 2);
@@ -84,4 +93,4 @@ class V2Configuration
         return $config;
     }
     // Getters and setters...
-}
+}

+ 2 - 1
src/OpenAPISDK/V2/V2ObjectSerializer.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * V2ObjectSerializer
  * PHP version 7.4
@@ -53,4 +54,4 @@ class V2ObjectSerializer
             return $instance;
         }
     }
-}
+}

+ 5 - 5
src/OpenAPISDK/V3/Api/EncryptMode.php

@@ -9,11 +9,11 @@ namespace SixShop\Lakala\OpenAPISDK\V3\Api;
 class EncryptMode
 {
     // 普通无加解密:请求为明文,返回也是明文
-    const NONE = 'none';
+    public const NONE = 'none';
     // 只请求加密,返回为明文
-    const REQUEST = 'request';
+    public const REQUEST = 'request';
     // 请求明文、响应需解密
-    const RESPONSE = 'response';
+    public const RESPONSE = 'response';
     // 请求需加密、返回需解密
-    const BOTH = 'both';
-}
+    public const BOTH = 'both';
+}

+ 25 - 21
src/OpenAPISDK/V3/Api/LakalaApi.php

@@ -5,12 +5,8 @@ namespace SixShop\Lakala\OpenAPISDK\V3\Api;
 use SixShop\Lakala\OpenAPISDK\V3\ApiException;
 use SixShop\Lakala\OpenAPISDK\V3\ObjectSerializer;
 use SixShop\Lakala\OpenAPISDK\V3\Configuration;
-use SixShop\Lakala\OpenAPISDK\V3\Util\HttpService;
 use SixShop\Lakala\OpenAPISDK\V3\Util\LakalaSM4;
-
 use SixShop\Lakala\OpenAPISDK\V3\Model\ModelRequest;
-use SixShop\Lakala\OpenAPISDK\V3\Model\ModelResponse;
-
 
 /**
  * LakalaApi Class
@@ -22,7 +18,6 @@ use SixShop\Lakala\OpenAPISDK\V3\Model\ModelResponse;
  */
 class LakalaApi
 {
-
     /**
      * @var string 随机字符串集
      */
@@ -54,16 +49,18 @@ class LakalaApi
         $this->resourcePath = $resourcePath;
         return $this;
     }
-    
+
     public function getResourcePath()
     {
         return $this->resourcePath;
     }
 
-    public function tradeApi($resourcePath, ModelRequest $modelRequest,
-                                            $returnType = '\SixShop\Lakala\OpenAPISDK\V3\Model\ModelResponse',
-                                            $method = 'POST')
-    {
+    public function tradeApi(
+        $resourcePath,
+        ModelRequest $modelRequest,
+        $returnType = '\SixShop\Lakala\OpenAPISDK\V3\Model\ModelResponse',
+        $method = 'POST'
+    ) {
         $headerParams = [];
 
         if (!$modelRequest->valid()) {
@@ -77,9 +74,13 @@ class LakalaApi
         return $this->apiWithBody($resourcePath, $httpBody, $headerParams, $method, $returnType);
     }
 
-    public function apiWithBody($resourcePath, $httpBody, $headerParams = [], $method = 'POST',
-                                               $returnType = '\SixShop\Lakala\OpenAPISDK\V3\Model\ModelResponse')
-    {
+    public function apiWithBody(
+        $resourcePath,
+        $httpBody,
+        $headerParams = [],
+        $method = 'POST',
+        $returnType = '\SixShop\Lakala\OpenAPISDK\V3\Model\ModelResponse'
+    ) {
         $this->setResourcePath($resourcePath);
 
         if (!is_string($httpBody)) {
@@ -139,7 +140,7 @@ class LakalaApi
             );
         }
         // 请求咱解密
-        if($this->encryptMode == EncryptMode::RESPONSE || $this->encryptMode == EncryptMode::BOTH) {
+        if ($this->encryptMode == EncryptMode::RESPONSE || $this->encryptMode == EncryptMode::BOTH) {
             // echo "\n<!-- \n" . $response['body'] . "\n--->\n";
             $sm4 = new LakalaSM4();
             $body = $sm4->decrypt(base64_decode($this->config->getSm4Key()), $response['body']);
@@ -160,7 +161,7 @@ class LakalaApi
         $url = $this->config->getHost() . $this->getResourcePath();
 
         // SM4加密请求体
-        if($this->encryptMode == EncryptMode::REQUEST || $this->encryptMode == EncryptMode::BOTH) {
+        if ($this->encryptMode == EncryptMode::REQUEST || $this->encryptMode == EncryptMode::BOTH) {
             $sm4 = new LakalaSM4();
             $httpBody = $sm4->encrypt(base64_decode($this->config->getSm4Key()), $httpBody);
         }
@@ -221,21 +222,23 @@ class LakalaApi
         return $authorization;
     }
 
-    protected function getRandomString($length = 10) {
+    protected function getRandomString($length = 10)
+    {
         $randomString = '';
         $charsetLength = strlen($this->charset);
-    
+
         // 生成随机字符串
         for ($i = 0; $i < $length; $i++) {
             $randomChar = $this->charset[rand(0, $charsetLength - 1)];  // 随机选择字符
             $randomString .= $randomChar;
         }
-    
+
         return $randomString;
     }
 
     //生成 sha256WithRSA 签名
-    protected function rsaSign($content) {
+    protected function rsaSign($content)
+    {
         $privateContent = file_get_contents($this->config->getMerchantPrivateKeyPath());
         $privateKey = openssl_pkey_get_private($privateContent);
         if (!$privateKey) {
@@ -251,7 +254,8 @@ class LakalaApi
         return base64_encode($sign);
     }
 
-    protected function responseVerifySign($headers, $body) {
+    protected function responseVerifySign($headers, $body)
+    {
         $sign = $headers['Lklapi-Signature'];
         $sign = base64_decode($sign);
         $data = $headers['Lklapi-Appid'] . "\n"
@@ -266,4 +270,4 @@ class LakalaApi
         $result = openssl_verify($data, $sign, $key, OPENSSL_ALGO_SHA256) === 1;
         return $result;
     }
-}
+}

+ 12 - 9
src/OpenAPISDK/V3/Api/LakalaNotifyApi.php

@@ -4,9 +4,6 @@ namespace SixShop\Lakala\OpenAPISDK\V3\Api;
 
 use SixShop\Lakala\OpenAPISDK\V3\ApiException;
 use SixShop\Lakala\OpenAPISDK\V3\Configuration;
-use SixShop\Lakala\OpenAPISDK\V3\ObjectSerializer;
-
-use SixShop\Lakala\OpenAPISDK\V3\Model\ModelTradeNotify;
 
 /**
  * LakalaNotifyApi Class
@@ -25,7 +22,8 @@ class LakalaNotifyApi
         $this->config = $config;
     }
 
-    public function notiApi(array $headers, string $body) {
+    public function notiApi(array $headers, string $body)
+    {
         $verify = $this->requestVerifySign($headers['Authorization'], $body);
 
         if (!$verify) {
@@ -39,10 +37,13 @@ class LakalaNotifyApi
         return $notify;
     }
 
-    protected function requestVerifySign($authorization, $body) {
+    protected function requestVerifySign($authorization, $body)
+    {
         $pattern = '/timestamp="(\d+)",nonce_str="(\w+)",signature="([^"]+)"/';
         preg_match($pattern, $authorization, $matches);
-        if (count($matches) == 0) return false;
+        if (count($matches) == 0) {
+            return false;
+        }
 
         $timestamp = $matches[1];
         $nonce_str = $matches[2];
@@ -59,15 +60,17 @@ class LakalaNotifyApi
         return $result;
     }
 
-    public function success() {
+    public function success()
+    {
         echo '{"code":"SUCCESS","message":"执行成功"}';
     }
 
-    public function fail($msg) {
+    public function fail($msg)
+    {
         $ret = [
             'code' => 'FAIL',
             'message' => $msg
         ];
         echo json_encode($ret, JSON_UNESCAPED_UNICODE);
     }
-}
+}

+ 2 - 2
src/OpenAPISDK/V3/Api/QueryTradequeryApi.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 查询交易
  * QueryTradequeryApi
@@ -13,7 +14,6 @@
 namespace SixShop\Lakala\OpenAPISDK\V3\Api;
 
 use SixShop\Lakala\OpenAPISDK\V3\Model\QueryTradequeryRequest;
-use SixShop\Lakala\OpenAPISDK\V3\Model\QueryTradequeryResponse;
 
 class QueryTradequeryApi extends LakalaApi
 {
@@ -23,4 +23,4 @@ class QueryTradequeryApi extends LakalaApi
 
         return $this->tradeApi($resourcePath, $queryTradequeryRequest, '\SixShop\Lakala\OpenAPISDK\V3\Model\QueryTradequeryResponse');
     }
-}
+}

+ 2 - 2
src/OpenAPISDK/V3/Api/RelationRefundApi.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 退款交易
  * RelationRefundApi
@@ -13,7 +14,6 @@
 namespace SixShop\Lakala\OpenAPISDK\V3\Api;
 
 use SixShop\Lakala\OpenAPISDK\V3\Model\RelationRefundRequest;
-use SixShop\Lakala\OpenAPISDK\V3\Model\RelationRefundResponse;
 
 class RelationRefundApi extends LakalaApi
 {
@@ -22,4 +22,4 @@ class RelationRefundApi extends LakalaApi
         $resourcePath = '/api/v3/labs/relation/refund';
         return $this->tradeApi($resourcePath, $relationRefundRequest, '\SixShop\Lakala\OpenAPISDK\V3\Model\RelationRefundResponse');
     }
-}
+}

+ 2 - 2
src/OpenAPISDK/V3/Api/TransMicropayApi.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 被扫交易
  * TransMicropayApi
@@ -13,7 +14,6 @@
 namespace SixShop\Lakala\OpenAPISDK\V3\Api;
 
 use SixShop\Lakala\OpenAPISDK\V3\Model\TransMicropayRequest;
-use SixShop\Lakala\OpenAPISDK\V3\Model\TransMicropayResponse;
 
 class TransMicropayApi extends LakalaApi
 {
@@ -25,4 +25,4 @@ class TransMicropayApi extends LakalaApi
 
         return $this->tradeApi($resourcePath, $transMicropayRequest, '\SixShop\Lakala\OpenAPISDK\V3\Model\TransMicropayResponse');
     }
-}
+}

+ 3 - 4
src/OpenAPISDK/V3/Api/TransPreorderApi.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 主扫交易
  * TransPreorderApi
@@ -13,17 +14,15 @@
 namespace SixShop\Lakala\OpenAPISDK\V3\Api;
 
 use SixShop\Lakala\OpenAPISDK\V3\Model\TransPreorderRequest;
-use SixShop\Lakala\OpenAPISDK\V3\Model\TransPreorderResponse;
 
 class TransPreorderApi extends LakalaApi
 {
-
     public function transPreorder(TransPreorderRequest $transPreorderRequest)
     {
-        $resourcePath = $this->encryptMode == EncryptMode::REQUEST || $this->encryptMode == EncryptMode::BOTH 
+        $resourcePath = $this->encryptMode == EncryptMode::REQUEST || $this->encryptMode == EncryptMode::BOTH
                       ? '/api/v3/labs/trans/preorder_encry'
                       : '/api/v3/labs/trans/preorder';
 
         return $this->tradeApi($resourcePath, $transPreorderRequest, '\SixShop\Lakala\OpenAPISDK\V3\Model\TransPreorderResponse');
     }
-}
+}

+ 2 - 1
src/OpenAPISDK/V3/ApiException.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * ApiException
  * PHP version 7.4
@@ -34,4 +35,4 @@ class ApiException extends Exception
     {
         return $this->responseHeaders;
     }
-}
+}

+ 22 - 13
src/OpenAPISDK/V3/Configuration.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Configuration
  * PHP version 7.4
@@ -23,44 +24,51 @@ class Configuration
             $this->config['app_debug'] = strtolower($this->config['app_debug']);
             $this->config['merchant_private_key_path'] = realpath($dir . '/' . $this->config['merchant_private_key_path']);
             $this->config['lkl_certificate_path'] = realpath($dir . '/' . $this->config['lkl_certificate_path']);
-        }
-        else if (is_array($config)) {
+        } elseif (is_array($config)) {
             $this->config = $config;
         }
     }
 
-    public function getAppId() {
+    public function getAppId()
+    {
         return $this->getConfig('app_id');
     }
 
-    public function getSerialNo() {
+    public function getSerialNo()
+    {
         return $this->getConfig('serial_no');
     }
 
-    public function getSm4Key() {
+    public function getSm4Key()
+    {
         return $this->getConfig('sm4_key');
     }
 
-    public function getMerchantPrivateKeyPath() {
+    public function getMerchantPrivateKeyPath()
+    {
         return $this->getConfig('merchant_private_key_path');
     }
 
-    public function getLklCertificatePath() {
+    public function getLklCertificatePath()
+    {
         return $this->getConfig('lkl_certificate_path');
     }
 
-    private function getConfig($key) {
+    private function getConfig($key)
+    {
         return $this->config[$key];
     }
 
-    public function getHost() {
+    public function getHost()
+    {
         if ($this->config['app_debug'] === 'true' || $this->config['app_debug'] === true) {
             return $this->getConfig('host_test');
         }
         return $this->getConfig('host_pro');
     }
 
-    public function getDefaultHeaders() {
+    public function getDefaultHeaders()
+    {
         return [
             'Lkl-Op-Appid: ' . $this->getAppId(),
             'Lkl-Op-Sdk: lkl-php-sdk-3.0.0',
@@ -68,10 +76,11 @@ class Configuration
         ];
     }
 
-    public function readenv($env) {
+    public function readenv($env)
+    {
         $envData = file_get_contents($env);
         $lines = explode("\n", $envData);
-    
+
         $config = array();
         foreach ($lines as $line) {
             $parts = explode('=', $line, 2);
@@ -84,4 +93,4 @@ class Configuration
         return $config;
     }
     // Getters and setters...
-}
+}

+ 8 - 6
src/OpenAPISDK/V3/Model/ModelRequest.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * ModelRequest
  * PHP version 7.4
@@ -11,7 +12,8 @@
 
 namespace SixShop\Lakala\OpenAPISDK\V3\Model;
 
-class ModelRequest {
+class ModelRequest
+{
     // 请求时间	M	String(14)	请求时间,格式yyyyMMddHHmmss
     protected $reqTime;
     // 版本号	M	String(8)	3.0
@@ -31,18 +33,18 @@ class ModelRequest {
         $this->reqTime = $reqTime;
         return $this;
     }
-    
+
     public function getReqTime()
     {
         return $this->reqTime;
     }
-    
+
     public function setVersion($version)
     {
         $this->version = $version;
         return $this;
     }
-    
+
     public function getVersion()
     {
         return $this->version;
@@ -53,7 +55,7 @@ class ModelRequest {
         $this->reqData = $reqData;
         return $this;
     }
-    
+
     public function getReqData()
     {
         return $this->reqData;
@@ -91,4 +93,4 @@ class ModelRequest {
             'req_data' => $this->getReqData()
         ];
     }
-}
+}

+ 11 - 7
src/OpenAPISDK/V3/Model/ModelResponse.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * ModelResponse
  * PHP version 7.4
@@ -13,7 +14,8 @@ namespace SixShop\Lakala\OpenAPISDK\V3\Model;
 
 use SixShop\Lakala\OpenAPISDK\V3\ObjectSerializer;
 
-class ModelResponse {
+class ModelResponse
+{
     // 返回业务代码	M	String(8)	返回业务代码(000000为成功,其余按照错误信息来定)
     /**
      * 交易码	 交易码描述
@@ -83,7 +85,7 @@ class ModelResponse {
         }
         return $this;
     }
-    
+
     public function getRespData()
     {
         return $this->respData;
@@ -94,24 +96,26 @@ class ModelResponse {
         $this->headers = $headers;
         return $this;
     }
-    
+
     public function getHeaders()
     {
         return $this->headers;
     }
 
-    public function setOriginalText($originalText) {
+    public function setOriginalText($originalText)
+    {
         $this->originalText = $originalText;
         return $this;
     }
 
-    public function getOriginalText() {
+    public function getOriginalText()
+    {
         return $this->originalText;
     }
 
     #[\ReturnTypeWillChange]
     public function jsonSerialize(): mixed
     {
-       return ObjectSerializer::sanitizeForSerialization($this);
+        return ObjectSerializer::sanitizeForSerialization($this);
     }
-}
+}

+ 11 - 7
src/OpenAPISDK/V3/Model/ModelTradeNotify.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
  * ModelTradeNotify
  * 交易回调Model
- * 
+ *
  * PHP version 7.4
  *
  * @category Class
@@ -15,7 +16,8 @@ namespace SixShop\Lakala\OpenAPISDK\V3\Model;
 
 use SixShop\Lakala\OpenAPISDK\V3\ObjectSerializer;
 
-class ModelTradeNotify {
+class ModelTradeNotify
+{
     // 响应头信息
     protected $headers;
     // 响应原文
@@ -26,23 +28,25 @@ class ModelTradeNotify {
         $this->headers = $headers;
         return $this;
     }
-    
+
     public function getHeaders()
     {
         return $this->headers;
     }
 
-    public function setOriginalText($originalText) {
+    public function setOriginalText($originalText)
+    {
         $this->originalText = $originalText;
         return $this;
     }
 
-    public function getOriginalText() {
+    public function getOriginalText()
+    {
         return $this->originalText;
     }
 
     public function jsonSerialize()
     {
-       return ObjectSerializer::sanitizeForSerialization($this);
+        return ObjectSerializer::sanitizeForSerialization($this);
     }
-}
+}

+ 19 - 14
src/OpenAPISDK/V3/Model/QueryTradequeryRequest.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 查询交易 请求字段
  * QueryTradequeryRequest
@@ -12,8 +13,6 @@
 
 namespace SixShop\Lakala\OpenAPISDK\V3\Model;
 
-use PHPUnit\Framework\Attributes\Test;
-
 class QueryTradequeryRequest extends ModelRequest implements \JsonSerializable
 {
     // 商户号	M	String(32)	拉卡拉分配的商户号
@@ -24,46 +23,46 @@ class QueryTradequeryRequest extends ModelRequest implements \JsonSerializable
     protected $outTradeNo;
     // 拉卡拉交易流水号	C	String(32) 拉卡拉交易流水号
     protected $tradeNo;
-    
+
     public function setMerchantNo($merchantNo)
     {
         $this->merchantNo = $merchantNo;
         return $this;
     }
-    
+
     public function getMerchantNo()
     {
         return $this->merchantNo;
     }
-    
+
     public function setTermNo($termNo)
     {
         $this->termNo = $termNo;
         return $this;
     }
-    
+
     public function getTermNo()
     {
         return $this->termNo;
     }
-    
+
     public function setOutTradeNo($outTradeNo)
     {
         $this->outTradeNo = $outTradeNo;
         return $this;
     }
-    
+
     public function getOutTradeNo()
     {
         return $this->outTradeNo;
     }
-    
+
     public function setTradeNo($tradeNo)
     {
         $this->tradeNo = $tradeNo;
         return $this;
     }
-    
+
     public function getTradeNo()
     {
         return $this->tradeNo;
@@ -77,9 +76,15 @@ class QueryTradequeryRequest extends ModelRequest implements \JsonSerializable
     public function listInvalidProperties()
     {
         $invalidProperties = [];
-        if (strlen($this->merchantNo)===0) $invalidProperties[] = '商户号不能为空';
-        if (strlen($this->termNo)===0) $invalidProperties[] = '终端号不能为空';
-        if (strlen($this->outTradeNo)===0 && strlen($this->tradeNo)===0) $invalidProperties[] = '商户交易流水号、拉卡拉交易流水号至少一项不能为空';
+        if (strlen($this->merchantNo) === 0) {
+            $invalidProperties[] = '商户号不能为空';
+        }
+        if (strlen($this->termNo) === 0) {
+            $invalidProperties[] = '终端号不能为空';
+        }
+        if (strlen($this->outTradeNo) === 0 && strlen($this->tradeNo) === 0) {
+            $invalidProperties[] = '商户交易流水号、拉卡拉交易流水号至少一项不能为空';
+        }
 
         return $invalidProperties;
     }
@@ -94,4 +99,4 @@ class QueryTradequeryRequest extends ModelRequest implements \JsonSerializable
         ]);
         return parent::jsonSerialize();
     }
-}
+}

+ 53 - 52
src/OpenAPISDK/V3/Model/QueryTradequeryResponse.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * QueryTradequeryRequest
  * PHP version 7.4
@@ -45,7 +46,7 @@ class QueryTradequeryResponse extends ModelResponse implements \JsonSerializable
     protected $accMdiscountAmount;
     // 账户端优惠金额	C	String(12)	拉卡拉优惠金额,单位分
     protected $accDiscountAmount;
-    // 账户端其它优惠金额	C	String(12)	
+    // 账户端其它优惠金额	C	String(12)
     protected $accOtherDiscountAmount;
     // 交易完成时间	C	String(14)	实际支付时间。yyyyMMddHHmmss
     protected $tradeTime;
@@ -63,279 +64,279 @@ class QueryTradequeryResponse extends ModelResponse implements \JsonSerializable
     protected $accRespFields;
     // 合单退款拆单信息	C	List<>	如果查询订单是退款主单,则返回。见refundSplitInfo字段说明。拆单信息见refund_split_info域说明
     protected $refundSplitInfo;
-    
+
     public function setMerchantNo($merchantNo)
     {
         $this->merchantNo = $merchantNo;
         return $this;
     }
-    
+
     public function getMerchantNo()
     {
         return $this->merchantNo;
     }
-    
+
     public function setOutTradeNo($outTradeNo)
     {
         $this->outTradeNo = $outTradeNo;
         return $this;
     }
-    
+
     public function getOutTradeNo()
     {
         return $this->outTradeNo;
     }
-    
+
     public function setTradeNo($tradeNo)
     {
         $this->tradeNo = $tradeNo;
         return $this;
     }
-    
+
     public function getTradeNo()
     {
         return $this->tradeNo;
     }
-    
+
     public function setLogNo($logNo)
     {
         $this->logNo = $logNo;
         return $this;
     }
-    
+
     public function getLogNo()
     {
         return $this->logNo;
     }
-    
+
     public function setTradeMainType($tradeMainType)
     {
         $this->tradeMainType = $tradeMainType;
         return $this;
     }
-    
+
     public function getTradeMainType()
     {
         return $this->tradeMainType;
     }
-    
+
     public function setSplitAttr($splitAttr)
     {
         $this->splitAttr = $splitAttr;
         return $this;
     }
-    
+
     public function getSplitAttr()
     {
         return $this->splitAttr;
     }
-    
+
     public function setSplitInfo($splitInfo)
     {
         $this->splitInfo = $splitInfo;
         return $this;
     }
-    
+
     public function getSplitInfo()
     {
         return $this->splitInfo;
     }
-    
+
     public function setAccTradeNo($accTradeNo)
     {
         $this->accTradeNo = $accTradeNo;
         return $this;
     }
-    
+
     public function getAccTradeNo()
     {
         return $this->accTradeNo;
     }
-    
+
     public function setAccountType($accountType)
     {
         $this->accountType = $accountType;
         return $this;
     }
-    
+
     public function getAccountType()
     {
         return $this->accountType;
     }
-    
+
     public function setTradeState($tradeState)
     {
         $this->tradeState = $tradeState;
         return $this;
     }
-    
+
     public function getTradeState()
     {
         return $this->tradeState;
     }
-    
+
     public function setTradeStateDesc($tradeStateDesc)
     {
         $this->tradeStateDesc = $tradeStateDesc;
         return $this;
     }
-    
+
     public function getTradeStateDesc()
     {
         return $this->tradeStateDesc;
     }
-    
+
     public function setTotalAmount($totalAmount)
     {
         $this->totalAmount = $totalAmount;
         return $this;
     }
-    
+
     public function getTotalAmount()
     {
         return $this->totalAmount;
     }
-    
+
     public function setPayerAmount($payerAmount)
     {
         $this->payerAmount = $payerAmount;
         return $this;
     }
-    
+
     public function getPayerAmount()
     {
         return $this->payerAmount;
     }
-    
+
     public function setAccSettleAmount($accSettleAmount)
     {
         $this->accSettleAmount = $accSettleAmount;
         return $this;
     }
-    
+
     public function getAccSettleAmount()
     {
         return $this->accSettleAmount;
     }
-    
+
     public function setAccMdiscountAmount($accMdiscountAmount)
     {
         $this->accMdiscountAmount = $accMdiscountAmount;
         return $this;
     }
-    
+
     public function getAccMdiscountAmount()
     {
         return $this->accMdiscountAmount;
     }
-    
+
     public function setAccDiscountAmount($accDiscountAmount)
     {
         $this->accDiscountAmount = $accDiscountAmount;
         return $this;
     }
-    
+
     public function getAccDiscountAmount()
     {
         return $this->accDiscountAmount;
     }
-    
+
     public function setAccOtherDiscountAmount($accOtherDiscountAmount)
     {
         $this->accOtherDiscountAmount = $accOtherDiscountAmount;
         return $this;
     }
-    
+
     public function getAccOtherDiscountAmount()
     {
         return $this->accOtherDiscountAmount;
     }
-    
+
     public function setTradeTime($tradeTime)
     {
         $this->tradeTime = $tradeTime;
         return $this;
     }
-    
+
     public function getTradeTime()
     {
         return $this->tradeTime;
     }
-    
+
     public function setUserId1($userId1)
     {
         $this->userId1 = $userId1;
         return $this;
     }
-    
+
     public function getUserId1()
     {
         return $this->userId1;
     }
-    
+
     public function setUserId2($userId2)
     {
         $this->userId2 = $userId2;
         return $this;
     }
-    
+
     public function getUserId2()
     {
         return $this->userId2;
     }
-    
+
     public function setBankType($bankType)
     {
         $this->bankType = $bankType;
         return $this;
     }
-    
+
     public function getBankType()
     {
         return $this->bankType;
     }
-    
+
     public function setCardType($cardType)
     {
         $this->cardType = $cardType;
         return $this;
     }
-    
+
     public function getCardType()
     {
         return $this->cardType;
     }
-    
+
     public function setAccActivityId($accActivityId)
     {
         $this->accActivityId = $accActivityId;
         return $this;
     }
-    
+
     public function getAccActivityId()
     {
         return $this->accActivityId;
     }
-    
+
     public function setAccRespFields($accRespFields)
     {
         $this->accRespFields = $accRespFields;
         return $this;
     }
-    
+
     public function getAccRespFields()
     {
         return $this->accRespFields;
     }
-    
+
     public function setRefundSplitInfo($refundSplitInfo)
     {
         $this->refundSplitInfo = $refundSplitInfo;
         return $this;
     }
-    
+
     public function getRefundSplitInfo()
     {
         return $this->refundSplitInfo;
     }
-}
+}

+ 35 - 24
src/OpenAPISDK/V3/Model/RelationRefundRequest.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 退款交易 请求字段
  * RelationRefundRequest
@@ -32,101 +33,101 @@ class RelationRefundRequest extends ModelRequest implements \JsonSerializable
     protected $originLogNo;
     // 地址位置信息	M	Object	地址位置信息,风控要求必送
     protected $locationInfo;
-    
+
     public function setMerchantNo($merchantNo)
     {
         $this->merchantNo = $merchantNo;
         return $this;
     }
-    
+
     public function getMerchantNo()
     {
         return $this->merchantNo;
     }
-    
+
     public function setTermNo($termNo)
     {
         $this->termNo = $termNo;
         return $this;
     }
-    
+
     public function getTermNo()
     {
         return $this->termNo;
     }
-    
+
     public function setOutTradeNo($outTradeNo)
     {
         $this->outTradeNo = $outTradeNo;
         return $this;
     }
-    
+
     public function getOutTradeNo()
     {
         return $this->outTradeNo;
     }
-    
+
     public function setRefundAmount($refundAmount)
     {
         $this->refundAmount = $refundAmount;
         return $this;
     }
-    
+
     public function getRefundAmount()
     {
         return $this->refundAmount;
     }
-    
+
     public function setRefundReason($refundReason)
     {
         $this->refundReason = $refundReason;
         return $this;
     }
-    
+
     public function getRefundReason()
     {
         return $this->refundReason;
     }
-    
+
     public function setOriginOutTradeNo($originOutTradeNo)
     {
         $this->originOutTradeNo = $originOutTradeNo;
         return $this;
     }
-    
+
     public function getOriginOutTradeNo()
     {
         return $this->originOutTradeNo;
     }
-    
+
     public function setOriginTradeNo($originTradeNo)
     {
         $this->originTradeNo = $originTradeNo;
         return $this;
     }
-    
+
     public function getOriginTradeNo()
     {
         return $this->originTradeNo;
     }
-    
+
     public function setOriginLogNo($originLogNo)
     {
         $this->originLogNo = $originLogNo;
         return $this;
     }
-    
+
     public function getOriginLogNo()
     {
         return $this->originLogNo;
     }
-    
+
     public function setLocationInfo($locationInfo)
     {
         $this->locationInfo = $locationInfo;
         return $this;
     }
-    
+
     public function getLocationInfo()
     {
         return $this->locationInfo;
@@ -140,11 +141,21 @@ class RelationRefundRequest extends ModelRequest implements \JsonSerializable
     public function listInvalidProperties()
     {
         $invalidProperties = [];
-        if (strlen($this->merchantNo)===0) $invalidProperties[] = '商户号不能为空';
-        if (strlen($this->termNo)===0) $invalidProperties[] = '终端号不能为空';
-        if (strlen($this->outTradeNo)===0) $invalidProperties[] = '商户交易流水号不能为空';
-        if (strlen($this->refundAmount)===0) $invalidProperties[] = '退款金额不能为空';
-        if ($this->locationInfo == null) $invalidProperties[] = '地址位置信息不能为空';
+        if (strlen($this->merchantNo) === 0) {
+            $invalidProperties[] = '商户号不能为空';
+        }
+        if (strlen($this->termNo) === 0) {
+            $invalidProperties[] = '终端号不能为空';
+        }
+        if (strlen($this->outTradeNo) === 0) {
+            $invalidProperties[] = '商户交易流水号不能为空';
+        }
+        if (strlen($this->refundAmount) === 0) {
+            $invalidProperties[] = '退款金额不能为空';
+        }
+        if ($this->locationInfo == null) {
+            $invalidProperties[] = '地址位置信息不能为空';
+        }
 
         return $invalidProperties;
     }
@@ -165,4 +176,4 @@ class RelationRefundRequest extends ModelRequest implements \JsonSerializable
         ]);
         return parent::jsonSerialize();
     }
-}
+}

+ 32 - 31
src/OpenAPISDK/V3/Model/RelationRefundResponse.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * RelationRefundRequest
  * PHP version 7.4
@@ -43,169 +44,169 @@ class RelationRefundResponse extends ModelResponse implements \JsonSerializable
     protected $upCouponInfo;
     // 出资方信息	C	String(512)	数字货币中行返回示例说明:[{“fundchannel”:”BOC”,”amount”:”18”}]
     protected $tradeInfo;
-    
+
     public function setMerchantNo($merchantNo)
     {
         $this->merchantNo = $merchantNo;
         return $this;
     }
-    
+
     public function getMerchantNo()
     {
         return $this->merchantNo;
     }
-    
+
     public function setOutTradeNo($outTradeNo)
     {
         $this->outTradeNo = $outTradeNo;
         return $this;
     }
-    
+
     public function getOutTradeNo()
     {
         return $this->outTradeNo;
     }
-    
+
     public function setTradeNo($tradeNo)
     {
         $this->tradeNo = $tradeNo;
         return $this;
     }
-    
+
     public function getTradeNo()
     {
         return $this->tradeNo;
     }
-    
+
     public function setLogNo($logNo)
     {
         $this->logNo = $logNo;
         return $this;
     }
-    
+
     public function getLogNo()
     {
         return $this->logNo;
     }
-    
+
     public function setAccTradeNo($accTradeNo)
     {
         $this->accTradeNo = $accTradeNo;
         return $this;
     }
-    
+
     public function getAccTradeNo()
     {
         return $this->accTradeNo;
     }
-    
+
     public function setAccountType($accountType)
     {
         $this->accountType = $accountType;
         return $this;
     }
-    
+
     public function getAccountType()
     {
         return $this->accountType;
     }
-    
+
     public function setTotalAmount($totalAmount)
     {
         $this->totalAmount = $totalAmount;
         return $this;
     }
-    
+
     public function getTotalAmount()
     {
         return $this->totalAmount;
     }
-    
+
     public function setRefundAmount($refundAmount)
     {
         $this->refundAmount = $refundAmount;
         return $this;
     }
-    
+
     public function getRefundAmount()
     {
         return $this->refundAmount;
     }
-    
+
     public function setPayerAmount($payerAmount)
     {
         $this->payerAmount = $payerAmount;
         return $this;
     }
-    
+
     public function getPayerAmount()
     {
         return $this->payerAmount;
     }
-    
+
     public function setTradeTime($tradeTime)
     {
         $this->tradeTime = $tradeTime;
         return $this;
     }
-    
+
     public function getTradeTime()
     {
         return $this->tradeTime;
     }
-    
+
     public function setOriginTradeNo($originTradeNo)
     {
         $this->originTradeNo = $originTradeNo;
         return $this;
     }
-    
+
     public function getOriginTradeNo()
     {
         return $this->originTradeNo;
     }
-    
+
     public function setOriginOutTradeNo($originOutTradeNo)
     {
         $this->originOutTradeNo = $originOutTradeNo;
         return $this;
     }
-    
+
     public function getOriginOutTradeNo()
     {
         return $this->originOutTradeNo;
     }
-    
+
     public function setUpIssAddnData($upIssAddnData)
     {
         $this->upIssAddnData = $upIssAddnData;
         return $this;
     }
-    
+
     public function getUpIssAddnData()
     {
         return $this->upIssAddnData;
     }
-    
+
     public function setUpCouponInfo($upCouponInfo)
     {
         $this->upCouponInfo = $upCouponInfo;
         return $this;
     }
-    
+
     public function getUpCouponInfo()
     {
         return $this->upCouponInfo;
     }
-    
+
     public function setTradeInfo($tradeInfo)
     {
         $this->tradeInfo = $tradeInfo;
         return $this;
     }
-    
+
     public function getTradeInfo()
     {
         return $this->tradeInfo;
     }
-}
+}

+ 2 - 2
src/OpenAPISDK/V3/Model/TradeAccBusiFields.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * acc_busi_fields 字段
  * TradeAccBusiFields
@@ -14,11 +15,10 @@ namespace SixShop\Lakala\OpenAPISDK\V3\Model;
 
 class TradeAccBusiFields implements \JsonSerializable
 {
-
     #[\ReturnTypeWillChange]
     public function jsonSerialize(): mixed
     {
         return [
         ];
     }
-}
+}

+ 2 - 2
src/OpenAPISDK/V3/Model/TradeExtendParams.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * extend_params 字段
  * TradeExtendParams
@@ -14,10 +15,9 @@ namespace SixShop\Lakala\OpenAPISDK\V3\Model;
 
 class TradeExtendParams implements \JsonSerializable
 {
-
     public function jsonSerialize()
     {
         return [
         ];
     }
-}
+}

+ 2 - 2
src/OpenAPISDK/V3/Model/TradeGoodsDetail.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * goods_detail 字段
  * TradeGoodsDetail
@@ -14,11 +15,10 @@ namespace SixShop\Lakala\OpenAPISDK\V3\Model;
 
 class TradeGoodsDetail implements \JsonSerializable
 {
-
     #[\ReturnTypeWillChange]
     public function jsonSerialize(): mixed
     {
         return [
         ];
     }
-}
+}

+ 8 - 7
src/OpenAPISDK/V3/Model/TradeLocationInfo.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 查询交易 请求字段
  * TradeLocationInfo
@@ -22,35 +23,35 @@ class TradeLocationInfo implements \JsonSerializable
     {
         $this->requestIp = $ip;
     }
-    
+
     public function setRequestIp($requestIp)
     {
         $this->requestIp = $requestIp;
         return $this;
     }
-    
+
     public function getRequestIp()
     {
         return $this->requestIp;
     }
-    
+
     public function setBaseStation($baseStation)
     {
         $this->baseStation = $baseStation;
         return $this;
     }
-    
+
     public function getBaseStation()
     {
         return $this->baseStation;
     }
-    
+
     public function setLocation($location)
     {
         $this->location = $location;
         return $this;
     }
-    
+
     public function getLocation()
     {
         return $this->location;
@@ -64,4 +65,4 @@ class TradeLocationInfo implements \JsonSerializable
             'location' => $this->location,
         ];
     }
-}
+}

+ 16 - 15
src/OpenAPISDK/V3/Model/TradeMicropayAlipayAccBusiFields.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 支付宝被扫场景下acc_busi_fields域内容
  * TradeMicropayAlipayAccBusiFields
@@ -23,79 +24,79 @@ class TradeMicropayAlipayAccBusiFields extends TradeAccBusiFields implements \Js
     protected $timeoutExpress;
     protected $disablePayChannels;
     protected $minAge;
-    
+
     public function setExtendParams($extendParams)
     {
         $this->extendParams = $extendParams;
         return $this;
     }
-    
+
     public function getExtendParams()
     {
         return $this->extendParams;
     }
-    
+
     public function setBusinessParams($businessParams)
     {
         $this->businessParams = $businessParams;
         return $this;
     }
-    
+
     public function getBusinessParams()
     {
         return $this->businessParams;
     }
-    
+
     public function setGoodsDetail($goodsDetail)
     {
         $this->goodsDetail = $goodsDetail;
         return $this;
     }
-    
+
     public function getGoodsDetail()
     {
         return $this->goodsDetail;
     }
-    
+
     public function setStoreId($storeId)
     {
         $this->storeId = $storeId;
         return $this;
     }
-    
+
     public function getStoreId()
     {
         return $this->storeId;
     }
-    
+
     public function setTimeoutExpress($timeoutExpress)
     {
         $this->timeoutExpress = $timeoutExpress;
         return $this;
     }
-    
+
     public function getTimeoutExpress()
     {
         return $this->timeoutExpress;
     }
-    
+
     public function setDisablePayChannels($disablePayChannels)
     {
         $this->disablePayChannels = $disablePayChannels;
         return $this;
     }
-    
+
     public function getDisablePayChannels()
     {
         return $this->disablePayChannels;
     }
-    
+
     public function setMinAge($minAge)
     {
         $this->minAge = $minAge;
         return $this;
     }
-    
+
     public function getMinAge()
     {
         return $this->minAge;
@@ -119,4 +120,4 @@ class TradeMicropayAlipayAccBusiFields extends TradeAccBusiFields implements \Js
             'min_age' => $this->minAge,
         ];
     }
-}
+}

+ 8 - 7
src/OpenAPISDK/V3/Model/TradeMicropayAlipayExtendParams.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 支付宝被扫场景下 extend_params字段说明
  * TradeMicropayAlipayExtendParams
@@ -17,35 +18,35 @@ class TradeMicropayAlipayExtendParams extends TradeExtendParams implements \Json
     protected $sysServiceProviderId;
     protected $hbFqNum;
     protected $hbFqSellerPercent;
-    
+
     public function setSysServiceProviderId($sysServiceProviderId)
     {
         $this->sysServiceProviderId = $sysServiceProviderId;
         return $this;
     }
-    
+
     public function getSysServiceProviderId()
     {
         return $this->sysServiceProviderId;
     }
-    
+
     public function setHbFqNum($hbFqNum)
     {
         $this->hbFqNum = $hbFqNum;
         return $this;
     }
-    
+
     public function getHbFqNum()
     {
         return $this->hbFqNum;
     }
-    
+
     public function setHbFqSellerPercent($hbFqSellerPercent)
     {
         $this->hbFqSellerPercent = $hbFqSellerPercent;
         return $this;
     }
-    
+
     public function getHbFqSellerPercent()
     {
         return $this->hbFqSellerPercent;
@@ -59,4 +60,4 @@ class TradeMicropayAlipayExtendParams extends TradeExtendParams implements \Json
             'hb_fq_seller_percent' => $this->hbFqSellerPercent,
         ];
     }
-}
+}

+ 21 - 20
src/OpenAPISDK/V3/Model/TradeMicropayAlipayGoodsDetail.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * goods_detail 支付宝goods_detail字段
  * TradeMicropayAlipayGoodsDetail
@@ -23,106 +24,106 @@ class TradeMicropayAlipayGoodsDetail extends TradeGoodsDetail implements \JsonSe
     protected $categoriesTree;
     protected $body;
     protected $showUrl;
-    
+
     public function setGoodsId($goodsId)
     {
         $this->goodsId = $goodsId;
         return $this;
     }
-    
+
     public function getGoodsId()
     {
         return $this->goodsId;
     }
-    
+
     public function setAlipayGoodsId($alipayGoodsId)
     {
         $this->alipayGoodsId = $alipayGoodsId;
         return $this;
     }
-    
+
     public function getAlipayGoodsId()
     {
         return $this->alipayGoodsId;
     }
-    
+
     public function setGoodsName($goodsName)
     {
         $this->goodsName = $goodsName;
         return $this;
     }
-    
+
     public function getGoodsName()
     {
         return $this->goodsName;
     }
-    
+
     public function setQuantity($quantity)
     {
         $this->quantity = $quantity;
         return $this;
     }
-    
+
     public function getQuantity()
     {
         return $this->quantity;
     }
-    
+
     public function setPrice($price)
     {
         $this->price = $price;
         return $this;
     }
-    
+
     public function getPrice()
     {
         return $this->price;
     }
-    
+
     public function setGoodsCategory($goodsCategory)
     {
         $this->goodsCategory = $goodsCategory;
         return $this;
     }
-    
+
     public function getGoodsCategory()
     {
         return $this->goodsCategory;
     }
-    
+
     public function setCategoriesTree($categoriesTree)
     {
         $this->categoriesTree = $categoriesTree;
         return $this;
     }
-    
+
     public function getCategoriesTree()
     {
         return $this->categoriesTree;
     }
-    
+
     public function setBody($body)
     {
         $this->body = $body;
         return $this;
     }
-    
+
     public function getBody()
     {
         return $this->body;
     }
-    
+
     public function setShowUrl($showUrl)
     {
         $this->showUrl = $showUrl;
         return $this;
     }
-    
+
     public function getShowUrl()
     {
         return $this->showUrl;
     }
-    
+
     public function jsonSerialize()
     {
         return [
@@ -137,4 +138,4 @@ class TradeMicropayAlipayGoodsDetail extends TradeGoodsDetail implements \JsonSe
             'show_url' => $this->showUrl,
         ];
     }
-}
+}

+ 16 - 15
src/OpenAPISDK/V3/Model/TradeMicropayWechaAccBusiFields.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 微信被扫场景下acc_busi_fields域内容
  * TradeMicropayWechaAccBusiFields
@@ -23,79 +24,79 @@ class TradeMicropayWechaAccBusiFields extends TradeAccBusiFields implements \Jso
     protected $limitPay;
     protected $sceneInfo;
     protected $limitPayer;
-    
+
     public function setSubAppid($subAppid)
     {
         $this->subAppid = $subAppid;
         return $this;
     }
-    
+
     public function getSubAppid()
     {
         return $this->subAppid;
     }
-    
+
     public function setDetail($detail)
     {
         $this->detail = $detail;
         return $this;
     }
-    
+
     public function getDetail()
     {
         return $this->detail;
     }
-    
+
     public function setGoodsTag($goodsTag)
     {
         $this->goodsTag = $goodsTag;
         return $this;
     }
-    
+
     public function getGoodsTag()
     {
         return $this->goodsTag;
     }
-    
+
     public function setDeviceInfo($deviceInfo)
     {
         $this->deviceInfo = $deviceInfo;
         return $this;
     }
-    
+
     public function getDeviceInfo()
     {
         return $this->deviceInfo;
     }
-    
+
     public function setLimitPay($limitPay)
     {
         $this->limitPay = $limitPay;
         return $this;
     }
-    
+
     public function getLimitPay()
     {
         return $this->limitPay;
     }
-    
+
     public function setSceneInfo($sceneInfo)
     {
         $this->sceneInfo = $sceneInfo;
         return $this;
     }
-    
+
     public function getSceneInfo()
     {
         return $this->sceneInfo;
     }
-    
+
     public function setLimitPayer($limitPayer)
     {
         $this->limitPayer = $limitPayer;
         return $this;
     }
-    
+
     public function getLimitPayer()
     {
         return $this->limitPayer;
@@ -113,4 +114,4 @@ class TradeMicropayWechaAccBusiFields extends TradeAccBusiFields implements \Jso
             'limit_payer' => $this->limitPayer,
         ];
     }
-}
+}

+ 5 - 6
src/OpenAPISDK/V3/Model/TradeMicropayWechaDetail.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 支付宝被扫场景下 extend_params字段说明
  * TradeMicropayWechaDetail
@@ -12,14 +13,12 @@
 
 namespace SixShop\Lakala\OpenAPISDK\V3\Model;
 
-use SixShop\Lakala\OpenAPISDK\V3\ObjectSerializer;
-
 class TradeMicropayWechaDetail implements \JsonSerializable
 {
     protected $costPrice;
     protected $receiptId;
     protected $goodsDetail;
-    
+
     public function setCostPrice($costPrice)
     {
         $this->costPrice = $costPrice;
@@ -41,13 +40,13 @@ class TradeMicropayWechaDetail implements \JsonSerializable
     {
         return $this->receiptId;
     }
-    
+
     public function setGoodsDetail($goodsDetail)
     {
         $this->goodsDetail = $goodsDetail;
         return $this;
     }
-    
+
     public function getGoodsDetail()
     {
         return $this->goodsDetail;
@@ -67,4 +66,4 @@ class TradeMicropayWechaDetail implements \JsonSerializable
             'goods_detail' => $goods,
         ];
     }
-}
+}

+ 12 - 11
src/OpenAPISDK/V3/Model/TradeMicropayWechaGoodsDetail.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 微信goods_detail字段说明
  * TradeMicropayWechaGoodsDetail
@@ -19,57 +20,57 @@ class TradeMicropayWechaGoodsDetail extends TradeGoodsDetail implements \JsonSer
     protected $goodsName;
     protected $quantity;
     protected $price;
-    
+
     public function setGoodsId($goodsId)
     {
         $this->goodsId = $goodsId;
         return $this;
     }
-    
+
     public function getGoodsId()
     {
         return $this->goodsId;
     }
-    
+
     public function setWxpayGoodsId($wxpayGoodsId)
     {
         $this->wxpayGoodsId = $wxpayGoodsId;
         return $this;
     }
-    
+
     public function getWxpayGoodsId()
     {
         return $this->wxpayGoodsId;
     }
-    
+
     public function setGoodsName($goodsName)
     {
         $this->goodsName = $goodsName;
         return $this;
     }
-    
+
     public function getGoodsName()
     {
         return $this->goodsName;
     }
-    
+
     public function setQuantity($quantity)
     {
         $this->quantity = $quantity;
         return $this;
     }
-    
+
     public function getQuantity()
     {
         return $this->quantity;
     }
-    
+
     public function setPrice($price)
     {
         $this->price = $price;
         return $this;
     }
-    
+
     public function getPrice()
     {
         return $this->price;
@@ -85,4 +86,4 @@ class TradeMicropayWechaGoodsDetail extends TradeGoodsDetail implements \JsonSer
             'price' => $this->price,
         ];
     }
-}
+}

+ 20 - 19
src/OpenAPISDK/V3/Model/TradePreorderAlipayAccBusiFields.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 支付宝主扫场景下acc_busi_fields域内容
  * TradePreorderAlipayAccBusiFields
@@ -25,101 +26,101 @@ class TradePreorderAlipayAccBusiFields extends TradeAccBusiFields implements \Js
     protected $disablePayChannels;
     protected $businessParams;
     protected $minAge;
-    
+
     public function setUserId($userId)
     {
         $this->userId = $userId;
         return $this;
     }
-    
+
     public function getUserId()
     {
         return $this->userId;
     }
-    
+
     public function setTimeoutExpress($timeoutExpress)
     {
         $this->timeoutExpress = $timeoutExpress;
         return $this;
     }
-    
+
     public function getTimeoutExpress()
     {
         return $this->timeoutExpress;
     }
-    
+
     public function setExtendParams($extendParams)
     {
         $this->extendParams = $extendParams;
         return $this;
     }
-    
+
     public function getExtendParams()
     {
         return $this->extendParams;
     }
-    
+
     public function setGoodsDetail($goodsDetail)
     {
         $this->goodsDetail = $goodsDetail;
         return $this;
     }
-    
+
     public function getGoodsDetail()
     {
         return $this->goodsDetail;
     }
-    
+
     public function setQuitUrl($quitUrl)
     {
         $this->quitUrl = $quitUrl;
         return $this;
     }
-    
+
     public function getQuitUrl()
     {
         return $this->quitUrl;
     }
-    
+
     public function setStoreId($storeId)
     {
         $this->storeId = $storeId;
         return $this;
     }
-    
+
     public function getStoreId()
     {
         return $this->storeId;
     }
-    
+
     public function setDisablePayChannels($disablePayChannels)
     {
         $this->disablePayChannels = $disablePayChannels;
         return $this;
     }
-    
+
     public function getDisablePayChannels()
     {
         return $this->disablePayChannels;
     }
-    
+
     public function setBusinessParams($businessParams)
     {
         $this->businessParams = $businessParams;
         return $this;
     }
-    
+
     public function getBusinessParams()
     {
         return $this->businessParams;
     }
-    
+
     public function setMinAge($minAge)
     {
         $this->minAge = $minAge;
         return $this;
     }
-    
+
     public function getMinAge()
     {
         return $this->minAge;
@@ -145,4 +146,4 @@ class TradePreorderAlipayAccBusiFields extends TradeAccBusiFields implements \Js
             'min_age' => $this->minAge
         ];
     }
-}
+}

+ 10 - 9
src/OpenAPISDK/V3/Model/TradePreorderAlipayExtendParams.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 支付宝主扫场景下 extend_params字段说明
  * TradePreorderAlipayExtendParams
@@ -18,46 +19,46 @@ class TradePreorderAlipayExtendParams extends TradeExtendParams implements \Json
     protected $hbFqNum;
     protected $hbFqSellerPercent;
     protected $foodOrderType;
-    
+
     public function setSysServiceProviderId($sysServiceProviderId)
     {
         $this->sysServiceProviderId = $sysServiceProviderId;
         return $this;
     }
-    
+
     public function getSysServiceProviderId()
     {
         return $this->sysServiceProviderId;
     }
-    
+
     public function setHbFqNum($hbFqNum)
     {
         $this->hbFqNum = $hbFqNum;
         return $this;
     }
-    
+
     public function getHbFqNum()
     {
         return $this->hbFqNum;
     }
-    
+
     public function setHbFqSellerPercent($hbFqSellerPercent)
     {
         $this->hbFqSellerPercent = $hbFqSellerPercent;
         return $this;
     }
-    
+
     public function getHbFqSellerPercent()
     {
         return $this->hbFqSellerPercent;
     }
-    
+
     public function setFoodOrderType($foodOrderType)
     {
         $this->foodOrderType = $foodOrderType;
         return $this;
     }
-    
+
     public function getFoodOrderType()
     {
         return $this->foodOrderType;
@@ -72,4 +73,4 @@ class TradePreorderAlipayExtendParams extends TradeExtendParams implements \Json
             'food_order_type' => $this->foodOrderType,
         ];
     }
-}
+}

+ 20 - 19
src/OpenAPISDK/V3/Model/TradePreorderAlipayGoodsDetail.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * goods_detail 支付宝goods_detail字段
  * TradePreorderAlipayGoodsDetail
@@ -23,101 +24,101 @@ class TradePreorderAlipayGoodsDetail extends TradeGoodsDetail implements \JsonSe
     protected $categoriesTree;
     protected $body;
     protected $showUrl;
-    
+
     public function setGoodsId($goodsId)
     {
         $this->goodsId = $goodsId;
         return $this;
     }
-    
+
     public function getGoodsId()
     {
         return $this->goodsId;
     }
-    
+
     public function setAlipayGoodsId($alipayGoodsId)
     {
         $this->alipayGoodsId = $alipayGoodsId;
         return $this;
     }
-    
+
     public function getAlipayGoodsId()
     {
         return $this->alipayGoodsId;
     }
-    
+
     public function setGoodsName($goodsName)
     {
         $this->goodsName = $goodsName;
         return $this;
     }
-    
+
     public function getGoodsName()
     {
         return $this->goodsName;
     }
-    
+
     public function setQuantity($quantity)
     {
         $this->quantity = $quantity;
         return $this;
     }
-    
+
     public function getQuantity()
     {
         return $this->quantity;
     }
-    
+
     public function setPrice($price)
     {
         $this->price = $price;
         return $this;
     }
-    
+
     public function getPrice()
     {
         return $this->price;
     }
-    
+
     public function setGoodsCategory($goodsCategory)
     {
         $this->goodsCategory = $goodsCategory;
         return $this;
     }
-    
+
     public function getGoodsCategory()
     {
         return $this->goodsCategory;
     }
-    
+
     public function setCategoriesTree($categoriesTree)
     {
         $this->categoriesTree = $categoriesTree;
         return $this;
     }
-    
+
     public function getCategoriesTree()
     {
         return $this->categoriesTree;
     }
-    
+
     public function setBody($body)
     {
         $this->body = $body;
         return $this;
     }
-    
+
     public function getBody()
     {
         return $this->body;
     }
-    
+
     public function setShowUrl($showUrl)
     {
         $this->showUrl = $showUrl;
         return $this;
     }
-    
+
     public function getShowUrl()
     {
         return $this->showUrl;
@@ -137,4 +138,4 @@ class TradePreorderAlipayGoodsDetail extends TradeGoodsDetail implements \JsonSe
             'show_url' => $this->showUrl,
         ];
     }
-}
+}

+ 3 - 2
src/OpenAPISDK/V3/Model/TradePreorderNucspayAccBusiFields.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 网联小钱包acc_busi_fields域内容
  * TradePreorderNucspayAccBusiFields
@@ -21,7 +22,7 @@ class TradePreorderNucspayAccBusiFields extends TradeAccBusiFields implements \J
         $this->nucIssrId = $nucIssrId;
         return $this;
     }
-    
+
     public function getNucIssrId()
     {
         return $this->nucIssrId;
@@ -33,4 +34,4 @@ class TradePreorderNucspayAccBusiFields extends TradeAccBusiFields implements \J
             'nuc_issr_id' => $this->nucIssrId,
         ];
     }
-}
+}

+ 20 - 19
src/OpenAPISDK/V3/Model/TradePreorderUnionPayAccBusiFields.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 银联云闪付主扫场景下acc_busi_fields域内容
  * TradePreorderUnionPayAccBusiFields
@@ -25,101 +26,101 @@ class TradePreorderUnionPayAccBusiFields extends TradeAccBusiFields implements \
     protected $instalWill;
     protected $unQrcode;
     protected $userAuthCode;
-    
+
     public function setUserId($userId)
     {
         $this->userId = $userId;
         return $this;
     }
-    
+
     public function getUserId()
     {
         return $this->userId;
     }
-    
+
     public function setTimeoutExpress($timeoutExpress)
     {
         $this->timeoutExpress = $timeoutExpress;
         return $this;
     }
-    
+
     public function getTimeoutExpress()
     {
         return $this->timeoutExpress;
     }
-    
+
     public function setAcqAddnDataOrderInfo($acqAddnDataOrderInfo)
     {
         $this->acqAddnDataOrderInfo = $acqAddnDataOrderInfo;
         return $this;
     }
-    
+
     public function getAcqAddnDataOrderInfo()
     {
         return $this->acqAddnDataOrderInfo;
     }
-    
+
     public function setAcqAddnDataGoodsInfo($acqAddnDataGoodsInfo)
     {
         $this->acqAddnDataGoodsInfo = $acqAddnDataGoodsInfo;
         return $this;
     }
-    
+
     public function getAcqAddnDataGoodsInfo()
     {
         return $this->acqAddnDataGoodsInfo;
     }
-    
+
     public function setFrontUrl($frontUrl)
     {
         $this->frontUrl = $frontUrl;
         return $this;
     }
-    
+
     public function getFrontUrl()
     {
         return $this->frontUrl;
     }
-    
+
     public function setFrontFailUrl($frontFailUrl)
     {
         $this->frontFailUrl = $frontFailUrl;
         return $this;
     }
-    
+
     public function getFrontFailUrl()
     {
         return $this->frontFailUrl;
     }
-    
+
     public function setInstalWill($instalWill)
     {
         $this->instalWill = $instalWill;
         return $this;
     }
-    
+
     public function getInstalWill()
     {
         return $this->instalWill;
     }
-    
+
     public function setUnQrcode($unQrcode)
     {
         $this->unQrcode = $unQrcode;
         return $this;
     }
-    
+
     public function getUnQrcode()
     {
         return $this->unQrcode;
     }
-    
+
     public function setUserAuthCode($userAuthCode)
     {
         $this->userAuthCode = $userAuthCode;
         return $this;
     }
-    
+
     public function getUserAuthCode()
     {
         return $this->userAuthCode;
@@ -145,4 +146,4 @@ class TradePreorderUnionPayAccBusiFields extends TradeAccBusiFields implements \
             'user_auth_code' => $this->userAuthCode,
         ];
     }
-}
+}

+ 14 - 13
src/OpenAPISDK/V3/Model/TradePreorderUnionPayAcqAddnDataGoodsInfo.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 银联云闪acq_addn_data_order_info字段
  * TradePreorderUnionPayAcqAddnDataGoodsInfo
@@ -20,68 +21,68 @@ class TradePreorderUnionPayAcqAddnDataGoodsInfo implements \JsonSerializable
     protected $quantity;
     protected $category;
     protected $addninfo;
-    
+
     public function setId($id)
     {
         $this->id = $id;
         return $this;
     }
-    
+
     public function getId()
     {
         return $this->id;
     }
-    
+
     public function setName($name)
     {
         $this->name = $name;
         return $this;
     }
-    
+
     public function getName()
     {
         return $this->name;
     }
-    
+
     public function setPrice($price)
     {
         $this->price = $price;
         return $this;
     }
-    
+
     public function getPrice()
     {
         return $this->price;
     }
-    
+
     public function setQuantity($quantity)
     {
         $this->quantity = $quantity;
         return $this;
     }
-    
+
     public function getQuantity()
     {
         return $this->quantity;
     }
-    
+
     public function setCategory($category)
     {
         $this->category = $category;
         return $this;
     }
-    
+
     public function getCategory()
     {
         return $this->category;
     }
-    
+
     public function setAddninfo($addninfo)
     {
         $this->addninfo = $addninfo;
         return $this;
     }
-    
+
     public function getAddninfo()
     {
         return $this->addninfo;
@@ -98,4 +99,4 @@ class TradePreorderUnionPayAcqAddnDataGoodsInfo implements \JsonSerializable
             'addninfo' => $this->addninfo,
         ];
     }
-}
+}

+ 8 - 7
src/OpenAPISDK/V3/Model/TradePreorderUnionPayAcqAddnDataOrderInfo.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 银联云闪acq_addn_data_order_info字段
  * TradePreorderUnionPayAcqAddnDataOrderInfo
@@ -17,35 +18,35 @@ class TradePreorderUnionPayAcqAddnDataOrderInfo implements \JsonSerializable
     protected $title;
     protected $dctAmount;
     protected $addnInfo;
-    
+
     public function setTitle($title)
     {
         $this->title = $title;
         return $this;
     }
-    
+
     public function getTitle()
     {
         return $this->title;
     }
-    
+
     public function setDctAmount($dctAmount)
     {
         $this->dctAmount = $dctAmount;
         return $this;
     }
-    
+
     public function getDctAmount()
     {
         return $this->dctAmount;
     }
-    
+
     public function setAddnInfo($addnInfo)
     {
         $this->addnInfo = $addnInfo;
         return $this;
     }
-    
+
     public function getAddnInfo()
     {
         return $this->addnInfo;
@@ -59,4 +60,4 @@ class TradePreorderUnionPayAcqAddnDataOrderInfo implements \JsonSerializable
             'addnInfo' => $this->addnInfo,
         ];
     }
-}
+}

+ 8 - 7
src/OpenAPISDK/V3/Model/TradePreorderUnionPayAddnInfo.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 银联云闪addn_info字段
  * TradePreorderUnionPayAddnInfo
@@ -17,35 +18,35 @@ class TradePreorderUnionPayAddnInfo implements \JsonSerializable
     protected $preproduct;
     protected $lockplan;
     protected $riskInfo;
-    
+
     public function setPreproduct($preproduct)
     {
         $this->preproduct = $preproduct;
         return $this;
     }
-    
+
     public function getPreproduct()
     {
         return $this->preproduct;
     }
-    
+
     public function setLockplan($lockplan)
     {
         $this->lockplan = $lockplan;
         return $this;
     }
-    
+
     public function getLockplan()
     {
         return $this->lockplan;
     }
-    
+
     public function setRiskInfo($riskInfo)
     {
         $this->riskInfo = $riskInfo;
         return $this;
     }
-    
+
     public function getRiskInfo()
     {
         return $this->riskInfo;
@@ -59,4 +60,4 @@ class TradePreorderUnionPayAddnInfo implements \JsonSerializable
             'riskInfo' => $this->riskInfo,
         ];
     }
-}
+}

+ 13 - 12
src/OpenAPISDK/V3/Model/TradePreorderUnionPayRiskInfo.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 银联云闪risk_info
  * TradePreorderUnionPayRiskInfo
@@ -19,61 +20,61 @@ class TradePreorderUnionPayRiskInfo implements \JsonSerializable
     protected $payUserId;
     protected $payCodeId;
     protected $merchantType;
-    
+
     public function setItemNo($itemNo)
     {
         $this->itemNo = $itemNo;
         return $this;
     }
-    
+
     public function getItemNo()
     {
         return $this->itemNo;
     }
-    
+
     public function setOrderSource($orderSource)
     {
         $this->orderSource = $orderSource;
         return $this;
     }
-    
+
     public function getOrderSource()
     {
         return $this->orderSource;
     }
-    
+
     public function setPayUserId($payUserId)
     {
         $this->payUserId = $payUserId;
         return $this;
     }
-    
+
     public function getPayUserId()
     {
         return $this->payUserId;
     }
-    
+
     public function setPayCodeId($payCodeId)
     {
         $this->payCodeId = $payCodeId;
         return $this;
     }
-    
+
     public function getPayCodeId()
     {
         return $this->payCodeId;
     }
-    
+
     public function setMerchantType($merchantType)
     {
         $this->merchantType = $merchantType;
         return $this;
     }
-    
+
     public function getMerchantType()
     {
         return $this->merchantType;
-    }    
+    }
 
     public function jsonSerialize()
     {
@@ -85,4 +86,4 @@ class TradePreorderUnionPayRiskInfo implements \JsonSerializable
             'merchantType' => $this->merchantType,
         ];
     }
-}
+}

+ 22 - 21
src/OpenAPISDK/V3/Model/TradePreorderWechaAccBusiFields.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 微信主扫场景下acc_busi_fields域内容
  * TradePreorderWechaAccBusiFields
@@ -26,112 +27,112 @@ class TradePreorderWechaAccBusiFields extends TradeAccBusiFields implements \Jso
     protected $limitPay;
     protected $sceneInfo;
     protected $limitPayer;
-    
+
     public function setTimeoutExpress($timeoutExpress)
     {
         $this->timeoutExpress = $timeoutExpress;
         return $this;
     }
-    
+
     public function getTimeoutExpress()
     {
         return $this->timeoutExpress;
     }
-    
+
     public function setSubAppid($subAppid)
     {
         $this->subAppid = $subAppid;
         return $this;
     }
-    
+
     public function getSubAppid()
     {
         return $this->subAppid;
     }
-    
+
     public function setUserId($userId)
     {
         $this->userId = $userId;
         return $this;
     }
-    
+
     public function getUserId()
     {
         return $this->userId;
     }
-    
+
     public function setDetail($detail)
     {
         $this->detail = $detail;
         return $this;
     }
-    
+
     public function getDetail()
     {
         return $this->detail;
     }
-    
+
     public function setGoodsTag($goodsTag)
     {
         $this->goodsTag = $goodsTag;
         return $this;
     }
-    
+
     public function getGoodsTag()
     {
         return $this->goodsTag;
     }
-    
+
     public function setAttach($attach)
     {
         $this->attach = $attach;
         return $this;
     }
-    
+
     public function getAttach()
     {
         return $this->attach;
     }
-    
+
     public function setDeviceInfo($deviceInfo)
     {
         $this->deviceInfo = $deviceInfo;
         return $this;
     }
-    
+
     public function getDeviceInfo()
     {
         return $this->deviceInfo;
     }
-    
+
     public function setLimitPay($limitPay)
     {
         $this->limitPay = $limitPay;
         return $this;
     }
-    
+
     public function getLimitPay()
     {
         return $this->limitPay;
     }
-    
+
     public function setSceneInfo($sceneInfo)
     {
         $this->sceneInfo = $sceneInfo;
         return $this;
     }
-    
+
     public function getSceneInfo()
     {
         return $this->sceneInfo;
     }
-    
+
     public function setLimitPayer($limitPayer)
     {
         $this->limitPayer = $limitPayer;
         return $this;
     }
-    
+
     public function getLimitPayer()
     {
         return $this->limitPayer;
@@ -153,4 +154,4 @@ class TradePreorderWechaAccBusiFields extends TradeAccBusiFields implements \Jso
             'limit_payer' => $this->limitPayer,
         ];
     }
-}
+}

+ 5 - 6
src/OpenAPISDK/V3/Model/TradePreorderWechaDetail.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 支付宝主扫场景下 extend_params字段说明
  * TradePreorderWechaExtendParams
@@ -12,14 +13,12 @@
 
 namespace SixShop\Lakala\OpenAPISDK\V3\Model;
 
-use SixShop\Lakala\OpenAPISDK\V3\ObjectSerializer;
-
 class TradePreorderWechaDetail implements \JsonSerializable
 {
     protected $costPrice;
     protected $receiptId;
     protected $goodsDetail;
-    
+
     public function setCostPrice($costPrice)
     {
         $this->costPrice = $costPrice;
@@ -41,13 +40,13 @@ class TradePreorderWechaDetail implements \JsonSerializable
     {
         return $this->receiptId;
     }
-    
+
     public function setGoodsDetail($goodsDetail)
     {
         $this->goodsDetail = $goodsDetail;
         return $this;
     }
-    
+
     public function getGoodsDetail()
     {
         return $this->goodsDetail;
@@ -68,4 +67,4 @@ class TradePreorderWechaDetail implements \JsonSerializable
             'goods_detail' => $goods,
         ];
     }
-}
+}

+ 12 - 11
src/OpenAPISDK/V3/Model/TradePreorderWechaGoodsDetail.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 微信goods_detail字段说明
  * TradePreorderWechaGoodsDetail
@@ -19,57 +20,57 @@ class TradePreorderWechaGoodsDetail extends TradeGoodsDetail implements \JsonSer
     protected $goodsName;
     protected $quantity;
     protected $price;
-    
+
     public function setGoodsId($goodsId)
     {
         $this->goodsId = $goodsId;
         return $this;
     }
-    
+
     public function getGoodsId()
     {
         return $this->goodsId;
     }
-    
+
     public function setWxpayGoodsId($wxpayGoodsId)
     {
         $this->wxpayGoodsId = $wxpayGoodsId;
         return $this;
     }
-    
+
     public function getWxpayGoodsId()
     {
         return $this->wxpayGoodsId;
     }
-    
+
     public function setGoodsName($goodsName)
     {
         $this->goodsName = $goodsName;
         return $this;
     }
-    
+
     public function getGoodsName()
     {
         return $this->goodsName;
     }
-    
+
     public function setQuantity($quantity)
     {
         $this->quantity = $quantity;
         return $this;
     }
-    
+
     public function getQuantity()
     {
         return $this->quantity;
     }
-    
+
     public function setPrice($price)
     {
         $this->price = $price;
         return $this;
     }
-    
+
     public function getPrice()
     {
         return $this->price;
@@ -86,4 +87,4 @@ class TradePreorderWechaGoodsDetail extends TradeGoodsDetail implements \JsonSer
             'price' => $this->price,
         ];
     }
-}
+}

+ 55 - 42
src/OpenAPISDK/V3/Model/TransMicropayRequest.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 被扫交易 请求字段
  * TransMicropayRequest
@@ -22,7 +23,7 @@ class TransMicropayRequest extends ModelRequest implements \JsonSerializable
     protected $outTradeNo;
     /**
      * 支付授权码	M	String(32)	扫码支付授权码,设备读取用户APP中的条码或者二维码信息,用户付款码条形码规则见说明
-     * 
+     *
      * 属性	    说明	备注
      * 微信	    WECHAT	付款码10 11 12 13 14 15开头
      * 支付宝	ALIPAY	付款码25 26 27 28 29 30开头
@@ -36,7 +37,7 @@ class TransMicropayRequest extends ModelRequest implements \JsonSerializable
     protected $totalAmount;
     /**
      * 地址位置信息	M	Object	地址位置信息,风控要求必送
-     * 
+     *
      * request_ip	请求方IP地址	M	String(64)	请求方的IP地址,存在必填,格式如36.45.36.95
      * base_station	基站信息	C	String(128)	客户端设备的基站信息(主扫时基站信息使用该字段)
      * location	纬度,经度	C	String(32)	商户终端的地理位置,整体格式:纬度,经度,+表示北纬、东经,-表示南纬、 西经。
@@ -74,178 +75,178 @@ class TransMicropayRequest extends ModelRequest implements \JsonSerializable
 
         $this->busiMode = 'ACQ';
     }
-    
+
     public function setMerchantNo($merchantNo)
     {
         $this->merchantNo = $merchantNo;
         return $this;
     }
-    
+
     public function getMerchantNo()
     {
         return $this->merchantNo;
     }
-    
+
     public function setTermNo($termNo)
     {
         $this->termNo = $termNo;
         return $this;
     }
-    
+
     public function getTermNo()
     {
         return $this->termNo;
     }
-    
+
     public function setOutTradeNo($outTradeNo)
     {
         $this->outTradeNo = $outTradeNo;
         return $this;
     }
-    
+
     public function getOutTradeNo()
     {
         return $this->outTradeNo;
     }
-    
+
     public function setAuthCode($authCode)
     {
         $this->authCode = $authCode;
         return $this;
     }
-    
+
     public function getAuthCode()
     {
         return $this->authCode;
     }
-    
+
     public function setTotalAmount($totalAmount)
     {
         $this->totalAmount = $totalAmount;
         return $this;
     }
-    
+
     public function getTotalAmount()
     {
         return $this->totalAmount;
     }
-    
+
     public function setLocationInfo($locationInfo)
     {
         $this->locationInfo = $locationInfo;
         return $this;
     }
-    
+
     public function getLocationInfo()
     {
         return $this->locationInfo;
     }
-    
+
     public function setBusiMode($busiMode)
     {
         $this->busiMode = $busiMode;
         return $this;
     }
-    
+
     public function getBusiMode()
     {
         return $this->busiMode;
     }
-    
+
     public function setSubject($subject)
     {
         $this->subject = $subject;
         return $this;
     }
-    
+
     public function getSubject()
     {
         return $this->subject;
     }
-    
+
     public function setPayOrderNo($payOrderNo)
     {
         $this->payOrderNo = $payOrderNo;
         return $this;
     }
-    
+
     public function getPayOrderNo()
     {
         return $this->payOrderNo;
     }
-    
+
     public function setNotifyUrl($notifyUrl)
     {
         $this->notifyUrl = $notifyUrl;
         return $this;
     }
-    
+
     public function getNotifyUrl()
     {
         return $this->notifyUrl;
     }
-    
+
     public function setSettleType($settleType)
     {
         $this->settleType = $settleType;
         return $this;
     }
-    
+
     public function getSettleType()
     {
         return $this->settleType;
     }
-    
+
     public function setRemark($remark)
     {
         $this->remark = $remark;
         return $this;
     }
-    
+
     public function getRemark()
     {
         return $this->remark;
     }
-    
+
     public function setScanType($scanType)
     {
         $this->scanType = $scanType;
         return $this;
     }
-    
+
     public function getScanType()
     {
         return $this->scanType;
     }
-    
+
     public function setPromoInfo($promoInfo)
     {
         $this->promoInfo = $promoInfo;
         return $this;
     }
-    
+
     public function getPromoInfo()
     {
         return $this->promoInfo;
     }
-    
+
     public function setAccBusiFields($accBusiFields)
     {
         $this->accBusiFields = $accBusiFields;
         return $this;
     }
-    
+
     public function getAccBusiFields()
     {
         return $this->accBusiFields;
     }
-    
+
     public function setOutOrderNo($outOrderNo)
     {
         $this->outOrderNo = $outOrderNo;
         return $this;
     }
-    
+
     public function getOutOrderNo()
     {
         return $this->outOrderNo;
@@ -256,7 +257,7 @@ class TransMicropayRequest extends ModelRequest implements \JsonSerializable
         $this->pnrInsIdCd = $pnrInsIdCd;
         return $this;
     }
-    
+
     public function getPnrInsIdCd()
     {
         return $this->pnrInsIdCd;
@@ -270,12 +271,24 @@ class TransMicropayRequest extends ModelRequest implements \JsonSerializable
     public function listInvalidProperties()
     {
         $invalidProperties = [];
-        if (strlen($this->merchantNo)===0) $invalidProperties[] = '商户号不能为空';
-        if (strlen($this->termNo)===0) $invalidProperties[] = '终端号不能为空';
-        if (strlen($this->outTradeNo)===0) $invalidProperties[] = '商户交易流水号不能为空';
-        if (strlen($this->authCode)===0) $invalidProperties[] = '支付授权码不能为空';
-        if (strlen($this->totalAmount)===0) $invalidProperties[] = '金额不能为空';
-        if ($this->locationInfo == null) $invalidProperties[] = '地址位置信息不能为空';
+        if (strlen($this->merchantNo) === 0) {
+            $invalidProperties[] = '商户号不能为空';
+        }
+        if (strlen($this->termNo) === 0) {
+            $invalidProperties[] = '终端号不能为空';
+        }
+        if (strlen($this->outTradeNo) === 0) {
+            $invalidProperties[] = '商户交易流水号不能为空';
+        }
+        if (strlen($this->authCode) === 0) {
+            $invalidProperties[] = '支付授权码不能为空';
+        }
+        if (strlen($this->totalAmount) === 0) {
+            $invalidProperties[] = '金额不能为空';
+        }
+        if ($this->locationInfo == null) {
+            $invalidProperties[] = '地址位置信息不能为空';
+        }
 
         return $invalidProperties;
     }
@@ -303,4 +316,4 @@ class TransMicropayRequest extends ModelRequest implements \JsonSerializable
         ]);
         return parent::jsonSerialize();
     }
-}
+}

+ 39 - 38
src/OpenAPISDK/V3/Model/TransMicropayResponse.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * TransMicropayResponse
  * PHP version 7.4
@@ -52,7 +53,7 @@ class TransMicropayResponse extends ModelResponse implements \JsonSerializable
     // 付款银行	C	String(128)	付款银行
     protected $bankType;
     /**
-     * 银行卡类型	C	String(16)	
+     * 银行卡类型	C	String(16)
      * 00:借记
      * 01:贷记
      * 02:微信零钱
@@ -67,202 +68,202 @@ class TransMicropayResponse extends ModelResponse implements \JsonSerializable
     protected $remark;
     // 账户端返回信息域	C	Object	账户端返回信息域
     protected $accRespFields;
-    
+
     public function setNeedQuery($needQuery)
     {
         $this->needQuery = $needQuery;
         return $this;
     }
-    
+
     public function getNeedQuery()
     {
         return $this->needQuery;
     }
-    
+
     public function setMerchantNo($merchantNo)
     {
         $this->merchantNo = $merchantNo;
         return $this;
     }
-    
+
     public function getMerchantNo()
     {
         return $this->merchantNo;
     }
-    
+
     public function setOutTradeNo($outTradeNo)
     {
         $this->outTradeNo = $outTradeNo;
         return $this;
     }
-    
+
     public function getOutTradeNo()
     {
         return $this->outTradeNo;
     }
-    
+
     public function setTradeNo($tradeNo)
     {
         $this->tradeNo = $tradeNo;
         return $this;
     }
-    
+
     public function getTradeNo()
     {
         return $this->tradeNo;
     }
-    
+
     public function setLogNo($logNo)
     {
         $this->logNo = $logNo;
         return $this;
     }
-    
+
     public function getLogNo()
     {
         return $this->logNo;
     }
-    
+
     public function setAccTradeNo($accTradeNo)
     {
         $this->accTradeNo = $accTradeNo;
         return $this;
     }
-    
+
     public function getAccTradeNo()
     {
         return $this->accTradeNo;
     }
-    
+
     public function setAccountType($accountType)
     {
         $this->accountType = $accountType;
         return $this;
     }
-    
+
     public function getAccountType()
     {
         return $this->accountType;
     }
-    
+
     public function setTotalAmount($totalAmount)
     {
         $this->totalAmount = $totalAmount;
         return $this;
     }
-    
+
     public function getTotalAmount()
     {
         return $this->totalAmount;
     }
-    
+
     public function setPayerAmount($payerAmount)
     {
         $this->payerAmount = $payerAmount;
         return $this;
     }
-    
+
     public function getPayerAmount()
     {
         return $this->payerAmount;
     }
-    
+
     public function setAccSettleAmount($accSettleAmount)
     {
         $this->accSettleAmount = $accSettleAmount;
         return $this;
     }
-    
+
     public function getAccSettleAmount()
     {
         return $this->accSettleAmount;
     }
-    
+
     public function setAccMdiscountAmount($accMdiscountAmount)
     {
         $this->accMdiscountAmount = $accMdiscountAmount;
         return $this;
     }
-    
+
     public function getAccMdiscountAmount()
     {
         return $this->accMdiscountAmount;
     }
-    
+
     public function setAccDiscountAmount($accDiscountAmount)
     {
         $this->accDiscountAmount = $accDiscountAmount;
         return $this;
     }
-    
+
     public function getAccDiscountAmount()
     {
         return $this->accDiscountAmount;
     }
-    
+
     public function setAccOtherDiscountAmount($accOtherDiscountAmount)
     {
         $this->accOtherDiscountAmount = $accOtherDiscountAmount;
         return $this;
     }
-    
+
     public function getAccOtherDiscountAmount()
     {
         return $this->accOtherDiscountAmount;
     }
-    
+
     public function setTradeTime($tradeTime)
     {
         $this->tradeTime = $tradeTime;
         return $this;
     }
-    
+
     public function getTradeTime()
     {
         return $this->tradeTime;
     }
-    
+
     public function setBankType($bankType)
     {
         $this->bankType = $bankType;
         return $this;
     }
-    
+
     public function getBankType()
     {
         return $this->bankType;
     }
-    
+
     public function setCardType($cardType)
     {
         $this->cardType = $cardType;
         return $this;
     }
-    
+
     public function getCardType()
     {
         return $this->cardType;
     }
-    
+
     public function setRemark($remark)
     {
         $this->remark = $remark;
         return $this;
     }
-    
+
     public function getRemark()
     {
         return $this->remark;
     }
-    
+
     public function setAccRespFields($accRespFields)
     {
         $this->accRespFields = $accRespFields;
         return $this;
     }
-    
+
     public function getAccRespFields()
     {
         return $this->accRespFields;
     }
-}
+}

+ 30 - 15
src/OpenAPISDK/V3/Model/TransPreorderRequest.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 主扫交易 请求字段
  * TransPreorderRequest
@@ -21,20 +22,20 @@ class TransPreorderRequest extends ModelRequest implements \JsonSerializable
     // 商户交易流水号	M	String(32)	商户系统唯一,对应数据库表中外部请求流水号。
     protected $outTradeNo;
     /**
-     * 钱包类型	M	String(32)	
-     * 
+     * 钱包类型	M	String(32)
+     *
      * 微信             WECHAT
      * 支付宝           ALIPAY
      * 银联             UQRCODEPAY     默认
      * 翼支付           BESTPAY
-     * 苏宁易付宝        SUNING 
-     * 拉卡拉支付账户     LKLACC 
+     * 苏宁易付宝        SUNING
+     * 拉卡拉支付账户     LKLACC
      * 网联小钱包        NUCSPAY
      */
     protected $accountType;
     /**
      * 接入方式	M	String(2)
-     * 
+     *
      * 41   NATIVE((ALIPAY,云闪付支付,京东白条分期)
      * 51   JSAPI(微信公众号支付,支付宝服务窗支付,银联JS支付,翼支付JS支付、拉卡拉钱包支付)
      * 71   微信小程序支付
@@ -45,7 +46,7 @@ class TransPreorderRequest extends ModelRequest implements \JsonSerializable
     protected $totalAmount;
     /**
      * 地址位置信息	M	Object	地址位置信息,风控要求必送
-     * 
+     *
      * request_ip	请求方IP地址	M	String(64)	请求方的IP地址,存在必填,格式如36.45.36.95
      * base_station	基站信息	C	String(128)	客户端设备的基站信息(主扫时基站信息使用该字段)
      * location	纬度,经度	C	String(32)	商户终端的地理位置,整体格式:纬度,经度,+表示北纬、东经,-表示南纬、 西经。
@@ -272,7 +273,7 @@ class TransPreorderRequest extends ModelRequest implements \JsonSerializable
         $this->pnrInsIdCd = $pnrInsIdCd;
         return $this;
     }
-    
+
     public function getPnrInsIdCd()
     {
         return $this->pnrInsIdCd;
@@ -286,13 +287,27 @@ class TransPreorderRequest extends ModelRequest implements \JsonSerializable
     public function listInvalidProperties()
     {
         $invalidProperties = [];
-        if (strlen($this->merchantNo)===0) $invalidProperties[] = '商户号不能为空';
-        if (strlen($this->termNo)===0) $invalidProperties[] = '终端号不能为空';
-        if (strlen($this->outTradeNo)===0) $invalidProperties[] = '商户交易流水号不能为空';
-        if (strlen($this->accountType)===0) $invalidProperties[] = '钱包类型不能为空';
-        if (strlen($this->transType)===0) $invalidProperties[] = '接入方式接入方式不能为空';
-        if (strlen($this->totalAmount)===0) $invalidProperties[] = '金额不能为空';
-        if ($this->locationInfo == null) $invalidProperties[] = '地址位置信息不能为空';
+        if (strlen($this->merchantNo) === 0) {
+            $invalidProperties[] = '商户号不能为空';
+        }
+        if (strlen($this->termNo) === 0) {
+            $invalidProperties[] = '终端号不能为空';
+        }
+        if (strlen($this->outTradeNo) === 0) {
+            $invalidProperties[] = '商户交易流水号不能为空';
+        }
+        if (strlen($this->accountType) === 0) {
+            $invalidProperties[] = '钱包类型不能为空';
+        }
+        if (strlen($this->transType) === 0) {
+            $invalidProperties[] = '接入方式接入方式不能为空';
+        }
+        if (strlen($this->totalAmount) === 0) {
+            $invalidProperties[] = '金额不能为空';
+        }
+        if ($this->locationInfo == null) {
+            $invalidProperties[] = '地址位置信息不能为空';
+        }
         if ($this->accountType === 'WECHAT' && strlen($this->subject) === 0) {
             $invalidProperties[] = '微信支付必需上送订单标题字段[subject]';
         }
@@ -325,4 +340,4 @@ class TransPreorderRequest extends ModelRequest implements \JsonSerializable
         ]);
         return parent::jsonSerialize();
     }
-}
+}

+ 2 - 1
src/OpenAPISDK/V3/Model/TransPreorderResponse.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * TransPreorderRequest
  * PHP version 7.4
@@ -104,4 +105,4 @@ class TransPreorderResponse extends ModelResponse implements \JsonSerializable
     {
         return $this->accRespFields;
     }
-}
+}

+ 8 - 3
src/OpenAPISDK/V3/ObjectSerializer.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * ObjectSerializer
  * PHP version 7.4
@@ -57,11 +58,15 @@ class ObjectSerializer
     # 此方法仅针对请求Model参数的对象json编码处理
     public static function jsonencode($value)
     {
-        if ($value === null || is_string($value)) return $value;
-        if (is_array($value)) return json_encode($value, JSON_UNESCAPED_UNICODE);
+        if ($value === null || is_string($value)) {
+            return $value;
+        }
+        if (is_array($value)) {
+            return json_encode($value, JSON_UNESCAPED_UNICODE);
+        }
         if (method_exists($value, 'jsonSerialize')) {
             return json_encode($value->jsonSerialize(), JSON_UNESCAPED_UNICODE);
         }
         return json_encode($value, JSON_UNESCAPED_UNICODE);
     }
-}
+}

+ 7 - 6
src/OpenAPISDK/V3/Util/HttpService.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * HttpService
  * PHP version 7.4
@@ -19,10 +20,10 @@ namespace SixShop\Lakala\OpenAPISDK\V3\Util;
 class HttpService
 {
     // Response types
-    const RESPOND_TYPE_SIMPLE = 'simple';
-    const RESPOND_TYPE_ORIGINAL = 'original';
-    const RESPOND_TYPE_ARRAY = 'array';
-    const RESPOND_TYPE_JSON = 'json';
+    public const RESPOND_TYPE_SIMPLE = 'simple';
+    public const RESPOND_TYPE_ORIGINAL = 'original';
+    public const RESPOND_TYPE_ARRAY = 'array';
+    public const RESPOND_TYPE_JSON = 'json';
 
     /**
      * Send a GET request
@@ -60,7 +61,7 @@ class HttpService
     public static function request($method, $url, array $options = [])
     {
         $curl = curl_init();
-// print_r($options);
+        // print_r($options);
         // Set GET parameters
         if (!empty($options['query'])) {
             $url .= (strpos($url, '?') === false ? '?' : '&') . http_build_query($options['query']);
@@ -160,4 +161,4 @@ class HttpService
         }
         return $headers;
     }
-}
+}

+ 34 - 33
src/OpenAPISDK/V3/Util/LakalaSM4.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * LakalaSM4
  * PHP version 7.4
@@ -13,7 +14,7 @@ namespace SixShop\Lakala\OpenAPISDK\V3\Util;
 
 class LakalaSM4
 {
-    const SM4_CK = [
+    public const SM4_CK = [
         0x00070e15, 0x1c232a31, 0x383f464d, 0x545b6269,
         0x70777e85, 0x8c939aa1, 0xa8afb6bd, 0xc4cbd2d9,
         0xe0e7eef5, 0xfc030a11, 0x181f262d, 0x343b4249,
@@ -24,7 +25,7 @@ class LakalaSM4
         0x10171e25, 0x2c333a41, 0x484f565d, 0x646b7279
     ];
 
-    const SM4_SBOX = [
+    public const SM4_SBOX = [
         0xd6,0x90,0xe9,0xfe,0xcc,0xe1,0x3d,0xb7,0x16,0xb6,0x14,0xc2,0x28,0xfb,0x2c,0x05,
         0x2b,0x67,0x9a,0x76,0x2a,0xbe,0x04,0xc3,0xaa,0x44,0x13,0x26,0x49,0x86,0x06,0x99,
         0x9c,0x42,0x50,0xf4,0x91,0xef,0x98,0x7a,0x33,0x54,0x0b,0x43,0xed,0xcf,0xac,0x62,
@@ -43,7 +44,7 @@ class LakalaSM4
         0x18,0xf0,0x7d,0xec,0x3a,0xdc,0x4d,0x20,0x79,0xee,0x5f,0x3e,0xd7,0xcb,0x39,0x48
     ];
 
-    const SM4_FK = [0xA3B1BAC6, 0x56AA3350, 0x677D9197, 0xB27022DC];
+    public const SM4_FK = [0xA3B1BAC6, 0x56AA3350, 0x677D9197, 0xB27022DC];
 
     public $_rk = [];
     public $_block_size = 16;
@@ -102,22 +103,22 @@ class LakalaSM4
     private function sm4Decrypt($cipherText)
     {
         $x = [];
-        for ($j=0; $j<4; $j++) {
-            $x[$j]=($cipherText[$j*4]<<24)  |($cipherText[$j*4+1]<<16)| ($cipherText[$j*4+2]<<8)|($cipherText[$j*4+3]);
+        for ($j = 0; $j < 4; $j++) {
+            $x[$j] = ($cipherText[$j * 4] << 24)  | ($cipherText[$j * 4 + 1] << 16) | ($cipherText[$j * 4 + 2] << 8) | ($cipherText[$j * 4 + 3]);
         }
 
-        for ($i=0; $i<32; $i++) {
-            $tmp = $x[$i+1]^$x[$i+2]^$x[$i+3]^$this->_rk[31-$i];
-            $buf= (self::SM4_SBOX[($tmp >> 24) & 0xFF]) << 24 |(self::SM4_SBOX[($tmp >> 16) & 0xFF]) << 16 |(self::SM4_SBOX[($tmp >> 8) & 0xFF]) << 8 |(self::SM4_SBOX[$tmp & 0xFF]);
-            $x[$i+4]=$x[$i]^($buf^$this->sm4Rotl32(($buf), 2)^ $this->sm4Rotl32(($buf), 10) ^ $this->sm4Rotl32(($buf), 18)^ $this->sm4Rotl32(($buf), 24));
+        for ($i = 0; $i < 32; $i++) {
+            $tmp = $x[$i + 1] ^ $x[$i + 2] ^ $x[$i + 3] ^ $this->_rk[31 - $i];
+            $buf = (self::SM4_SBOX[($tmp >> 24) & 0xFF]) << 24 | (self::SM4_SBOX[($tmp >> 16) & 0xFF]) << 16 | (self::SM4_SBOX[($tmp >> 8) & 0xFF]) << 8 | (self::SM4_SBOX[$tmp & 0xFF]);
+            $x[$i + 4] = $x[$i] ^ ($buf ^ $this->sm4Rotl32(($buf), 2) ^ $this->sm4Rotl32(($buf), 10) ^ $this->sm4Rotl32(($buf), 18) ^ $this->sm4Rotl32(($buf), 24));
         }
 
         $plainText = [];
-        for ($k=0; $k<4; $k++) {
-            $plainText[4*$k]=($x[35-$k]>> 24)& 0xFF;
-            $plainText[4*$k+1]=($x[35-$k]>> 16)& 0xFF;
-            $plainText[4*$k+2]=($x[35-$k]>> 8)& 0xFF;
-            $plainText[4*$k+3]=($x[35-$k])& 0xFF;
+        for ($k = 0; $k < 4; $k++) {
+            $plainText[4 * $k] = ($x[35 - $k] >> 24) & 0xFF;
+            $plainText[4 * $k + 1] = ($x[35 - $k] >> 16) & 0xFF;
+            $plainText[4 * $k + 2] = ($x[35 - $k] >> 8) & 0xFF;
+            $plainText[4 * $k + 3] = ($x[35 - $k]) & 0xFF;
         }
 
         return $this->bytesToString($plainText);
@@ -126,22 +127,22 @@ class LakalaSM4
     private function sm4Encrypt($plainText)
     {
         $x = [];
-        for ($j=0; $j<4; $j++) {
-            $x[$j]=($plainText[$j*4]<<24)  |($plainText[$j*4+1]<<16)| ($plainText[$j*4+2]<<8)|($plainText[$j*4+3]);
+        for ($j = 0; $j < 4; $j++) {
+            $x[$j] = ($plainText[$j * 4] << 24)  | ($plainText[$j * 4 + 1] << 16) | ($plainText[$j * 4 + 2] << 8) | ($plainText[$j * 4 + 3]);
         }
 
-        for ($i=0; $i<32; $i++) {
-            $tmp = $x[$i+1]^$x[$i+2]^$x[$i+3]^$this->_rk[$i];
-            $buf= (self::SM4_SBOX[($tmp >> 24) & 0xFF]) << 24 |(self::SM4_SBOX[($tmp >> 16) & 0xFF]) << 16 |(self::SM4_SBOX[($tmp >> 8) & 0xFF]) << 8 |(self::SM4_SBOX[$tmp & 0xFF]);
-            $x[$i+4]=$x[$i]^($buf^$this->sm4Rotl32(($buf), 2)^ $this->sm4Rotl32(($buf), 10) ^ $this->sm4Rotl32(($buf), 18)^ $this->sm4Rotl32(($buf), 24));
+        for ($i = 0; $i < 32; $i++) {
+            $tmp = $x[$i + 1] ^ $x[$i + 2] ^ $x[$i + 3] ^ $this->_rk[$i];
+            $buf = (self::SM4_SBOX[($tmp >> 24) & 0xFF]) << 24 | (self::SM4_SBOX[($tmp >> 16) & 0xFF]) << 16 | (self::SM4_SBOX[($tmp >> 8) & 0xFF]) << 8 | (self::SM4_SBOX[$tmp & 0xFF]);
+            $x[$i + 4] = $x[$i] ^ ($buf ^ $this->sm4Rotl32(($buf), 2) ^ $this->sm4Rotl32(($buf), 10) ^ $this->sm4Rotl32(($buf), 18) ^ $this->sm4Rotl32(($buf), 24));
         }
 
         $cipherText = [];
-        for ($k=0; $k<4; $k++) {
-            $cipherText[4*$k]=($x[35-$k]>> 24)& 0xFF;
-            $cipherText[4*$k+1]=($x[35-$k]>> 16)& 0xFF;
-            $cipherText[4*$k+2]=($x[35-$k]>> 8)& 0xFF;
-            $cipherText[4*$k+3]=($x[35-$k])& 0xFF;
+        for ($k = 0; $k < 4; $k++) {
+            $cipherText[4 * $k] = ($x[35 - $k] >> 24) & 0xFF;
+            $cipherText[4 * $k + 1] = ($x[35 - $k] >> 16) & 0xFF;
+            $cipherText[4 * $k + 2] = ($x[35 - $k] >> 8) & 0xFF;
+            $cipherText[4 * $k + 3] = ($x[35 - $k]) & 0xFF;
         }
 
         return $this->bytesToString($cipherText);
@@ -177,7 +178,7 @@ class LakalaSM4
 
     private function sm4Rotl32($buf, $n)
     {
-        return (($buf << $n) & 0xffffffff) | ($buf >> (32-$n));
+        return (($buf << $n) & 0xffffffff) | ($buf >> (32 - $n));
     }
 
     private function sm4KeySchedule($key)
@@ -186,16 +187,16 @@ class LakalaSM4
         $key = array_values(unpack("C*", $key));
 
         $k = [];
-        for ($i=0; $i<4; $i++) {
-            $k[$i] = self::SM4_FK[$i]^(($key[4*$i]<<24) | ($key[4*$i+1]<<16) |($key[4*$i+2]<<8) | ($key[4*$i+3]));
+        for ($i = 0; $i < 4; $i++) {
+            $k[$i] = self::SM4_FK[$i] ^ (($key[4 * $i] << 24) | ($key[4 * $i + 1] << 16) | ($key[4 * $i + 2] << 8) | ($key[4 * $i + 3]));
         }
 
-        for ($j=0; $j<32; $j++) {
-            $tmp = $k[$j+1]^$k[$j+2]^$k[$j+3]^ self::SM4_CK[$j];
-            $buf = (self::SM4_SBOX[($tmp >> 24) & 0xFF]) << 24 |(self::SM4_SBOX[($tmp >> 16) & 0xFF]) << 16 |(self::SM4_SBOX[($tmp >> 8) & 0xFF]) << 8 |(self::SM4_SBOX[$tmp & 0xFF]);
+        for ($j = 0; $j < 32; $j++) {
+            $tmp = $k[$j + 1] ^ $k[$j + 2] ^ $k[$j + 3] ^ self::SM4_CK[$j];
+            $buf = (self::SM4_SBOX[($tmp >> 24) & 0xFF]) << 24 | (self::SM4_SBOX[($tmp >> 16) & 0xFF]) << 16 | (self::SM4_SBOX[($tmp >> 8) & 0xFF]) << 8 | (self::SM4_SBOX[$tmp & 0xFF]);
 
-            $k[$j+4]=$k[$j]^(($buf)^($this->sm4Rotl32(($buf), 13))^($this->sm4Rotl32(($buf), 23)));
-            $this->_rk[$j]=$k[$j+4];
+            $k[$j + 4] = $k[$j] ^ (($buf) ^ ($this->sm4Rotl32(($buf), 13)) ^ ($this->sm4Rotl32(($buf), 23)));
+            $this->_rk[$j] = $k[$j + 4];
         }
     }
 }

+ 5 - 4
src/PaymentProvider.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\Lakala;
@@ -19,6 +20,7 @@ use SixShop\Payment\Enum\PaymentBizEnum;
 use SixShop\Payment\Enum\PaymentStatusEnum;
 use SixShop\Payment\Event\PaymentSuccessEvent;
 use think\facade\Event;
+
 use function SixShop\Core\throw_logic_exception;
 
 class PaymentProvider implements PaymentProviderInterface
@@ -26,8 +28,7 @@ class PaymentProvider implements PaymentProviderInterface
     public function __construct(
         private readonly Config $config,
         private readonly ExtensionPaymentEntity $extensionPaymentEntity,
-    )
-    {
+    ) {
     }
 
     #[\Override] public function create(array $order, PaymentBizEnum $bizType): PaymentResponse
@@ -47,7 +48,7 @@ class PaymentProvider implements PaymentProviderInterface
             //订单已撤销请重新下单
             // 订单支付中请稍后再试
             // 订单支付失败请重新下单
-            throw new  \RuntimeException('开发测试中,请稍后再试');
+            throw new \RuntimeException('开发测试中,请稍后再试');
         }
         $payment->transaction(function () use ($bizType, $order, $payment) {
             $randomDiscount = mt_rand(0, intval($this->config->random_discount_max * 100)) / 100;
@@ -153,4 +154,4 @@ class PaymentProvider implements PaymentProviderInterface
             accBusiFields: $accBusiFields,
         );
     }
-}
+}

+ 5 - 2
src/Service/LaepIndustryService.php

@@ -1,10 +1,13 @@
 <?php
+
 declare(strict_types=1);
+
 namespace SixShop\Lakala\Service;
 
 use SixShop\Lakala\Config;
 use SixShop\Lakala\OpenAPISDK\V2\Api\V2LakalaApi;
 use SixShop\Lakala\OpenAPISDK\V2\Model\V2ModelRequest;
+
 use function SixShop\Core\throw_logic_exception;
 
 class LaepIndustryService
@@ -28,7 +31,7 @@ class LaepIndustryService
         $request = new V2ModelRequest();
         $reqData = [
             'orgNo' => $this->config->org_code,
-            'merchantNo' => $merchantNo?:$this->config->merchant_no,
+            'merchantNo' => $merchantNo ?: $this->config->merchant_no,
             'payType' => $payType,
         ];
         $request->setReqData($reqData);
@@ -86,4 +89,4 @@ class LaepIndustryService
         return $response->getRetCode() == '000000';
     }
 
-}
+}

+ 8 - 6
src/Service/LedgerService.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\Lakala\Service;
@@ -7,6 +8,7 @@ use SixShop\Lakala\Config;
 use SixShop\Lakala\OpenAPISDK\V2\Api\V2LakalaApi;
 use SixShop\Lakala\OpenAPISDK\V2\Model\V2ModelRequest;
 use SixShop\Payment\Enum\NumberBizEnum;
+
 use function SixShop\Core\throw_logic_exception;
 
 /**
@@ -26,7 +28,7 @@ class LedgerService
      *
      * @link https://o.lakala.com/#/home/document/detail?id=382
      */
-    public function applyLedgerReceiver(array $reqData, string $version = '1.0'):object
+    public function applyLedgerReceiver(array $reqData, string $version = '1.0'): object
     {
         $request = new V2ModelRequest();
         $reqData['version'] = $version;
@@ -103,7 +105,7 @@ class LedgerService
      * @param string $version
      * @link https://o.lakala.com/#/home/document/detail?id=386
      */
-    public  function applyBind(array $reqData, string $version = '1.0'): object
+    public function applyBind(array $reqData, string $version = '1.0'): object
     {
         $request = new V2ModelRequest();
         $reqData['version'] = $version;
@@ -127,7 +129,7 @@ class LedgerService
      *
      * @link https://o.lakala.com/#/home/document/detail?id=939
      */
-    public function queryBindApplyList(array $reqData, int $pageNum = 1, int $pageSize = 10, string $version = '1.0'):object
+    public function queryBindApplyList(array $reqData, int $pageNum = 1, int $pageSize = 10, string $version = '1.0'): object
     {
         $request = new V2ModelRequest();
         $reqData = array_merge($reqData, [
@@ -154,7 +156,7 @@ class LedgerService
      *
      * @link https://o.lakala.com/#/home/document/detail?id=381
      */
-    public function queryLedgerMer(string $merchantNo, string $orgCode = '1', string $version = '1.0'):object
+    public function queryLedgerMer(string $merchantNo, string $orgCode = '1', string $version = '1.0'): object
     {
         $request = new V2ModelRequest();
         $request->setReqData([
@@ -180,7 +182,7 @@ class LedgerService
      *
      * @link https://o.lakala.com/#/home/document/detail?id=336
      */
-    public function settle(array $reqData):bool
+    public function settle(array $reqData): bool
     {
         $request = new V2ModelRequest();
         $request->setReqData($reqData);
@@ -195,4 +197,4 @@ class LedgerService
             );
         }
     }
-}
+}

+ 5 - 3
src/Service/MMSService.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\Lakala\Service;
@@ -7,6 +8,7 @@ use SixShop\Lakala\Config;
 use SixShop\Lakala\Enum\UploadFileTypeEnum;
 use SixShop\Lakala\OpenAPISDK\V2\Api\V2LakalaApi;
 use SixShop\Lakala\OpenAPISDK\V2\Model\V2ModelRequest;
+
 use function SixShop\Core\throw_logic_exception;
 
 class MMSService
@@ -27,7 +29,7 @@ class MMSService
      * @param string $version 接口版本号 默认1.0
      * @link https://o.lakala.com/#/home/document/detail?id=179
      */
-    public function cardBin(string $orderNo, string $cardNo,string $orgCode = '1',  string $version = '1.0'):object
+    public function cardBin(string $orderNo, string $cardNo, string $orgCode = '1', string $version = '1.0'): object
     {
         $request = new V2ModelRequest();
         $request->setReqData([
@@ -65,7 +67,7 @@ class MMSService
      *
      * @link https://o.lakala.com/#/home/document/detail?id=90
      */
-    public function uploadFile(string $orderNo, UploadFileTypeEnum $attType, string $attExtName, string $fileContent, string $orgCode = '1',  string $version = '1.0')
+    public function uploadFile(string $orderNo, UploadFileTypeEnum $attType, string $attExtName, string $fileContent, string $orgCode = '1', string $version = '1.0')
     {
         $request = new V2ModelRequest();
         $attContext = base64_encode($fileContent);
@@ -89,4 +91,4 @@ class MMSService
             );
         }
     }
-}
+}

+ 4 - 1
src/Service/NotifyService.php

@@ -1,5 +1,7 @@
 <?php
+
 declare(strict_types=1);
+
 namespace SixShop\Lakala\Service;
 
 use SixShop\Lakala\Config;
@@ -8,6 +10,7 @@ use SixShop\Lakala\OpenAPISDK\V3\Api\LakalaNotifyApi;
 use SixShop\Lakala\PaymentProvider;
 use SixShop\Payment\Enum\PaymentStatusEnum;
 use SixShop\Payment\Model\ExtensionPaymentModel;
+
 use function SixShop\Core\throw_logic_exception;
 
 class NotifyService
@@ -46,4 +49,4 @@ class NotifyService
         $this->paymentProvider->query($payment->id);
         $this->log->debug('lakala notified success {transaction_id}', ['transaction_id' => $payment->transaction_id]);
     }
-}
+}

+ 8 - 8
src/Service/PaymentRecordService.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\Lakala\Service;
@@ -22,8 +23,7 @@ class PaymentRecordService
     public function __construct(
         private ExpressService $expressService,
         private TransactionService $transactionService,
-    )
-    {
+    ) {
     }
 
     public function getTradeOrderList(array $params, array $pageAndLimit): Paginator
@@ -172,7 +172,7 @@ class PaymentRecordService
         }
     }
 
-    public function closeOrder(int $paymentID):void
+    public function closeOrder(int $paymentID): void
     {
         $payment = ExtensionPaymentModel::find($paymentID);
         $resData = $this->transactionService->queryTrade(
@@ -184,14 +184,14 @@ class PaymentRecordService
             $payment->status_desc = $resData->trade_state_desc;
             $payment->payment_result = $resData;
             $order = Order::findOrEmpty($payment->order_id);
-            Db::transaction(function () use ($payment,$order) {
-               $payment->save();
-               $order->isEmpty() || $order->delete();
+            Db::transaction(function () use ($payment, $order) {
+                $payment->save();
+                $order->isEmpty() || $order->delete();
             });
         }
     }
 
-    public function getTradeOrderStats():array
+    public function getTradeOrderStats(): array
     {
         $stats = ExtensionPaymentModel::alias('p')
             ->leftJoin('lakala_wechat_payment wp', 'p.id = wp.payment_id')
@@ -206,4 +206,4 @@ class PaymentRecordService
         ];
 
     }
-}
+}

+ 3 - 2
src/Service/SACSService.php

@@ -1,12 +1,13 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\Lakala\Service;
 
 use SixShop\Lakala\Config;
-use SixShop\Lakala\OpenAPISDK\V2\Api\V2LakalaApi;
 use SixShop\Lakala\OpenAPISDK\V3\Api\LakalaApi;
 use SixShop\Lakala\OpenAPISDK\V3\Model\ModelRequest;
+
 use function SixShop\Core\throw_logic_exception;
 
 class SACSService
@@ -71,4 +72,4 @@ class SACSService
             );
         }
     }
-}
+}

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov