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

调整确认收货

Browse Source
This commit is contained in:
luofei 2024-03-12 09:56:20 +08:00
parent 104872a239
commit a0bf3b3432
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/common/repositories/store/order/StoreOrderRepository.php
View File

@ -800,18 +800,19 @@ class StoreOrderRepository extends BaseRepository
->field('user_id,number')
->find();
if (!empty($promoterCommission)) {
$userBillRepository->incBill($promoterCommission['user_id'], 'brokerage', 'order_one', [
'link_id' => $order['order_id'],
'status' => 1,
'title' => '获得推广佣金',
'number' => $promoterCommission['number'],
'mark' => $order->merchant['mer_name'] . '成功销售' . floatval($order['pay_price']) . '元,奖励推广佣金' . floatval($promoterCommission['number']),
'balance' => 0
]);
$promoter = User::where('uid', $promoterCommission['user_id'])->find();
$balance = bcadd($promoter->now_money, $promoterCommission['number'], 2);
$promoter->save(['now_money' => $balance]);
if (!empty($promoter)) {
$balance = bcadd($promoter->now_money, $promoterCommission['number'], 2);
$promoter->save(['now_money' => $balance]);
$userBillRepository->incBill($promoterCommission['user_id'], 'brokerage', 'order_one', [
'link_id' => $order['order_id'],
'status' => 1,
'title' => '获得推广佣金',
'number' => $promoterCommission['number'],
'mark' => $order->merchant['mer_name'] . '成功销售' . floatval($order['pay_price']) . '元,奖励推广佣金' . floatval($promoterCommission['number']),
'balance' => 0
]);
}
}
}

9
app/controller/api/Common.php
View File

@ -490,7 +490,14 @@ class Common extends BaseController
}
//区县数据
public function get_area($city_code)
public function getCity($code = 510000)
{
$select = Db::name('geo_city')->where('province_code', $code)->field('city_id id,city_code code,city_name name')->select();
return app('json')->success($select);
}
//区县数据
public function get_area($city_code = 510500)
{
$select = Db::name('geo_area')->where('city_code', $city_code)->field('area_id id,area_code code,area_name name')->select();
return app('json')->success($select);

1
route/api.php
View File

@ -707,6 +707,7 @@ Route::group('api/', function () {
//首页数据
Route::get('common/home', 'api.Common/home');
Route::get('city/get_city', 'api.Common/getCity');
Route::get('city/get_area', 'api.Common/get_area');
Route::get('city/get_street', 'api.Common/get_street');
Route::get('city/get_village', 'api.Common/get_village');