admin/liche
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

edit-add_pay_log

Browse Source
This commit is contained in:
lccsw
2021-12-16 09:30:51 +08:00
parent 65a8e017f9
commit 8e02b118e2
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/controllers/receiver/Orders.php
+6 -5
View File
@@ -811,8 +811,6 @@ class Orders extends HD_Controller
$data = [
'o_id' => $row['id'],
'sid' => $sid,
'uid' => $p_row['uid'],
'entrust_uid' => $p_row['entrust_uid'],
'mch_id' => $wx_mchid,
'brand_id' => $row['brand_id'],
's_id' => $row['s_id'],
@@ -825,6 +823,8 @@ class Orders extends HD_Controller
'status' => 0,
'c_time' => time()
];
$p_row['uid'] && $data['uid'] = $p_row['uid'];
$p_row['entrust_uid'] && $data['entrust_uid'] = $p_row['entrust_uid'];
$descrip && $data['descrip'] = $descrip;
if($type==1){ //定金
$data['pid'] = $p_row['id'];
@@ -848,7 +848,6 @@ class Orders extends HD_Controller
return $this->show_json(SYS_CODE_FAIL, '请输入正确尾款金额');
}
}elseif($type==5){
$data['pid'] = $p_row['id'];
$data['status'] = 1;
$data['pay_time'] = $pay_time;
}else{
@@ -858,8 +857,10 @@ class Orders extends HD_Controller
if (!$res) {
return $this->show_json(SYS_CODE_FAIL, '保存失败');
}
$this->load->service('apporder/payment_service', array('app_id' => 1));
$result = $this->payment_service->after_pay_liche($sid,$money,'',$pay_time);
if($type!=5){
$this->load->service('apporder/payment_service', array('app_id' => 1));
$result = $this->payment_service->after_pay_liche($sid,$money,'',$pay_time);
}
return $this->show_json(SYS_CODE_SUCCESS, '保存成功');
}
$ck_row = $this->order_ckcars_model->get(['o_id'=>$id]);
api/controllers/wxapp/liche/Order.php
+2 -1
View File
@@ -126,7 +126,8 @@ class Order extends Wxapp{
$where = [
"(uid = {$uid} or entrust_uid={$uid})" => null,
'pid' => 0,
'status>=' => 0
'status>=' => 0,
'type <>' => 5
];
$oid && $where['o_id'] = $oid;
$total = $this->app_liche_orders_model->count($where);