diff --git a/addon/futures/api/controller/Ordercreate.php b/addon/futures/api/controller/Ordercreate.php index ebb0f9b1..6c53fd95 100644 --- a/addon/futures/api/controller/Ordercreate.php +++ b/addon/futures/api/controller/Ordercreate.php @@ -144,4 +144,13 @@ class Ordercreate extends BaseApi return $this->response($res); } + public function memberAddress(){ + $token = $this->checkToken(); + if ($token[ 'code' ] < 0) return $this->response($token); + $order_create = new OrderCreateModel(); + $data['member_id'] = $this->member_id; + $res = $order_create->initMemberAddress($data); + return $this->response($res); + } + } \ No newline at end of file diff --git a/addon/futures/model/Futures.php b/addon/futures/model/Futures.php index 903d5c57..83a4c4c8 100644 --- a/addon/futures/model/Futures.php +++ b/addon/futures/model/Futures.php @@ -187,13 +187,37 @@ class Futures extends BaseModel{ if(empty($date) || $date['status'] !== 1){ return $this->error($date,'提货失败'); } + $member_address = input( 'member_address', []); + $member_address = isset($member_address) && !empty($member_address) ? json_decode($member_address, true) : []; + if(empty($member_address)){ + return $this->error($date,'提货失败-无收获地址'); + } if(!Cache::store('redis_concurrent')->delete('addon_futures_stock_'.$id)){ return $this->error('','提货失败'); } + model('futures')->update([ 'status' => 5, ], [['id', '=', $id]]); + + $order_info = [ + 'name' => $member_address[ 'name' ] ?? '', + 'mobile' => $member_address[ 'mobile' ] ?? '', + 'telephone' => $member_address[ 'telephone' ] ?? '', + 'province_id' => $member_address[ 'province_id' ] ?? '', + 'city_id' => $member_address[ 'city_id' ] ?? '', + 'district_id' => $member_address[ 'district_id' ] ?? '', + 'community_id' => $member_address[ 'community_id' ] ?? '', + 'address' => $member_address[ 'address' ] ?? '', + 'full_address' => $member_address[ 'full_address' ] ?? '', + 'longitude' => $member_address[ 'longitude' ] ?? '', + 'latitude' => $member_address[ 'latitude' ] ?? '', + 'promotion_type' => 'futures_tihuo', + ]; + + model('order')->update($order_info,[['order_id', '=', $date['order_id']]]); + $basics = $this->getBasicsConfig($date['site_id'])[ 'data' ][ 'value' ]; // 提货用来减少用户买入限制 Db::name('futures_user')