瀏覽代碼

一些功能

Kirin 4 年之前
父節點
當前提交
8949fcd9fe
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 1 1
      app/api/controller/PublicController.php
  2. 3 3
      app/models/store/StoreOrder.php

+ 1 - 1
app/api/controller/PublicController.php

@@ -60,7 +60,7 @@ class PublicController
             if (!$orderKey) return app('json')->fail('生成订单错误!');
             if (StoreOrder::be(['order_id|unique' => $orderKey, 'uid' => $uid, 'is_del' => 0]))
                 return app('json')->fail('订单已生成');
-            $order = StoreOrder::cacheKeyCreateOrder($uid, $orderKey, 0, 'offline', false, 0, '系统后台订单', 0, 0, 0, 0, 0, $exchange_id, false, 1, 1, '', '', 0, 0, 1);
+            $order = StoreOrder::cacheKeyCreateOrder($uid, $orderKey, 0, 'wechat', false, 0, '系统后台订单', 0, 0, 0, 0, 0, $exchange_id, false, 1, 1, '', '', 0, 0, 1);
 //            StoreOrder::paySuccess($order);
             if ($order === false) return app('json')->fail(StoreOrder::getErrorInfo('订单生成失败'));
             else return app('json')->success('订单已生成');

+ 3 - 3
app/models/store/StoreOrder.php

@@ -487,9 +487,9 @@ class StoreOrder extends BaseModel
                 'total_postage' => $priceGroup['storePostage'],
                 'coupon_id' => $couponId,
                 'coupon_price' => $couponPrice,
-                'pay_price' => $payPrice,
-                'pay_postage' => $payPostage,
-                'pay_postage_sh' => $payPostageSh,
+                'pay_price' => ($store_order && $payType == 'wechat') ? 0 : $payPrice,
+                'pay_postage' => ($store_order && $payType == 'wechat') ? 0 : $payPostage,
+                'pay_postage_sh' => ($store_order && $payType == 'wechat') ? 0 : $payPostageSh,
                 'distance' => $distance,
                 'deduction_price' => $deductionPrice,
                 'paid' => 0,