Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
semour
/
semour_admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
80d7717d
authored
Nov 30, 2022
by
孙龙
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
深茂订单
parent
343d9e01
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
app/Admin/Service/OrderService.php
resources/views/admin/pages/order-page.blade.php
app/Admin/Service/OrderService.php
View file @
80d7717d
...
@@ -157,12 +157,14 @@ class OrderService extends BaseService
...
@@ -157,12 +157,14 @@ class OrderService extends BaseService
}
}
}
else
{
}
else
{
if
(
in_array
(
$insertReturnItemData
[
"type"
],[
1
,
2
])
&&
$insertReturnItemData
[
"return_price"
]
||
$insertReturnItemData
[
"return_num"
]){
$createOrEdit
=
true
;
$createOrEdit
=
true
;
}
}
}
if
(
$createOrEdit
){
if
(
$createOrEdit
){
$insertReturnItemData
[
"return_amount"
]
=
decimal_number_format
(
$
orderItem
[
"return_goods_number"
]
*
$orderItem
[
"return_goods_price
"
]);
$insertReturnItemData
[
"return_amount"
]
=
decimal_number_format
(
$
insertReturnItemData
[
"return_price"
]
*
$insertReturnItemData
[
"return_num
"
]);
}
}
$createOrEdit
&&
OrderReturnItems
::
create
(
array_merge
(
$insertReturnItemData
,[
"create_time"
=>
time
()]));
$createOrEdit
&&
OrderReturnItems
::
create
(
array_merge
(
$insertReturnItemData
,[
"create_time"
=>
time
()]));
}
}
...
...
resources/views/admin/pages/order-page.blade.php
View file @
80d7717d
...
@@ -415,8 +415,8 @@
...
@@ -415,8 +415,8 @@
<div class="
layui
-
input
-
block
">
<div class="
layui
-
input
-
block
">
<div class="
layui
-
form
-
mid
">
{
{$info["settlementInfo"]["order_user_pay_type_cn"]}
}
</div>
<div class="
layui
-
form
-
mid
">
{
{$info["settlementInfo"]["order_user_pay_type_cn"]}
}
</div>
<div class="
show
" style="
display
:
none
">
<div class="
show
" style="
display
:
none
">
<input type="
radio
" name="
order_user_pay_type
" value="
0
" title="
Paypal
" checked>
<input type="
radio
" name="
order_user_pay_type
" value="
1
" title="
Paypal
" checked>
<input type="
radio
" name="
order_user_pay_type
" value="
1
" title="
TT
">
<input type="
radio
" name="
order_user_pay_type
" value="
2
" title="
TT
">
</div>
</div>
</div>
</div>
</div>
</div>
...
...
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