Skip to content

M
my-yaf-project
Commit 5bc18e05 authored by christ's avatar christ
Browse files
Options

消息问题

parent 054c3aa8
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
application/models/Business/Store/ShopkeeperService.php
View file @ 5bc18e05
......@@ -334,10 +334,13 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
$value['orderGoods'] = array();
}
if ($this->clientType && $this->clientType == NameConst::pcClient) {
$extent=$orderDao->getClienOrderCommon($value['orderId']);
$value=array_merge($value,$extent);
// $value['couponAmount'] = ($value['goodsAmount'] + $value['shippingFee']) - $value['orderAmount'];//优惠券金额
// $value['receiveAmount'] = $value['goodsAmount']+$value['shippingFee'] - $value['couponAmount'];
// $extent=$orderDao->getClienOrderCommon($value['orderId']);
// $value=array_merge($value,$extent);
$value['couponAmount'] = ($value['goodsAmount'] + $value['shippingFee']) - $value['orderAmount'];//优惠券金额
if( $value['couponAmount']<ApiConst::zero){
$value['couponAmount']=ApiConst::zero;
}
$value['receiveAmount'] = $value['goodsAmount']+$value['shippingFee'] - $value['couponAmount'];
// $value['orderAmount'] = $value['orderAmount'];
$value['reciverInfo'] = unserialize($value['reciverInfo']);
$value['reciverInfo'] =$orderCommonDao->getReciverInfo( $value['reciverInfo'] );
......
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