Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
service
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
aimeiyue
service
Commits
d59a585c
Commit
d59a585c
authored
Feb 24, 2025
by
jack
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新
parent
d5a103f5
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
app/Admin/Forms/TransferBillsPlatForm.php
+1
-0
app/Http/Controllers/Api/CommentController.php
+1
-2
app/Http/Controllers/Api/OrderController.php
+2
-2
No files found.
app/Admin/Forms/TransferBillsPlatForm.php
View file @
d59a585c
...
@@ -69,6 +69,7 @@ public function handle(array $input)
...
@@ -69,6 +69,7 @@ public function handle(array $input)
Log
::
add
(
'分账给平台成功'
,
[
'recond_id'
=>
$recordObj
->
id
]);
Log
::
add
(
'分账给平台成功'
,
[
'recond_id'
=>
$recordObj
->
id
]);
$recordObj
->
remark
=
$remark
;
$recordObj
->
remark
=
$remark
;
$recordObj
->
payconfirm_no
=
$result
[
'order_no'
];
$recordObj
->
payconfirm_no
=
$result
[
'order_no'
];
$recordObj
->
is_div
=
1
;
$recordObj
->
save
();
$recordObj
->
save
();
}
}
...
...
app/Http/Controllers/Api/CommentController.php
View file @
d59a585c
...
@@ -50,11 +50,10 @@ public function add(Request $request)
...
@@ -50,11 +50,10 @@ public function add(Request $request)
Log
::
add
(
'订单商品评论'
.
$og_id
,
[
'num'
=>
$count
]);
Log
::
add
(
'订单商品评论'
.
$og_id
,
[
'num'
=>
$count
]);
if
(
$count
==
0
)
{
if
(
$count
==
0
)
{
if
(
$useObj
->
spuid
||
$useObj
->
merchant_id
)
{
if
(
$useObj
->
spuid
||
$useObj
->
merchant_id
)
{
$orderObj
->
is_commission
=
1
;
//
$orderObj->is_commission = 1;
$orderObj
->
order_status
=
4
;
$orderObj
->
order_status
=
4
;
$orderObj
->
save
();
$orderObj
->
save
();
}
}
// Log::add('调用分佣', $orderObj->toArray());
// $this->dispatch(new AutoCompleteOrder($orderObj, 10));
// $this->dispatch(new AutoCompleteOrder($orderObj, 10));
}
}
DB
::
commit
();
DB
::
commit
();
...
...
app/Http/Controllers/Api/OrderController.php
View file @
d59a585c
...
@@ -140,7 +140,7 @@ public function CreateBuyOrder(Request $request)
...
@@ -140,7 +140,7 @@ public function CreateBuyOrder(Request $request)
$orderObj
->
delivery_type
=
$delivery_type
;
$orderObj
->
delivery_type
=
$delivery_type
;
$orderObj
->
merchant_id
=
$merchant_id
;
$orderObj
->
merchant_id
=
$merchant_id
;
$orderObj
->
store_id
=
$store_id
;
$orderObj
->
store_id
=
$store_id
;
$orderObj
->
is_commission
=
(
$spuid
||
$merchant_id
)
?
1
:
0
;
//
$orderObj->is_commission = ($spuid || $merchant_id) ? 1 : 0;
if
(
$orderObj
->
save
())
{
if
(
$orderObj
->
save
())
{
$order_id
=
$orderObj
->
id
;
$order_id
=
$orderObj
->
id
;
foreach
(
$orderGoods
as
$key
=>
$item
)
{
foreach
(
$orderGoods
as
$key
=>
$item
)
{
...
@@ -250,7 +250,7 @@ public function CreateOrder(Request $request)
...
@@ -250,7 +250,7 @@ public function CreateOrder(Request $request)
$orderObj
->
delivery_type
=
$delivery_type
;
$orderObj
->
delivery_type
=
$delivery_type
;
$orderObj
->
merchant_id
=
$merchant_id
;
$orderObj
->
merchant_id
=
$merchant_id
;
$orderObj
->
store_id
=
$store_id
;
$orderObj
->
store_id
=
$store_id
;
$orderObj
->
is_commission
=
(
$spuid
||
$merchant_id
)
?
1
:
0
;
//
$orderObj->is_commission = ($spuid || $merchant_id) ? 1 : 0;
if
(
$orderObj
->
save
())
{
if
(
$orderObj
->
save
())
{
$order_id
=
$orderObj
->
id
;
$order_id
=
$orderObj
->
id
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment