Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
J
jwhx
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sugar
jwhx
Commits
d4fa039b
Commit
d4fa039b
authored
Nov 01, 2024
by
wuxiaoli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
识别生产自提订单
parent
11719bdf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
1 deletion
+3
-1
modules/Order/app/Models/Order.php
modules/Order/app/Models/Order.php
+1
-1
modules/Order/app/Services/OrderService.php
modules/Order/app/Services/OrderService.php
+1
-0
modules/Order/database/migrations/2024_07_31_085941_order_base.php
...rder/database/migrations/2024_07_31_085941_order_base.php
+1
-0
No files found.
modules/Order/app/Models/Order.php
View file @
d4fa039b
...
...
@@ -13,7 +13,7 @@ use App\Models\BaseModel;
class
Order
extends
BaseModel
{
protected
$table
=
'order'
;
protected
$fillable
=
[
'order_no'
,
'store_id'
,
'member_id'
,
'invite_uid'
,
'amount'
,
'pay_type'
,
'pay_no'
,
'delivery_type'
,
'delivery_no'
,
'delivery_info'
,
'status'
,
'pay_time'
,
'confirm_time'
,
'comment_time'
,
'close_time'
,
'refund_time'
,
'refund_no'
];
protected
$fillable
=
[
'order_no'
,
'store_id'
,
'member_id'
,
'invite_uid'
,
'amount'
,
'pay_type'
,
'pay_no'
,
'delivery_type'
,
'delivery_no'
,
'delivery_info'
,
'status'
,
'pay_time'
,
'confirm_time'
,
'comment_time'
,
'close_time'
,
'refund_time'
,
'refund_no'
,
'delivery_type'
];
// protected $hidden = ['deleted_at'];
protected
function
casts
()
:
array
{
...
...
modules/Order/app/Services/OrderService.php
View file @
d4fa039b
...
...
@@ -370,6 +370,7 @@ class OrderService {
$order
->
member_id
=
auth
(
'api'
)
->
user
()[
'uid'
];
$order
->
invite_uid
=
$request
->
input
(
'invite_uid'
)
??
0
;
$order
->
pay_type
=
$request
->
input
(
'pay_type'
)
??
'wechat'
;
$order
->
delivery_type
=
$request
->
input
(
'delivery_type'
)
??
1
;
$order
->
amount
=
$amount
;
$order
->
integral
=
$integral
;
$order
->
status
=
0
;
...
...
modules/Order/database/migrations/2024_07_31_085941_order_base.php
View file @
d4fa039b
...
...
@@ -45,6 +45,7 @@ return new class extends Migration
$table
->
string
(
'refund_no'
)
->
nullable
()
->
comment
(
'退款单号'
);
$table
->
timestamp
(
'created_at'
)
->
nullable
()
->
comment
(
'创建时间'
);
$table
->
timestamp
(
'updated_at'
)
->
nullable
()
->
comment
(
'更新时间'
);
$table
->
string
(
'delivery_type'
)
->
nullable
()
->
comment
(
'配送方式'
);
$table
->
softDeletes
();
$table
->
engine
=
'InnoDB'
;
...
...
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