mkm/shop-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改对公转账下单逻辑

Browse Source
This commit is contained in:
liu 2024-03-16 13:38:02 +08:00
parent 7130e4741c
commit 34265487a8
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/common/Enum.php
View File

@ -21,6 +21,7 @@ class Enum
/** 购物车下单支付**/ /** 购物车下单支付**/
const public = 10;//对公账户 const public = 10;//对公账户
const public_string = 'public';//对公账户
/** 订单状态 **/ /** 订单状态 **/
const STATUS_WAIT_DELIVERY = 0;//待发货 const STATUS_WAIT_DELIVERY = 0;//待发货

9
app/controller/api/store/order/StoreOrder.php
View File

@ -14,6 +14,7 @@
namespace app\controller\api\store\order; namespace app\controller\api\store\order;
use app\common\Enum;
use app\common\repositories\delivery\DeliveryOrderRepository; use app\common\repositories\delivery\DeliveryOrderRepository;
use app\common\repositories\store\order\StoreOrderCreateRepository; use app\common\repositories\store\order\StoreOrderCreateRepository;
use app\common\repositories\store\order\StoreOrderReceiptRepository; use app\common\repositories\store\order\StoreOrderReceiptRepository;
@ -111,12 +112,16 @@ class StoreOrder extends BaseController
return $orderCreateRepository->v2CreateOrder($key, array_search($payType, StoreOrderRepository::PAY_TYPE), $this->request->userInfo(), $cartId, $extend, $mark, $receipt_data, $takes, $couponIds, $useIntegral, $addressId, $post); return $orderCreateRepository->v2CreateOrder($key, array_search($payType, StoreOrderRepository::PAY_TYPE), $this->request->userInfo(), $cartId, $extend, $mark, $receipt_data, $takes, $couponIds, $useIntegral, $addressId, $post);
}); });
if ($isPc) {
return app('json')->success(['order_id' => $groupOrder]);
}
if ($groupOrder['pay_price'] == 0) { if ($groupOrder['pay_price'] == 0) {
$this->repository->paySuccess($groupOrder); $this->repository->paySuccess($groupOrder);
return app('json')->status('success', '支付成功', ['order_id' => $groupOrder['group_order_id']]); return app('json')->status('success', '支付成功', ['order_id' => $groupOrder['group_order_id']]);
} }
if ($isPc) { if ($payType == Enum::public_string) { //如果是对公转账
return app('json')->success(['order_id' => $groupOrder->group_order_id]); return app('json')->success(['order_id' => $groupOrder]);
} }
try { try {
return $this->repository->pay($payType, $this->request->userInfo(), $groupOrder, $this->request->param('return_url'), $this->request->isApp()); return $this->repository->pay($payType, $this->request->userInfo(), $groupOrder, $this->request->param('return_url'), $this->request->isApp());