Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenchuanwen
my-yaf-project
Commits
43691ece
Commit
43691ece
authored
Jan 03, 2019
by
testshenbd
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'linqing' of git.shenbd.com:qm-develop/shenbd into linqing
parents
7e157d97
1c451f0e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
OrderService.php
application/models/Business/Order/OrderService.php
+3
-3
No files found.
application/models/Business/Order/OrderService.php
View file @
43691ece
...
@@ -120,7 +120,7 @@ class OrderServiceModel extends \Business\AbstractModel
...
@@ -120,7 +120,7 @@ class OrderServiceModel extends \Business\AbstractModel
$msg_tpl
=
$wxapp_templates
[
'wxapp_order_paysucc_tpl'
];
$msg_tpl
=
$wxapp_templates
[
'wxapp_order_paysucc_tpl'
];
$goods_str
=
''
;
$goods_str
=
''
;
if
(
count
(
$goods_datas
)
>
1
)
{
if
(
count
(
$goods_datas
)
>
1
)
{
$goods_str
.=
$goods_datas
[
0
][
'goods_name'
]
.
'等'
.
count
(
$goods_datas
)
.
'
个
商品'
;
$goods_str
.=
$goods_datas
[
0
][
'goods_name'
]
.
'等'
.
count
(
$goods_datas
)
.
'
件
商品'
;
}
else
{
}
else
{
$goods_str
.=
$goods_datas
[
0
][
'goods_name'
];
$goods_str
.=
$goods_datas
[
0
][
'goods_name'
];
}
}
...
@@ -170,7 +170,7 @@ class OrderServiceModel extends \Business\AbstractModel
...
@@ -170,7 +170,7 @@ class OrderServiceModel extends \Business\AbstractModel
$goods_datas
=
$model_order_goods
->
getOrderGoods
(
$where
,
'order_id, goods_name'
);
$goods_datas
=
$model_order_goods
->
getOrderGoods
(
$where
,
'order_id, goods_name'
);
$goods_str
=
''
;
$goods_str
=
''
;
if
(
count
(
$goods_datas
)
>
1
)
{
if
(
count
(
$goods_datas
)
>
1
)
{
$goods_str
.=
$goods_datas
[
0
][
'goods_name'
]
.
'等'
.
count
(
$goods_datas
)
.
'
个
商品'
;
$goods_str
.=
$goods_datas
[
0
][
'goods_name'
]
.
'等'
.
count
(
$goods_datas
)
.
'
件
商品'
;
}
else
{
}
else
{
$goods_str
.=
$goods_datas
[
0
][
'goods_name'
];
$goods_str
.=
$goods_datas
[
0
][
'goods_name'
];
}
}
...
@@ -216,7 +216,7 @@ class OrderServiceModel extends \Business\AbstractModel
...
@@ -216,7 +216,7 @@ class OrderServiceModel extends \Business\AbstractModel
$goods_datas
=
$model_order_goods
->
getOrderGoods
(
$where
,
'order_id, goods_name'
);
$goods_datas
=
$model_order_goods
->
getOrderGoods
(
$where
,
'order_id, goods_name'
);
$goods_str
=
''
;
$goods_str
=
''
;
if
(
count
(
$goods_datas
)
>
1
)
{
if
(
count
(
$goods_datas
)
>
1
)
{
$goods_str
.=
$goods_datas
[
0
][
'goods_name'
]
.
'等'
.
count
(
$goods_datas
)
.
'
个
商品'
;
$goods_str
.=
$goods_datas
[
0
][
'goods_name'
]
.
'等'
.
count
(
$goods_datas
)
.
'
件
商品'
;
}
else
{
}
else
{
$goods_str
.=
$goods_datas
[
0
][
'goods_name'
];
$goods_str
.=
$goods_datas
[
0
][
'goods_name'
];
}
}
...
...
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