mkm/erp_old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2024-05-06 14:51:06 +08:00
parent 8297ad2c54
commit 389bf25799
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/api/controller/order/RetailOrderController.php
View File

@ -15,6 +15,7 @@ use app\common\model\order\Cart;
use app\common\model\retail\Cashierclass; use app\common\model\retail\Cashierclass;
use app\common\model\user\User; use app\common\model\user\User;
use app\common\service\wechat\WeChatConfigService; use app\common\service\wechat\WeChatConfigService;
use support\Log;
class RetailOrderController extends BaseApiController class RetailOrderController extends BaseApiController
{ {
@ -111,7 +112,7 @@ class RetailOrderController extends BaseApiController
$order_id = (int)$this->request->post('order_id'); $order_id = (int)$this->request->post('order_id');
$pay_type = (int)$this->request->post('pay_type'); $pay_type = (int)$this->request->post('pay_type');
$where=[ $where=[
'order_id'=>$order_id, 'id'=>$order_id,
'uid'=>$this->userId, 'uid'=>$this->userId,
'paid'=>0, 'paid'=>0,
]; ];

3
app/common/service/pay/WeChatPayService.php
View File

@ -13,7 +13,7 @@ use app\common\model\user\UserAuth;
use app\common\service\wechat\WeChatConfigService; use app\common\service\wechat\WeChatConfigService;
use EasyWeChat\Pay\Application; use EasyWeChat\Pay\Application;
use EasyWeChat\Pay\Message; use EasyWeChat\Pay\Message;
use support\Log;
/** /**
* 微信支付 * 微信支付
@ -237,6 +237,7 @@ class WeChatPayService extends BasePayService
$server = $this->app->getServer(); $server = $this->app->getServer();
// 支付通知 // 支付通知
$server->handlePaid(function (Message $message) { $server->handlePaid(function (Message $message) {
Log::error($message);
if ($message['trade_state'] === 'SUCCESS') { if ($message['trade_state'] === 'SUCCESS') {
$extra['transaction_id'] = $message['transaction_id']; $extra['transaction_id'] = $message['transaction_id'];
$attach = $message['attach']; $attach = $message['attach'];