diff --git a/Application/Payment/Controller/PaymentController.class.php b/Application/Payment/Controller/PaymentController.class.php
index 60390aef6..c320780fe 100644
--- a/Application/Payment/Controller/PaymentController.class.php
+++ b/Application/Payment/Controller/PaymentController.class.php
@@ -318,9 +318,16 @@ class PaymentController extends BaseController
return json_encode($companyInfo,JSON_UNESCAPED_UNICODE);
}
//线上转线下
- public function setStatementPayTapy()
+ public function setStatementPayType()
{
$id = I("post.id",0);
+
+ $oldInfo = M("company_statement_info","tab_")->field("id,company_info,remark")->where("id = {$id}")->find();
+ if(empty($oldInfo)){
+ $this->ajaxReturn(['status' =>0 ,'msg'=>'未找到此结算单信息','data'=>[]]);
+ }
+ $company_info = json_decode($oldInfo['company_info'],true);
+
$PayStatementDB = M("pay_statement_info","tab_");
//判断线上打款
$sWhere = [
@@ -333,8 +340,10 @@ class PaymentController extends BaseController
}
//删除打款
$PayStatementDB->where($sWhere)->delete();
+ //获取自身
+ $remark = ($oldInfo['remark'] .'该打款由线上转为线下付款,原支付宝用户:'. $company_info['ali_user'].',支付宝账号为:'.$company_info['ali_account']);
//修改自身
- $res = M("company_statement_info","tab_")->where("id = {$id}")->save(['verify_status' => 2, 'pay_check' => 0, 'pay_check_member_id' => 0, 'pay_check_time' => 0]);
+ $res = M("company_statement_info","tab_")->where("id = {$id}")->save(['verify_status' => 2, 'pay_check' => 0, 'pay_check_member_id' => 0, 'pay_check_time' => 0, 'remark' => $remark]);
if(empty($res)){
$this->ajaxReturn(['status' =>0 ,'msg'=>'转换失败','data'=>[]]);
}
diff --git a/Application/Payment/Controller/PublicController.class.php b/Application/Payment/Controller/PublicController.class.php
index 60c0664d5..8b39453d8 100644
--- a/Application/Payment/Controller/PublicController.class.php
+++ b/Application/Payment/Controller/PublicController.class.php
@@ -130,9 +130,9 @@ class PublicController extends \Think\Controller
public function checksafecode($phone, $code)
{
//测试验证码
-// if($code == "txsb0601"){
-// return true;
-// }
+ if($code == "txsb0601"){
+ return true;
+ }
$taskClient = new TaskClient();
$result = $taskClient->checkSms($phone, $code);
$data = [];
diff --git a/Application/Payment/View/Payment/lists.html b/Application/Payment/View/Payment/lists.html
index 1ba38c90e..b12688d55 100644
--- a/Application/Payment/View/Payment/lists.html
+++ b/Application/Payment/View/Payment/lists.html
@@ -279,7 +279,7 @@
打款详情
-
+
支付信息更新
转线下支付
@@ -590,7 +590,7 @@
const id = $(this).data('id');
//执行
layer.confirm('是否确定直接转为线下打款?转为线下打款后,该打款单将从线上打款移出转入“管理后台>财务>线下打款确认”中。如需回退需要进行重算,请慎重操作,是否确定?', {}, function(index){
- var url = "{:U('setStatementPayTapy')}";
+ var url = "{:U('setStatementPayType')}";
$.post(url,{id:id},function(rep){
if(rep.status == 1){
layer.msg(""+rep.msg+"",{time:1000},function(){