edit

app/goods/lib/Info.php

@@ -510,6 +510,7 @@ class Info
                     $goods_info[] = array
                     (
                         'id' => $ginfo['id'],
+                        'code' => $ginfo['code'],
                         'name' => $ginfo['name'],
                         'price' => $ginfo['price'],
                         'cover' => $ginfo['cover'],

app/mshop/lib/Buy.php

@@ -1145,6 +1145,10 @@ class Buy
                 'status' => $status,
             );
 
+            if ($goods_info['price_type'] > 2) {
+                $d['goods'] = $goods_info['goods'];
+            }
+
             if ($tk && $v['status'] == 3 && $tk['status'] != 3) {
                 $d['status'] = $tk_status[$tk['status']];
                 if ($noprice == 1) {

app/mshop/lib/Out.php

@@ -361,6 +361,9 @@ class Out
                 'price' => $v['price'],
                 'num' => $v['num'],
             );
+            if ($goods_info['price_type'] > 2) {
+                $d['goods'] = $goods_info['goods'];
+            }
 
             if ($info['type'] == 2) {
                 unset($d['price']);

app/shop/database/sell_order.php

@@ -322,14 +322,16 @@ return array
             'match'     => 'option',
             'update'    => 'text',
             'list_name' => '合计金额',
-            'list'        => $search_option_shop_type == 1 ? 'Dever::load("shop/lib/manage.getTotalCash", {id})' : false,
+            //'list'        => $search_option_shop_type == 1 ? 'Dever::load("shop/lib/manage.getTotalCash", {id})' : false,
+            'list'        => 'Dever::load("shop/lib/manage.getTotalCash", {id})',
             'list_order' => 10,
         ),
 
         'price'      => array
         (
             'type'      => 'varchar-50',
-            'name'      => $search_option_shop_type == 1 ? '实付金额' : '订单总金额',
+            //'name'      => $search_option_shop_type == 1 ? '实付金额' : '订单总金额',
+            'name'      => '实付金额',
             'default'   => '0',
             'desc'      => '实付金额',
             'match'     => 'option',

app/shop/src/Excel.php

@@ -90,6 +90,42 @@ class Excel
                 );
 
                 $body[] = $d;
+
+                if ($goods_info['price_type'] > 2 && isset($goods_info['goods']) && is_array($goods_info['goods'])) {
+                    foreach ($goods_info['goods'] as $v2) {
+                        $d = array
+                        (
+                            $info['sid'],
+                            $info['name'],
+                            $info_type[$info['type']],
+
+                            $v['order_num'],
+                            $user,
+
+                            $v2['code'],
+                            $v2['name'],
+                            $sku,
+                            $v2['price'],
+                            $v2['num'],
+                            $v2['price']*$v2['num'],
+
+
+                            $method[$v['method']],
+                            $pay_method[$v['pay_method']],
+                            $cdate,
+                            $paydate,
+                            $operdate,
+
+                            '-',
+                            '-',
+                            '-',
+                            $pay_type[$v['pay_type']],
+                            $status[$v['status']],
+                        );
+
+                        $body[] = $d;
+                    }
+                }
             }
         }
 
@@ -104,7 +140,7 @@ class Excel
         }
         $file = Dever::input('excel_name');
 
-        $header = array('订单号', '收件人', '收件人手机', '收件人地址', '商品编码', '商品名称', '规格型号', '商品单价', '购买数量', '商品合计金额', '下单时间', '付款时间', '发货时间', '订单总数量', '订单总金额', '订单状态', '退款状态', '退款金额');
+        $header = array('订单号', '收件人', '收件人手机', '收件人地址', '商品编码', '商品名称', '规格型号', '商品单价', '购买数量', '商品合计金额', '下单时间', '付款时间', '发货时间', '订单总数量', '订单总金额', '订单实付金额', '订单状态', '退款状态', '退款金额');
 
         $table = 'shop/info';
 
@@ -130,6 +166,7 @@ class Excel
             $operdate = ($ps && $ps['cdate']) ? date('Y-m-d H:i', $ps['cdate']) : '-';
             
             $refund_status = Dever::load("shop/lib/manage.buyInfoRefundStatus", $v['id'], 'sell_order');
+            $total_cash = Dever::load("shop/lib/manage.getTotalCash", $v['id']);
             $v['refund_cash'] = $v['refund_cash'] ? $v['refund_cash'] : 0;
             $address = Dever::load('passport/address')->getOne($v['uid'], $v['address_id']);
             foreach ($goods as $k1 => $v1) {
@@ -171,6 +208,7 @@ class Excel
                     $operdate,
 
                     $v['num'],
+                    $total_cash,
                     $v['price'],
                     $status[$v['status']],
                     $refund_status,