github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2025-12-11 18:32:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

【程序目录】优化支付宝

Browse Source
This commit is contained in:
吴昊天 2024-06-28 14:25:39 +08:00
parent 2415bb7b7d
commit 389ffd2b2d
6 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crmeb/app/adminapi/controller/v1/marketing/StoreBargain.php
View File

@ -183,7 +183,7 @@ class StoreBargain extends AuthController
{ {
/** @var StoreBargainUserHelpServices $bargainUserHelpService */ /** @var StoreBargainUserHelpServices $bargainUserHelpService */
$bargainUserHelpService = app()->make(StoreBargainUserHelpServices::class); $bargainUserHelpService = app()->make(StoreBargainUserHelpServices::class);
$list = $bargainUserHelpService->getHelpList($id); $list = $bargainUserHelpService->getHelpList((int)$id);
return app('json')->success(compact('list')); return app('json')->success(compact('list'));
} }

4
crmeb/app/api/controller/v1/activity/StoreBargainController.php
View File

@ -118,7 +118,7 @@ class StoreBargainController
['bargainId', 0], ['bargainId', 0],
['bargainUserUid', 0] ['bargainUserUid', 0]
], true); ], true);
return app('json')->success($this->services->setHelpBargain($request->uid(), $bargainId, $bargainUserUid)); return app('json')->success($this->services->setHelpBargain($request->uid(), (int)$bargainId, (int)$bargainUserUid));
} }
/** /**
@ -139,7 +139,7 @@ class StoreBargainController
/** @var StoreBargainUserHelpServices $bargainUserHelp */ /** @var StoreBargainUserHelpServices $bargainUserHelp */
$bargainUserHelp = app()->make(StoreBargainUserHelpServices::class); $bargainUserHelp = app()->make(StoreBargainUserHelpServices::class);
[$page, $limit] = $this->services->getPageValue(); [$page, $limit] = $this->services->getPageValue();
$storeBargainUserHelp = $bargainUserHelp->getHelpList($bargainUserTableId, $page, $limit); $storeBargainUserHelp = $bargainUserHelp->getHelpList((int)$bargainUserTableId, $page, $limit);
return app('json')->success($storeBargainUserHelp); return app('json')->success($storeBargainUserHelp);
} }

2
crmeb/app/api/controller/v1/store/StoreProductController.php
View File

@ -55,7 +55,7 @@ class StoreProductController
['priceOrder', ''], ['priceOrder', ''],
['salesOrder', ''], ['salesOrder', ''],
[['news', 'd'], 0, '', 'is_new'], [['news', 'd'], 0, '', 'is_new'],
[['type', 0], 0], [['type', 'd'], 0],
['ids', ''], ['ids', ''],
[['selectId', 'd'], 0], [['selectId', 'd'], 0],
[['productId', 'd'], 0], [['productId', 'd'], 0],

5
crmeb/app/services/pay/OrderPayServices.php
View File

@ -140,6 +140,11 @@ class OrderPayServices
$options['wechat'] = $wechat; $options['wechat'] = $wechat;
} }
break; break;
case PayServices::ALIAPY_PAY:
if ($wechat) {
$options['returnUrl'] = sys_config('site_url') . '/pages/goods/order_pay_status/index?order_id=' . $orderInfo['order_id'];
}
break;
} }

6
crmeb/crmeb/services/AliPayService.php
View File

@ -123,11 +123,11 @@ class AliPayService
* @param string $totalAmount 支付金额 * @param string $totalAmount 支付金额
* @param string $passbackParams 备注 * @param string $passbackParams 备注
* @param string $quitUrl 同步跳转地址 * @param string $quitUrl 同步跳转地址
* @param string $siteUrl * @param string $returnUrl
* @param bool $isCode * @param bool $isCode
* @return AlipayTradeWapPayResponse * @return AlipayTradeWapPayResponse
*/ */
public function create(string $title, string $orderId, string $totalAmount, string $passbackParams, string $quitUrl = '', string $siteUrl = '', bool $isCode = false) public function create(string $title, string $orderId, string $totalAmount, string $passbackParams, string $quitUrl = '', string $returnUrl = '', bool $isCode = false)
{ {
$title = trim($title); $title = trim($title);
try { try {
@ -139,7 +139,7 @@ class AliPayService
$result = Factory::payment()->app()->optional('passback_params', $passbackParams)->pay($title, $orderId, $totalAmount); $result = Factory::payment()->app()->optional('passback_params', $passbackParams)->pay($title, $orderId, $totalAmount);
} else { } else {
//h5支付 //h5支付
$result = Factory::payment()->wap()->optional('passback_params', $passbackParams)->pay($title, $orderId, $totalAmount, $quitUrl, $siteUrl); $result = Factory::payment()->wap()->optional('passback_params', $passbackParams)->pay($title, $orderId, $totalAmount, $quitUrl, $returnUrl);
} }
if ($this->response->success($result)) { if ($this->response->success($result)) {
return $result->body ?? $result; return $result->body ?? $result;

2
crmeb/crmeb/services/pay/storage/AliPay.php
View File

@ -50,7 +50,7 @@ class AliPay extends BasePay implements PayInterface
$code = true; $code = true;
} }
return AliPayService::instance()->create($body, $orderId, $totalFee, $attach, $options['quitUrl'] ?? '', $options['siteUrl'] ?? '', $code); return AliPayService::instance()->create($body, $orderId, $totalFee, $attach, $options['quitUrl'] ?? '', $options['returnUrl'] ?? '', $code);
} }
/** /**