mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#136) from dev into master

Browse Source 
Reviewed-on: #136
This commit is contained in:
mkm 2024-01-26 12:03:45 +08:00
commit f7d392381e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/common/dao/store/consumption/CommissionDao.php
View File

@ -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);

2
app/controller/api/Open.php
View File

@ -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);