add to local

data/model/order.model.php

@@ -5,8 +5,8 @@
  *
  *
  *
- 
  */
+
 defined('InShopNC') or exit('Access Invalid!');
 class orderModel extends Model
 {
@@ -88,7 +88,7 @@ class orderModel extends Model
      * @param unknown $extend 追加返回那些表的信息,如array('order_common','order_goods','store')
      * @return Ambigous <multitype:boolean Ambigous <string, mixed> , unknown>
      */
-    public function getNormalOrderList($condition, $pagesize = '', $field = '*', $order = 'order_id desc', $limit = '', $extend = array(),$master = false){
+    public function getNormalOrderList($condition, $pagesize = '*', $field = '*', $order = 'order_id desc', $limit = '', $extend = array(),$master = false){
         $condition['delete_state'] = 0;
         return $this->getOrderList($condition, $pagesize, $field, $order, $limit, $extend,$master);
     }
@@ -112,10 +112,18 @@ class orderModel extends Model
         $list = $this->table('order')->field($field)->where($condition)->page($pagesize)->order($order)->limit($limit)->master($master)->select();
         if (empty($list)) return array();
         $order_list = array();
-        foreach ($list as $order) {
+        foreach ($list as $order)
+        {
             if (isset($order['order_state'])) {
                 $order['state_desc'] = orderState($order);
             }
+            $bonus_amount = unserialize($order['bonus_amount']);
+            if ($bonus_amount == false) {
+                $order['bonus_amount'] = [];
+            } else {
+                $order['bonus_amount'] = $bonus_amount;
+            }
+
             if (isset($order['payment_code'])) {
                 $order['payment_name'] = orderPaymentName($order['payment_code']);
             }

helper/order_helper.php

@@ -811,7 +811,18 @@ class order_helper extends order_base
         $result["shipping_code"] = empty($order["shipping_code"]) ? "" : $order["shipping_code"];
         $result["trade_no"] = $order["trade_no"];
         $result["state_desc"] = $order["state_desc"];
-        $result['pay_cash'] = $result["order_amount"] - $result["pd_amount"];
+
+        $bonus_amount = $order['bonus_amount'];
+        $user_bonus = $bonus_amount['user_bonus'];
+        $room_id = $bonus_amount['room_id'];
+        $room_bonus = $bonus_amount['room_bonus'];
+
+        $bonus_total = $user_bonus;
+        if($room_id > 0) {
+            $bonus_total += $room_bonus;
+        }
+
+        $result['pay_cash'] = $result["order_amount"] - $result["pd_amount"] - $bonus_total;
         $result['full_discount'] = $result["goods_amount"] - $order["goods_amount"];
         $result['full_desc'] = $this->full_desc($order);