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

application/models/DAO/Order/OrderGoods.php

@@ -232,8 +232,8 @@ class OrderGoodsModel extends \DAO\AbstractModel
 
     public function getMustReduceAmount($orderGoodses, $discountAmount, $orderGoods)
     {
-        $allNumbers = array_column($orderGoodses, 'goodsNum');
-        $allGoodsPrice = array_column($orderGoodses, 'goodsPrice');
+        $allNumbers = array_sum($orderGoodses, 'goodsNum');
+        $allGoodsPrice = array_sum($orderGoodses, 'goodsPrice');
         $allMoney = $allNumbers * $allGoodsPrice;
         $thisOrderGoodsAmount = $orderGoods['goodsNum'] * $orderGoods['goodsPrice'];
         $reduceAmount=($discountAmount*$thisOrderGoodsAmount)/($allMoney);