|
|
@@ -183,28 +183,36 @@ class MobileController extends UserApi
|
|
|
'id_no'=>'require',
|
|
|
'county'=>'require|integer',
|
|
|
'address'=>'require',
|
|
|
- 'pay_type'=>'require|in:1,2,3',
|
|
|
]);
|
|
|
$mobile=Mobile::where('status',0)->findOrFail($data['mobile_id']);
|
|
|
+ if($mobile['type']==1){
|
|
|
+ $this->_validate([
|
|
|
+ 'pay_type'=>'require|in:1,2,3',
|
|
|
+ ]);
|
|
|
+ }
|
|
|
|
|
|
Area::shouldSend($data['county']);
|
|
|
|
|
|
Db::startTrans();
|
|
|
- SmsSend::setMobile($data['phone'])->setCode($data['sms_code']??'')->setEvent('order')->check();
|
|
|
- $order=$data;
|
|
|
- $order['admin_id']=$mobile['proxy_id'];
|
|
|
- $order['no']=$mobile['no'];
|
|
|
- $order['city']=implode(',',Area::getTreeId($data['county']));
|
|
|
- $order['amount_original']=$mobile['amount_original'];
|
|
|
- $order['amount_hd']=$mobile['amount'];
|
|
|
- $order['amount_charge']=$mobile['amount_charge'];
|
|
|
- $order['amount']=$mobile['amount'];
|
|
|
- unset($order['county'],$order['status'],$order['sms_code']);
|
|
|
- $mobileOrder=(new MobileOrder);
|
|
|
+ SmsSend::setMobile($data['phone'])->setCode($data['sms_code'] ?? '')->setEvent('order')->check();
|
|
|
+ $order = $data;
|
|
|
+ $order['admin_id'] = $mobile['proxy_id'];
|
|
|
+ $order['no'] = $mobile['no'];
|
|
|
+ $order['city'] = implode(',', Area::getTreeId($data['county']));
|
|
|
+ $order['amount_original'] = $mobile['amount_original'];
|
|
|
+ $order['amount_hd'] = $mobile['amount'];
|
|
|
+ $order['amount_charge'] = $mobile['amount_charge'];
|
|
|
+ $order['amount'] = $mobile['amount'];
|
|
|
+ $order['type'] = $mobile['type'];
|
|
|
+ unset($order['county'], $order['status'], $order['sms_code']);
|
|
|
+ $mobileOrder = (new MobileOrder);
|
|
|
$mobileOrder->allowField(true)->save($order);
|
|
|
- $succ=$this->pay($mobileOrder,$data);
|
|
|
+ $succ=null;
|
|
|
+ if($mobile['type']==1) {
|
|
|
+ $succ = $this->pay($mobileOrder, $data);
|
|
|
+ }
|
|
|
Db::commit();
|
|
|
- $this->success('',$succ);
|
|
|
+ $this->success('', $succ);
|
|
|
}
|
|
|
protected function pay(MobileOrder $mobileOrder,$data){
|
|
|
$succ=[
|
