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-09-04 17:55:15 +08:00
parent da8125ca0e
commit 90b2fde000
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -516,7 +516,7 @@ class OrderLogic extends LogicBase
$type = $post['type'] ?? ''; $type = $post['type'] ?? '';
$order_source = $post['client']; $order_source = $post['client'];
$goods_lists = $data['goods_lists']; $goods_lists = $data['goods_lists'];
$user_address = $data['address']; // $user_address = $data['address'];
$user = User::find($user_id); $user = User::find($user_id);
// if ($post['delivery_type'] != CommonOrder::DELIVERY_STATUS_SELF && empty($data['address'])) { // if ($post['delivery_type'] != CommonOrder::DELIVERY_STATUS_SELF && empty($data['address'])) {
@ -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,$post, $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);
@ -694,12 +694,12 @@ class OrderLogic extends LogicBase
'order_sn' => createSn('order', 'order_sn', '', 4), 'order_sn' => createSn('order', 'order_sn', '', 4),
'user_id' => $user_id, 'user_id' => $user_id,
'order_source' => $order_source, 'order_source' => $order_source,
'consignee' => $user_address['contact'], // 'consignee' => $user_address['contact'],
'province' => $user_address['province_id'], // 'province' => $user_address['province_id'],
'city' => $user_address['city_id'], // 'city' => $user_address['city_id'],
'district' => $user_address['district_id'], // 'district' => $user_address['district_id'],
'address' => $user_address['address'], // 'address' => $user_address['address'],
'mobile' => $user_address['telephone'], // 'mobile' => $user_address['telephone'],
'goods_price' => $data['total_goods_price'], 'goods_price' => $data['total_goods_price'],
'order_amount' => $data['order_amount'],//应付金额 'order_amount' => $data['order_amount'],//应付金额
'total_amount' => $data['total_amount'],//订单总金额 'total_amount' => $data['total_amount'],//订单总金额