shish 5 лет назад
Родитель
Сommit
c55ac9101a

+ 3 - 2
app-hd/controllers/OrderController.php

@@ -285,7 +285,7 @@ class OrderController extends BaseController
         OrderService::checkBeforePay($order, $this->adminId);
 
         $name = isset($order['orderName']) && !empty($order['orderName']) ? $order['orderName'] : '购买商品';
-        $totalFee = $order['actPrice'];
+        $totalFee = $order['realPrice'];
 
         //小程序使用miniOpenId
         if (httpUtil::isMiniProgram()) {
@@ -379,6 +379,7 @@ class OrderController extends BaseController
         $post['discountType'] = $discountData['discountType'];
         $post['discountAmount'] = $discountData['discountAmount'];
         $post['actPrice'] = $actPrice;
+        $post['realPrice'] = $actPrice;
         $post['payStyle'] = 0;
         $post['sjId'] = $this->sjId;
         $now = time();
@@ -479,7 +480,7 @@ class OrderController extends BaseController
             require_once($alipayWap . '/wappay/service/AlipayTradeService.php');
             require_once($alipayWap . '/wappay/buildermodel/AlipayTradeWapPayContentBuilder.php');
 
-            $totalFee = $order['actPrice'];
+            $totalFee = $order['realPrice'];
             $out_trade_no = $orderSn;//商户订单号,商户网站订单系统中唯一订单号,必填
             $subject = '购买商品';//订单名称,必填
             $total_amount = $totalFee;//付款金额,必填

+ 4 - 2
app-mall/controllers/OrderController.php

@@ -103,6 +103,7 @@ class OrderController extends BaseController
             $post['fromType'] = dict::getDict('fromType', 'mall');
             $post['prePrice'] = $prePrice;
             $post['actPrice'] = $actPrice;
+            $post['realPrice'] = $actPrice;
             $order = OrderClass::addOrder($post);
             $orderId = $order['id'];
             $orderSn = $order['orderSn'];
@@ -197,7 +198,7 @@ class OrderController extends BaseController
         OrderService::checkBeforePay($order, $this->userId);
 
         $name = isset($order['orderName']) && !empty($order['orderName']) ? $order['orderName'] : '购买商品';
-        $totalFee = $order['actPrice'];
+        $totalFee = $order['realPrice'];
 
         //小程序使用miniOpenId
         $openId = $this->user['miniOpenId'];
@@ -269,6 +270,7 @@ class OrderController extends BaseController
         $post['discountType'] = $discountData['discountType'];
         $post['discountAmount'] = $discountData['discountAmount'];
         $post['actPrice'] = $actPrice;
+        $post['realPrice'] = $actPrice;
         $post['payStyle'] = 0;
         $post['sjId'] = $this->sjId;
         $now = time();
@@ -388,7 +390,7 @@ class OrderController extends BaseController
             require_once($aliWap . '/wappay/service/AlipayTradeService.php');
             require_once($aliWap . '/wappay/buildermodel/AlipayTradeWapPayContentBuilder.php');
 
-            $totalFee = $order['actPrice'];
+            $totalFee = $order['realPrice'];
             $out_trade_no = $orderSn;//商户订单号,商户网站订单系统中唯一订单号,必填
             $subject = '购买商品';//订单名称,必填
             $total_amount = $totalFee;//付款金额,必填

+ 1 - 1
biz-ghs/express/services/DadaExpressServices.php

@@ -121,7 +121,7 @@ class DadaExpressServices
             'shop_no' => $shopNo,
             'origin_id' => $orderSn,
             'city_code' => '0592', //厦门  暂写死
-            'cargo_price' => (float)$orderInfo['actPrice'], //订单金额(单位:元) 实际支付价格?
+            'cargo_price' => (float)$orderInfo['realPrice'], //订单金额(单位:元) 实际支付价格?
             'is_prepay' => 0, // 是否需要垫付 1:是 0:否 (垫付订单金额,非运费)
             'receiver_name' => $orderInfo['customName'], //收货人姓名
             'receiver_address' => $orderInfo['fullAddress'], //收货人地址