Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
farming
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
0
Merge Requests
0
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
郑云飞
farming
Commits
b03aeec7
Commit
b03aeec7
authored
Jun 07, 2023
by
郑云飞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加收货人、收货电话、收货详细地址
parent
f2aed4ee
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
7 deletions
+10
-7
src/main/java/com/yunniu/farming/webadmin/model/OrderMain.java
+3
-6
src/main/resources/mappings/OrderMainMapper.xml
+4
-1
src/main/resources/templates/groupOrder/detail.html
+3
-0
No files found.
src/main/java/com/yunniu/farming/webadmin/model/OrderMain.java
View file @
b03aeec7
...
...
@@ -99,12 +99,9 @@ public class OrderMain {
@JsonInclude
(
JsonInclude
.
Include
.
NON_NULL
)
private
String
sdef1
;
// 自定义项1
@JsonInclude
(
JsonInclude
.
Include
.
NON_NULL
)
private
String
sdef2
;
// 自定义项2
@JsonInclude
(
JsonInclude
.
Include
.
NON_NULL
)
private
String
sdef3
;
// 自定义项3
private
String
sdef1
;
// 自定义项1 团购收货联系人
private
String
sdef2
;
// 自定义项2 团购收获手机号
private
String
sdef3
;
// 自定义项3 团购收货详细地址
@JsonInclude
(
JsonInclude
.
Include
.
NON_NULL
)
private
String
sdef4
;
// 自定义项4
@JsonInclude
(
JsonInclude
.
Include
.
NON_NULL
)
...
...
src/main/resources/mappings/OrderMainMapper.xml
View file @
b03aeec7
...
...
@@ -309,7 +309,10 @@
om.dactmoney,
om.tpaytime,
concat(om.sprovince, om.scity, om.sregion, om.scusaddr) as scusaddr,
om.sremark
om.sremark,
om.sdef1,
om.sdef2,
om.sdef3
from order_main om
left join customer c on om.customerid = c.id
where om.group_order_id = #{id,jdbcType=BIGINT}
...
...
src/main/resources/templates/groupOrder/detail.html
View file @
b03aeec7
...
...
@@ -194,6 +194,9 @@
,
{
field
:
'dactmoney'
,
title
:
'实付金额'
}
,
{
field
:
'tpaytime'
,
title
:
'付款时间'
}
,
{
field
:
'scusaddr'
,
title
:
'收获地址'
}
,
{
field
:
'sdef1'
,
title
:
'联系人'
}
,
{
field
:
'sdef2'
,
title
:
'联系电话'
}
,
{
field
:
'sdef3'
,
title
:
'详细地址'
}
,
{
field
:
'sremark'
,
title
:
'备注'
}
,
{
field
:
''
,
width
:
130
,
title
:
'操作'
,
toolbar
:
'#table-handle'
,
fixed
:
"right"
}
]
...
...
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