Commit 43691ece authored by testshenbd's avatar testshenbd

Merge branch 'linqing' of git.shenbd.com:qm-develop/shenbd into linqing

parents 7e157d97 1c451f0e
...@@ -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'];
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment