修复错误

This commit is contained in:
mkm 2023-04-15 10:20:31 +08:00
parent 9771eb8f2a
commit b15b790655
2 changed files with 20 additions and 4 deletions

View File

@ -19,6 +19,7 @@ use app\common\repositories\store\product\ProductRepository;
use crmeb\basic\BaseController; use crmeb\basic\BaseController;
use app\common\repositories\store\order\StoreOrderRepository; use app\common\repositories\store\order\StoreOrderRepository;
use crmeb\services\LockService; use crmeb\services\LockService;
use crmeb\services\PayService;
use crmeb\services\WechatService; use crmeb\services\WechatService;
use think\facade\Db; use think\facade\Db;
use app\common\repositories\store\order\StoreCartRepository; use app\common\repositories\store\order\StoreCartRepository;
@ -152,8 +153,23 @@ class StoreMicropayOrder extends BaseController
return $orderCreateRepository->v2CreateOrder(array_search($payType, StoreOrderRepository::PAY_TYPE), $this->request->userInfo(), $cartId, $extend, $mark, $receipt_data, $takes, $couponIds, $useIntegral, $addressId, $post,$source); return $orderCreateRepository->v2CreateOrder(array_search($payType, StoreOrderRepository::PAY_TYPE), $this->request->userInfo(), $cartId, $extend, $mark, $receipt_data, $takes, $couponIds, $useIntegral, $addressId, $post,$source);
}); });
try { try {
$attach['type']=1; $param['openid']='';
return WechatService::create()->paymentMicropay($groupOrder['group_order_sn'],$groupOrder['pay_price'],'付款码支付','商户号'.$mer_id,md5(time()),$auth_code,$attach); $param['order_sn']=$groupOrder['group_order_sn'];
$param['pay_price']=$groupOrder['pay_price'];
$param['attach']=['type'=>1];
$param['body']='店内支付';
$service = new PayService('weixinQr',$param);
$code = $service->pay(null);
$endtime = time() + 1800 ;
$result = [
'config' => $code['config'],
'endtime'=> date('Y-m-d H:i:s',$endtime),
'price' => $param['pay_price']
];
return app('json')->success($result);
// return WechatService::create()->paymentPrepare('',$groupOrder['group_order_sn'],$groupOrder['pay_price'],['type'=>1],'店内支付','','NATIVE');
// return WechatService::create()->paymentMicropay($groupOrder['group_order_sn'],$groupOrder['pay_price'],'付款码支付','商户号'.$mer_id,md5(time()),$auth_code);
} catch (\Exception $e) { } catch (\Exception $e) {
return app('json')->status('error', $e->getMessage(), ['order_id' => $groupOrder->group_order_id]); return app('json')->status('error', $e->getMessage(), ['order_id' => $groupOrder->group_order_id]);
} }

View File

@ -412,10 +412,10 @@ class WechatService
* @param $auth_code * @param $auth_code
* @return Collection|\Psr\Http\Message\ResponseInterface * @return Collection|\Psr\Http\Message\ResponseInterface
*/ */
public function paymentMicropay($out_trade_no, $total_fee, $body, $device_info,$nonce_str,$auth_code,$attach) public function paymentMicropay($out_trade_no, $total_fee, $body, $device_info,$nonce_str,$auth_code)
{ {
$total_fee = bcmul($total_fee, 100, 0); $total_fee = bcmul($total_fee, 100, 0);
$order = array_merge(compact('out_trade_no', 'total_fee', 'body', 'device_info','nonce_str','auth_code','attach')); $order = array_merge(compact('out_trade_no', 'total_fee', 'body', 'device_info','nonce_str','auth_code'));
$order['spbill_create_ip'] = \request()->ip(); $order['spbill_create_ip'] = \request()->ip();
$order= new Order($order); $order= new Order($order);
$result = $this->application->payment->pay($order); $result = $this->application->payment->pay($order);