Wesmiler

app/Services/Api/OrderService.php

@@ -435,9 +435,10 @@ class OrderService extends BaseService
 
         // 订单信息
         $info = $this->model->where(['id' => $id, 'mark' => 1])
-            ->select(['id', 'order_no', 'pay_total', 'status'])
+            ->select(['id', 'order_no', 'pay_total','delivery_fee', 'status'])
             ->first();
         $orderTotal = isset($info['pay_total']) ? $info['pay_total'] : 0;
+        $deliveryFee = isset($info['delivery_fee']) ? $info['delivery_fee'] : 0;
         $orderNo = isset($info['order_no']) ? $info['order_no'] : '';
         $status = isset($info['status']) ? $info['status'] : 0;
         if (empty($info) || empty($orderNo)) {
@@ -457,7 +458,7 @@ class OrderService extends BaseService
         $payOrder = [
             'type' => 1,
             'order_no' => $orderNo,
-            'pay_money' => $orderTotal,
+            'pay_money' => moneyFormat($orderTotal + $deliveryFee),
             'body' => '购物消费',
             'openid' => $openid
         ];

app/Services/Common/OrderService.php

@@ -148,7 +148,8 @@ class OrderService extends BaseService
         $info = $info->toArray();
         $info['create_time'] = $info['create_time'] ? date('Y-m-d H:i:s', strtotime($info['create_time'])) : '';
         $info['update_time'] = $info['update_time'] ? date('Y-m-d H:i:s', strtotime($info['update_time'])) : '';
-
+        $info['real_total'] = $info['pay_total'];
+        $info['pay_total'] = moneyFormat($info['pay_total'] + $info['delivery_fee'],2);
         if (isset($info['order_goods'])) {
             foreach ($info['order_goods'] as &$goods) {
                 $goods['thumb'] = $goods['thumb'] ? get_image_url($goods['thumb']) : '';