红包系统支付还原, 确认是运费模版出问题导致的bug, 代码还原

data/logic/payment.logic.php

@@ -85,10 +85,9 @@ class paymentLogic
      * 取得实物订单所需支付金额等信息, 移动支付时, 在使用红包时需要计算运费
      * @param int $pay_sn
      * @param int $member_id
-     * @param boolean $mobile_flag
      * @return array
      */
-    public function getRealOrderInfo($pay_sn, $member_id = null, $mobile_flag = false)
+    public function getRealOrderInfo($pay_sn, $member_id = null)
     {
         //验证订单信息
         $model_order = Model('order');
@@ -113,13 +112,7 @@ class paymentLogic
         $pay_amount = 0;
         if (!empty($order_list)) {
             foreach ($order_list as $order_info) {
-                if (false == $mobile_flag) {
-                    $pay_amount += ncPriceFormat(floatval($order_info['order_amount']) - floatval($order_info['pd_amount']));
-                } else {
-                    // 移动平台需要计算运费
-                    $total_amount = floatval($order_info['order_amount']) + floatval($order_info['shipping_fee']);
-                    $pay_amount += ncPriceFormat(floatval($total_amount) - floatval($order_info['pd_amount']));
-                }
+                $pay_amount += ncPriceFormat(floatval($order_info['order_amount']) - floatval($order_info['pd_amount']));
             }
         }
 
@@ -133,10 +126,9 @@ class paymentLogic
      * 取得虚拟订单所需支付金额等信息, 移动支付时, 在使用红包时需要计算运费
      * @param int $order_sn
      * @param int $member_id
-     * @param boolean $mobile_flag
      * @return array
      */
-    public function getVrOrderInfo($order_sn, $member_id = null, $mobile_flag = false)
+    public function getVrOrderInfo($order_sn, $member_id = null)
     {
 
         //验证订单信息
@@ -157,13 +149,7 @@ class paymentLogic
 
         $pay_amount = 0.0;
         //计算本次需要在线支付的订单总金额
-        if (false == $mobile_flag) {
-            $pay_amount = ncPriceFormat(floatval($order_info['order_amount']) - floatval($order_info['pd_amount']));
-        } else {
-            // 移动平台需要计算运费
-            $total_amount = floatval($order_info['order_amount']) + floatval($order_info['shipping_fee']);
-            $pay_amount += ncPriceFormat(floatval($total_amount) - floatval($order_info['pd_amount']));
-        }
+        $pay_amount = ncPriceFormat(floatval($order_info['order_amount']) - floatval($order_info['pd_amount']));
 
         $order_info['api_pay_amount'] = $pay_amount;
 

mobile/control/app_pay.php

@@ -51,7 +51,7 @@ class app_payControl extends mbMemberControl
         }
 
         //重新计算所需支付金额
-        $result = $logic_payment->getRealOrderInfo($pay_sn, $this->member_info['member_id'], true);
+        $result = $logic_payment->getRealOrderInfo($pay_sn, $this->member_info['member_id']);
         if (intval($result['data']['api_pay_state']) != 0) {
             return joutput_error(errcode::ErrPayment, $result['msg']);
         }
@@ -215,7 +215,7 @@ class app_payControl extends mbMemberControl
         }
 
         if ($order_type == 'r') {
-            $result = $logic_payment->getRealOrderInfo($out_trade_no, null, true);
+            $result = $logic_payment->getRealOrderInfo($out_trade_no);
             if (intval($result['data']['api_pay_state'])) {
                 return array('state' => true);
             }