Merge branch 'linqing' of git.shenbd.com:qm-develop/shenbd into ccw

application/models/Business/Order/RefundService.php

@@ -1022,7 +1022,6 @@ class RefundServiceModel extends \Business\AbstractModel
 //            $shippingFee == ApiConst::zero;
 //        }
         $orderGoodsConvert = $orderGoodsDao->getRefundOrderGoods($orderGoods);
-
         $returnData = array(
             'orderId' => (int)$orderId,
             'orderSn'=>$orderInfo['orderSn'],

application/models/DAO/Member.php

@@ -646,6 +646,9 @@ class MemberModel extends \DAO\AbstractModel
   }
   public function getListMemberUrl($list){
     foreach($list as &$li){
+      if(!Common::checkMobilePhone($li['memberMobile'])){
+        $li['memberMobile']='';
+      }
       $li['memberAvatar']=$this->getMemberAvatarUrl($li['memberId'],$li['memberAvatar']);
     }
     return $list;

application/models/DAO/Order/OrderGoods.php

@@ -230,14 +230,18 @@ class OrderGoodsModel extends \DAO\AbstractModel
         );
     }
 
-    public function getMustReduceAmount($orderGoodses, $discountAmount, $orderGoods)
+    public function getMustReduceAmount($orderGoodses, $discountAmount, $convertOrderGoods)
     {
-        $allNumbers = array_column($orderGoodses, 'goodsNum');
-        $allNumbers=array_sum($allNumbers);
-        $allGoodsPrice = array_column($orderGoodses, 'goodsPrice');
-        $allGoodsPrice=array_sum($allGoodsPrice);
-        $allMoney = $allNumbers * $allGoodsPrice;
-        $thisOrderGoodsAmount = $orderGoods['goodsNum'] * $orderGoods['goodsPrice'];
+        $allMoney=0;
+        foreach($orderGoodses as &$orderGoods){
+            $allMoney+= $orderGoods['goodsNum']*$orderGoods['goodsPrice'];
+        }
+//        $allNumbers = array_column($orderGoodses, 'goodsNum');
+//        $allNumbers=array_sum($allNumbers);
+//        $allGoodsPrice = array_column($orderGoodses, 'goodsPrice');
+//        $allGoodsPrice=array_sum($allGoodsPrice);
+//        $allMoney = $allNumbers * $allGoodsPrice;
+        $thisOrderGoodsAmount = $convertOrderGoods['goodsNum'] * $convertOrderGoods['goodsPrice'];
         $reduceAmount=($discountAmount*$thisOrderGoodsAmount)/($allMoney);
         return round($reduceAmount);