xucong/jianbing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.提交缺失的东西

Browse Source
This commit is contained in:
xucong
2025-05-17 14:56:52 +08:00
parent f56fd5fd20
commit 08688a1443
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/api/logic/OrderLogic.php
View File

@ -611,7 +611,7 @@ class OrderLogic extends LogicBase
'consignee'=>($post['delivery_type'] == CommonOrder::DELIVERY_STATUS_SELF) ? $post['consignee'] : '', 'consignee'=>($post['delivery_type'] == CommonOrder::DELIVERY_STATUS_SELF) ? $post['consignee'] : '',
'mobile'=>($post['delivery_type'] == CommonOrder::DELIVERY_STATUS_SELF) ? $post['mobile'] : '' 'mobile'=>($post['delivery_type'] == CommonOrder::DELIVERY_STATUS_SELF) ? $post['mobile'] : ''
]; ];
$order = self::addOrder($user_id, $data, $order_source, $user_address, $extra); $order = self::addOrder($user_id, $data,$post, $order_source, $user_address, $extra);
$order_id = $order['order_id']; $order_id = $order['order_id'];
self::addOrderGoods($order_id, $goods_lists); self::addOrderGoods($order_id, $goods_lists);
self::addOrderAfter($order_id, $user_id, $type, $data); self::addOrderAfter($order_id, $user_id, $type, $data);
@ -648,7 +648,7 @@ class OrderLogic extends LogicBase
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException * @throws \think\exception\DbException
*/ */
public static function addOrder($user_id, $data, $order_source, $user_address, $extra = []) public static function addOrder($user_id, $data, $order_source,$post, $user_address, $extra = [])
{ {
$growth_ratio = ConfigServer::get('trading', 'growth_ratio', 0); $growth_ratio = ConfigServer::get('trading', 'growth_ratio', 0);
$give_growth_num = $growth_ratio > 0 ? ($data['order_amount'] / $growth_ratio) : 0; $give_growth_num = $growth_ratio > 0 ? ($data['order_amount'] / $growth_ratio) : 0;
@ -679,8 +679,8 @@ class OrderLogic extends LogicBase
'pay_way' => $data['pay_way'], 'pay_way' => $data['pay_way'],
'integral_amount' => $data['integral_amount'] ?? 0, 'integral_amount' => $data['integral_amount'] ?? 0,
'use_integral' => $data['user_use_integral'], 'use_integral' => $data['user_use_integral'],
'time_id' => $data['time_id'], 'time_id' => $post['time_id'],
'day' => $data['day'], 'day' => $post['date'],
'team_id' => $extra['team_id'] ?? 0, 'team_id' => $extra['team_id'] ?? 0,
'team_found_id' => $extra['found_id'] ?? 0, 'team_found_id' => $extra['found_id'] ?? 0,
'attach_values' => json_encode($attach_values, JSON_UNESCAPED_UNICODE), 'attach_values' => json_encode($attach_values, JSON_UNESCAPED_UNICODE),
@ -711,8 +711,8 @@ class OrderLogic extends LogicBase
'pay_way' => $data['pay_way'], 'pay_way' => $data['pay_way'],
'integral_amount' => $data['integral_amount'] ?? 0, 'integral_amount' => $data['integral_amount'] ?? 0,
'use_integral' => $data['user_use_integral'], 'use_integral' => $data['user_use_integral'],
'time_id' => $data['time_id'], 'time_id' => $post['time_id'],
'day' => $data['day'], 'day' => $post['date'],
'team_id' => $extra['team_id'] ?? 0, 'team_id' => $extra['team_id'] ?? 0,
'team_found_id' => $extra['found_id'] ?? 0, 'team_found_id' => $extra['found_id'] ?? 0,
'attach_values' => json_encode($attach_values, JSON_UNESCAPED_UNICODE), 'attach_values' => json_encode($attach_values, JSON_UNESCAPED_UNICODE),