pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

修复 用户扫码重复生成订单

release
panliang 2022-05-20 17:29:30 +08:00
parent 5e2fa41603
commit 8cddeb2387
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Endpoint/Api/Http/Controllers/Order/OrderPreController.php
View File

@ -4,7 +4,7 @@ namespace App\Endpoint\Api\Http\Controllers\Order;
use App\Endpoint\Api\Http\Controllers\Controller; use App\Endpoint\Api\Http\Controllers\Controller;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Models\{OrderPre, ProductSku}; use App\Models\{Order, OrderPre, ProductSku};
use App\Models\Store\Store; use App\Models\Store\Store;
use App\Services\OrderService; use App\Services\OrderService;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
@ -107,7 +107,11 @@ class OrderPreController extends Controller
try { try {
DB::beginTransaction(); DB::beginTransaction();
$service = new OrderService(); $service = new OrderService();
$order = $service->createOrderByPre($user, $order_pre); // 如果还有未支付的订单, 则不生成新订单
$order = $user->orders()->where('status', Order::STATUS_PENDING)->first();
if (!$order) {
$order = $service->createOrderByPre($user, $order_pre);
}
DB::commit(); DB::commit();
return response()->json([ return response()->json([

2
app/Endpoint/Api/Http/Controllers/Order/UnlineController.php
View File

@ -106,7 +106,7 @@ class UnlineController extends Controller
} }
$package = $service_package->createPackage($order, [ $package = $service_package->createPackage($order, [
'shipping_company' => '提货', 'shipping_company' => '提货',
'shipping_number' => $user->id, 'shipping_number' => 'unline',
'packages' => $package_params 'packages' => $package_params
]); ]);
$package->update([ $package->update([

2
app/Listeners/OrderPackage.php
View File

@ -85,7 +85,7 @@ class OrderPackage
if (count($package_params) > 0) { if (count($package_params) > 0) {
$package = $service_package->createPackage($order, [ $package = $service_package->createPackage($order, [
'shipping_company' => '提货', 'shipping_company' => '提货',
'shipping_number' => '0', 'shipping_number' => 'auto',
'packages' => $package_params 'packages' => $package_params
]); ]);
$package->update([ $package->update([

6
app/Services/DistributeService.php
View File

@ -42,14 +42,14 @@ class DistributeService
]); ]);
$user->userInfo()->increment('growth_value', $sales_value); $user->userInfo()->increment('growth_value', $sales_value);
// 自动升级代理 // 自动升级代理
$levels = Agent::orderBy('sort')->get(); $levels = Agent::where('slug', Agent::TYPE_FAVOITE)->orderBy('sort')->get();
$level_up = ''; $level_up = '';
foreach($levels->reverse() as $item) { foreach($levels->reverse() as $item) {
if ($user->userInfo->growth_value >= $item->growth_value) { if ($user->userInfo->growth_value >= $item->growth_value) {
$level_up = $item; $level_up = $item;
} }
} }
if ($level_up && $level_up->slug === 'favoite') { if ($level_up) {
$user->update([ $user->update([
'agent_id' => $level_up->id, 'agent_id' => $level_up->id,
]); ]);
@ -98,7 +98,7 @@ class DistributeService
} }
/** /**
* 使用微信企业付款 * 使用微信企业付款, 支付返利金额
* 调用之前, 需要提前生成商户订单号 * 调用之前, 需要提前生成商户订单号
*/ */
public function wechatTransfer(OrderProfit $profit) public function wechatTransfer(OrderProfit $profit)