dxtc
/
coupon-admin
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: dxtc:5a3a864c410c255ce0e05c44077e02841dcc7875
Branches Tags
dxtc:master
..
compare: dxtc:6f6e4571dbde414f28a9bdc67291e22fbbc89d02
Branches Tags
dxtc:master

No commits in common. "5a3a864c410c255ce0e05c44077e02841dcc7875" and "6f6e4571dbde414f28a9bdc67291e22fbbc89d02" have entirely different histories.
5a3a864c41 ... 6f6e4571db

1 changed files with 6 additions and 16 deletions
Show Stats Expand all files Collapse all files

22
app/controller/api/Coupon.php
View File

@ -565,12 +565,7 @@ class Coupon extends Base
//企业付款成功 //企业付款成功
if(isset($result["status"]) && $result["status"]=="SUCCESS"){ if(isset($result["status"]) && $result["status"]=="SUCCESS"){
Db::commit(); Db::commit();
return $this->json( return $this->json(0,"优惠券签到使用成功,您获得{$consumerMoney}元红包,已存入您的零钱");
0,
"优惠券签到使用成功,您获得{$consumerMoney}元红包,已存入您的零钱",
[
"redpack" =>$consumerMoney
]);
} }
Log::info("查询企业付款失败:".json_encode($result,JSON_UNESCAPED_UNICODE)); Log::info("查询企业付款失败:".json_encode($result,JSON_UNESCAPED_UNICODE));
}else{ }else{
@ -584,26 +579,21 @@ class Coupon extends Base
'desc' => '验证优惠券签到', 'desc' => '验证优惠券签到',
]; ];
//发起支付 //发起支付
//$result = $payment->transfer->toBalance($toBalanceData); $result = $payment->transfer->toBalance($toBalanceData);
//var_dump($result); //var_dump($result);
//付款成功才提交！！！！！伪装成功 //付款成功才提交！！！！！伪装成功
if(true||isset($result['payment_no']) ){ if(isset($result['payment_no']) ){
Db::commit(); Db::commit();
return $this->json( return $this->json(0,"优惠券签到使用成功,您获得{$consumerMoney}元红包,已存入您的零钱",["redPacket"=>$consumerMoney]);
0,
"优惠券签到使用成功,您获得{$consumerMoney}元红包,已存入您的零钱",
[
"redpack" =>$consumerMoney
]);
} }
Log::info("企业发起付款失败:" . json_encode($result,JSON_UNESCAPED_UNICODE)); Log::info("企业发起付款失败:" . json_encode($result,JSON_UNESCAPED_UNICODE));
} }
//默认回滚 //默认回滚
Db::rollback(); Db::rollback();
return $this->json(5003, "验证失败,发放红包失败"); return $this->json(5001, "验证失败,发放红包失败");
} }
Db::commit(); Db::commit();
return $this->json(); return $this->json();
@ -612,7 +602,7 @@ class Coupon extends Base
Db::rollback(); Db::rollback();
return $this->json(5001, "Repository服务器错误"); return $this->json(5001, "Repository服务器错误");
}catch (\Exception $e){ }catch (\Exception $e){
//echo $e->getMessage(); echo $e->getMessage();
Db::rollback(); Db::rollback();
return $this->json(5002, "服务器错误"); return $this->json(5002, "服务器错误");
} }