Merge branch 'master' of http://git.huxiukeji.com/zhangxiaobin/ggyuyin

application/api/controller/Money.php

@@ -119,16 +119,17 @@ class Money extends Common
         if ($type == 'wechat') {
             $payType = 1;
             $businessNo = isset($epayConfig['wechat']['mch_id']) ? $epayConfig['wechat']['mch_id'] : '';
-            $serviceFee = bcmul($money,$wechatFee,2);
+            $serviceFee = bcmul($money,$wechatFee,3);
         } elseif ($type == 'alipay') {
             $payType = 2;
             $businessNo = isset($epayConfig['alipay']['app_id']) ? $epayConfig['alipay']['app_id'] : '';
-            $serviceFee = bcmul($money,$alipayFee,2);
+            $serviceFee = bcmul($money,$alipayFee,3);
         } else {
             $payType = 3;
             $businessNo = '';
             $serviceFee = 0.00;
         }
+        $serviceFee = round($serviceFee,2);//手续费保留2位小数，四舍五入
         $recharOrderMode = new \app\common\model\RecharOrder();
         $data["user_id"] = $user_id;
         $data["order_no"] = $out_trade_no;