修正商品折扣信息

helper/order_helper.php

@@ -638,8 +638,7 @@ class order_helper
         $result["trade_no"] = $order["trade_no"];
         $result["state_desc"] = $order["state_desc"];
         $result['pay_cash'] = $result["order_amount"] - $result["pd_amount"];
-
-        $result['full_discount'] = $result["order_amount"] - $result["goods_amount"];
+        $result['full_discount'] = $result["goods_amount"] - $order["goods_amount"];
         $result['full_desc'] = $this->full_desc($order);
 
         if ($result['order_state'] == ORDER_STATE_NEW) {

helper/pay_helper.php

@@ -39,7 +39,7 @@ class pay_helper
         $types = [];
         $types[] = array("payment" => "wxpay","desc" => "");
         $types[] = array("payment" => "alipay","desc" => "");
-        $types[] = array("payment" => "cmbpay","desc" => "支付即有现金反馈～");
+        $types[] = array("payment" => "cmbpay","desc" => "新用户首单最高减99");
         return $types;
     }
 
@@ -57,12 +57,6 @@ class pay_helper
             self::pay_bonus($pay_sn);
         }
 
-        $model_order = Model('order');
-        $condition = array();
-        $condition['pay_sn'] = $pay_sn;
-        $condition['order_state'] = array('in',array(ORDER_STATE_NEW,ORDER_STATE_PAY));
-        $order_list = $model_order->getOrderList($condition,'','order_id,order_state,payment_code,order_amount,rcb_amount,pd_amount,order_sn','','',array(),true);
-
         $logic_payment = Logic('payment');
         $payinfo = $logic_payment->getRealOrderInfo($pay_sn, $_SESSION['member_id']);
         if (intval($payinfo['data']['api_pay_state']) != 0) {