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

Merge branch 'feat_agree' into dev

Browse Source
This commit is contained in:
yaooo 2023-09-23 11:24:06 +08:00
commit c32f93b6b5
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/common/repositories/system/serve/ServeOrderRepository.php
View File

@ -139,7 +139,7 @@ class ServeOrderRepository extends BaseRepository
$res = $this->{$type}($merId, $data);
$key = $res['key'];
$param = $res['param'];
if(!$result = Cache::store('file')->get($key)){
$order_sn = app()->make(StoreOrderRepository::class)->getNewOrderId('cs');
$param['order_sn'] = $order_sn;

24
app/controller/api/Auth.php
View File

@ -48,6 +48,10 @@ use think\facade\Log;
use think\facade\Queue;
use crmeb\jobs\SendSmsJob;
use crmeb\jobs\TestJob;
use crmeb\services\PayService;
use crmeb\services\CombinePayService;
use app\common\model\user\User;
use app\controller\api\Ceshi;
/**
@ -60,8 +64,24 @@ class Auth extends BaseController
{
public function dotest()
{
Queue::push(SendSmsJob::class, ['tempId' => 'ORDER_CREATE', 'id' => 101]);
return app('json')->success();
$repository = app()->make(StoreOrderRepository::class);
$param = [
"status" => 0,
"is_del" => 0,
"mer_id" => 5,
"type" => 10,
"meal_id" => 10,
"pay_type" => 1,
"attach" => "meal",
"order_info" => '{"type_id":10,"is_margin":1,"margin":"0.01"}',
"pay_price" => "0.01",
"order_sn" => "bzj" . date('YmdHis') . uniqid(),
"body" => uniqid(),
];
$payType = 'weixinApp';
$service = new PayService($payType, $param);
$payInfo = $service->pay(User::where(['uid'=>1])->find());
return app('json')->success($payInfo);
}
public function test()