From 7bdceae6281a7175d89c44ab11ec3ea19eaa4933 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Fri, 26 Jan 2024 11:48:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/Open.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controller/api/Open.php b/app/controller/api/Open.php
index 27b4809f..e2f7a37e 100755
--- a/app/controller/api/Open.php
+++ b/app/controller/api/Open.php
@@ -4,6 +4,7 @@ namespace app\controller\api;
 
 use app\common\dao\store\consumption\CommissionDao;
 use crmeb\basic\BaseController;
+use think\facade\Log;
 
 class Open extends BaseController
 {
@@ -19,6 +20,7 @@ class Open extends BaseController
     {
         $timestamp = $this->request->post('timestamp');
         $data = $this->request->post('data');
+        Log::error('供销平台佣金回调：' . $data);
         $aes = new \AES();
         $iv = !empty($timestamp) ? $aes->buildIv($timestamp) : '';
         $decrypted = $aes->decrypt($data, $iv);

From fe119cf1a14e09a3e1edf2b96b0dead577f50e97 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Fri, 26 Jan 2024 12:03:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=A3=E9=87=91?=
 =?UTF-8?q?=E5=86=99=E5=85=A5=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/store/consumption/CommissionDao.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/common/dao/store/consumption/CommissionDao.php b/app/common/dao/store/consumption/CommissionDao.php
index afba4b43..aa2bea0f 100755
--- a/app/common/dao/store/consumption/CommissionDao.php
+++ b/app/common/dao/store/consumption/CommissionDao.php
@@ -142,11 +142,11 @@ class CommissionDao
         $timestamp = time();
         $json = ['timestamp' => $timestamp, 'data' => ['order_id' => $order['order_id'], 'order_sn' => $order['order_sn'], 'order_money' => bcmul($order['pay_price'], 100), 'promotion_code' => $promotionCode]];
         if ($type == 3) {
-            $json['street_code'] = $promotionCode;
+            $json['data']['street_code'] = $promotionCode;
         } elseif ($type == 4) {
-            $json['courier_phone'] = $promotionCode;
+            $json['data']['courier_phone'] = $promotionCode;
         } else {
-            $json['promotion_code'] = $promotionCode;
+            $json['data']['promotion_code'] = $promotionCode;
         }
         $aes = new \AES();
         $iv = $aes->buildIv($timestamp);