订单提交金额bug优化

application/service/BuyService.php

@@ -745,10 +745,10 @@ class BuyService
             'receive_address'       => $address['address'],
             'user_note'             => isset($params['user_note']) ? htmlentities($params['user_note']) : '',
             'status'                => (intval(MyC('common_order_is_booking', 0)) == 1) ? 0 : 1,
-            'preferential_price'    => $buy['data']['base']['preferential_price'],
-            'increase_price'        => $buy['data']['base']['increase_price'],
-            'price'                 => $buy['data']['base']['total_price'],
-            'total_price'           => $buy['data']['base']['actual_price'],
+            'preferential_price'    => ($buy['data']['base']['preferential_price'] <= 0.00) ? 0.00 : $buy['data']['base']['preferential_price'],
+            'increase_price'        => ($buy['data']['base']['increase_price'] <= 0.00) ? 0.00 : $buy['data']['base']['increase_price'],
+            'price'                 => ($buy['data']['base']['total_price'] <= 0.00) ? 0.00 : $buy['data']['base']['total_price'],
+            'total_price'           => ($buy['data']['base']['actual_price'] <= 0.00) ? 0.00 : $buy['data']['base']['actual_price'],
             'extension_data'        => empty($buy['data']['extension_data']) ? '' : json_encode($buy['data']['extension_data']),
             'payment_id'            => isset($params['payment_id']) ? intval($params['payment_id']) : 0,
             'add_time'              => time(),

application/service/OrderService.php

@@ -740,6 +740,12 @@ class OrderService
                                 $excel_export_items .= '购买数量：'.$vs['buy_number']."\n";
                                 $excel_export_items .= "\n";
                             }
+
+                            // 是否获取售后信息
+                            // if($is_orderaftersale == 1)
+                            // {
+                            //     $items['orderaftersale'] = Db::name('OrderAftersale')->where(['order_detail_id'=>$vs['id']])->find();
+                            // }
                         }
                     } else {
                         $buy_number_count = Db::name('OrderDetail')->where(['order_id'=>$v['id']])->sum('buy_number');