|
@@ -12,7 +12,9 @@ declare (strict_types=1);
|
|
|
|
|
|
namespace app\index\controller;
|
|
|
|
|
|
+use app\index\model\Order;
|
|
|
use app\index\model\Order as OrderModel;
|
|
|
+use app\index\model\User as UserModel;
|
|
|
use app\index\service\order\PaySuccess;
|
|
|
use app\index\service\User as UserService;
|
|
|
use app\index\service\Cart as CartService;
|
|
@@ -175,8 +177,8 @@ class Checkout extends Controller
|
|
|
$CartModel->clear($cartIds);
|
|
|
// 构建微信支付请求
|
|
|
$payment = $Checkout->onOrderPayment();
|
|
|
- if ($params['payType'] == OrderPayTypeEnum::POINTS){
|
|
|
- if (!$payment['flag']){
|
|
|
+ if ($params['payType'] == OrderPayTypeEnum::POINTS) {
|
|
|
+ if (!$payment['flag']) {
|
|
|
return $this->renderError($payment['message'] ?? '兑换失败');
|
|
|
}
|
|
|
}
|
|
@@ -194,17 +196,15 @@ class Checkout extends Controller
|
|
|
*/
|
|
|
public function payPayExecutePay($orderNo, $token)
|
|
|
{
|
|
|
- if (empty($orderNo) || empty($token)){
|
|
|
- return view('payError',['notice'=>lang('login success')]);
|
|
|
+ if (empty($orderNo) || empty($token)) {
|
|
|
+ return view('payError', ['notice' => lang('login success')]);
|
|
|
}
|
|
|
|
|
|
$oriToken = Cache::get(PayPal::PRE_STR . $orderNo);
|
|
|
- if ($token != $oriToken){
|
|
|
- return view('payError',['notice'=>lang('login success')]);
|
|
|
+ if ($token != $oriToken) {
|
|
|
+ return view('payError', ['notice' => lang('login success')]);
|
|
|
}
|
|
|
|
|
|
- //dd($orderNo);
|
|
|
- //$paymentId = 'PAYID-MXUYFIQ9KF846046B114514M';
|
|
|
$paymentId = $this->request->param('paymentId');
|
|
|
//$token = $this->request->param('token');
|
|
|
//$PayerID = $this->request->param('PayerID');
|
|
@@ -216,11 +216,25 @@ class Checkout extends Controller
|
|
|
$orderModel = new PaySuccess($orderNo);
|
|
|
$status = $orderModel->onPaySuccess(OrderPayTypeEnum::PAYPAL, ['transaction_id' => $paymentId]);
|
|
|
if (!$status) {
|
|
|
- return view('payError',['notice'=>lang('login success')]);
|
|
|
+ return view('payError', ['notice' => lang('login success')]);
|
|
|
}
|
|
|
Cache::delete(PayPal::PRE_STR . $orderNo);
|
|
|
}
|
|
|
- return view('paySuccessful',['notice'=>lang('login success')]);
|
|
|
+ //todo 等会测试
|
|
|
+/* $order = Order::detail(['order_no' => $orderNo]);
|
|
|
+ //如果有分享人,给分享人送积分
|
|
|
+ if (isset($order['user_id'])) {
|
|
|
+ $key = Cache::get(UserModel::SHARE_PREFIX . $order['user_id']);
|
|
|
+ if (!empty($key)) {
|
|
|
+ $fromUserId = decrypt($key);
|
|
|
+
|
|
|
+ $describe = "好友消费赠送的积分";
|
|
|
+ $payPoints = intval(bcmul($order['pay_price'], '100', 0));
|
|
|
+ UserModel::setIncPoints(intval($fromUserId), -$payPoints, $describe);
|
|
|
+ }
|
|
|
+ }*/
|
|
|
+
|
|
|
+ return view('paySuccessful', ['notice' => lang('login success')]);
|
|
|
}
|
|
|
|
|
|
/**
|