bug2340

application/models/Business/Order/OrderService.php

@@ -334,6 +334,7 @@ class OrderServiceModel extends \Business\AbstractModel
         if ($isAllowCancel) {
             $res = $orderDao->updateStatusByOrderId($orderId, ApiConst::orderStateCancel);
             if ($res) {
+                $this->updateOrderGoodsStoregeByOrderIds(array($orderId));
                 $order['refundOrderNo']=$refundReturnDao->getRefundsn($order['storeId']);
                 if($order['paymentTime']>ApiConst::zero){
                     $resultRefund=$refundReturnDao->refundMoney($order);

application/models/DAO/Goods.php

@@ -502,8 +502,11 @@ class GoodsModel extends \DAO\AbstractModel {
             }
 
             unset($goods['goodsSpec']);
+
             if(isset($goods['goodsGroup'])&&!empty($goods['goodsGroup'])){
                 $goods['goodsGroup']=$this->getGoodsGroup($goods['goodsGroup']);
+                $goods['goodsDiscountPrice']=array_sum($goods['goodsGroup'],'discountPrice');
+                $goods['goodsReduceAmount']=$goods['goodsPayPrice']-$goods['goodsDiscountPrice'];
             }else{
                 $goods['goodsGroup']=array();
             }