Commit f28b1cad authored by christ's avatar christ

temp

parent 0f08c597
...@@ -323,6 +323,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel ...@@ -323,6 +323,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
$ordersOrderCommons = Common::intergrateOneToOne($orders, $qmDeliveryManLogs['list'], 'orderId', 'orderId'); $ordersOrderCommons = Common::intergrateOneToOne($orders, $qmDeliveryManLogs['list'], 'orderId', 'orderId');
$ordersOrderCommons=Common::intergrateOneToOne($ordersOrderCommons, $orderCommons, 'orderId', 'orderId'); $ordersOrderCommons=Common::intergrateOneToOne($ordersOrderCommons, $orderCommons, 'orderId', 'orderId');
$orderMerge = \Our\Common::intergrateOneToMany($ordersOrderCommons, $orderGoods, 'orderId', 'orderId', 'orderGoods','addTime'); $orderMerge = \Our\Common::intergrateOneToMany($ordersOrderCommons, $orderGoods, 'orderId', 'orderId', 'orderGoods','addTime');
$orderConvert=$orderDao->convertOrder($orders,'orderId');
foreach ($orderMerge as &$value) { foreach ($orderMerge as &$value) {
$value['orderStateName'] = $orderDao->getStatusText($value); $value['orderStateName'] = $orderDao->getStatusText($value);
$value['orderText'] = $orderDao->getText($value, ApiConst::orderListDescribe); $value['orderText'] = $orderDao->getText($value, ApiConst::orderListDescribe);
...@@ -359,6 +360,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel ...@@ -359,6 +360,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
} else { } else {
unset($value['reciverInfo']); unset($value['reciverInfo']);
} }
$value['addTime']=$orderConvert[$value['orderId']]['addTime'];
unset($value['couponId']); unset($value['couponId']);
unset($value['refundAmount']); unset($value['refundAmount']);
unset($value['distributionFee']); unset($value['distributionFee']);
......
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