消息问题

application/models/Business/Store/ShopkeeperService.php

@@ -334,8 +334,10 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
                         $value['orderGoods'] = array();
                     }
                     if ($this->clientType && $this->clientType == NameConst::pcClient) {
-                        $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'];//优惠券金额
+//                        $value['receiveAmount'] = $value['goodsAmount']+$value['shippingFee'] - $value['couponAmount'];
                        // $value['orderAmount'] = $value['orderAmount'];
                         $value['reciverInfo'] = unserialize($value['reciverInfo']);
                         $value['reciverInfo']  =$orderCommonDao->getReciverInfo( $value['reciverInfo'] );

application/models/DAO/Order/Order.php

@@ -1129,6 +1129,9 @@ class OrderModel extends \DAO\AbstractModel
    public function getClienOrderCommon($order){
        $returnData=array();
        $returnData['couponAmount'] = ($order['goodsAmount'] + $order['shippingFee']) - $order['orderAmount'];//优惠券金额
+       if($returnData['couponAmount']<ApiConst::zero){
+           $returnData['couponAmount']=ApiConst::zero;
+       }
        $returnData['orderAmount'] = $order['orderAmount'] ;
        $returnData['goodsAmount']=$order['goodsAmount'];
        $returnData['shippingFee']=$order['shippingFee'];