shish 5 年 前
コミット
bcdff16082

+ 0 - 3
app-mall/controllers/OrderController.php

@@ -331,9 +331,6 @@ class OrderController extends BaseController
 
         } elseif ($payWay == 1) {
             $extend = MerchantExtendService::getBySjId($sjId);
-            if (isset($extend['alipayInit']) == false || $extend['alipayInit'] == 0) {
-                util::fail('支付宝付款即将开通...');
-            }
             $config = [
                 //应用ID,您的APPID。
                 'app_id' => $extend['alipayPId'],

+ 9 - 0
app-mall/controllers/WxShareController.php

@@ -2,7 +2,16 @@
 
 namespace mall\controllers;
 
+use common\components\util;
+
 class WxShareController extends BaseController
 {
 
+    //取微信分享的参数 ssh 2020.2.22
+    public function actionGetParams()
+    {
+        $data = [];
+        util::success($data);
+    }
+
 }

+ 0 - 2
biz-hd/order/classes/OrderClass.php

@@ -275,10 +275,8 @@ class OrderClass extends BaseClass
 
             //客户下单增加商家可提现余额
             if (isset($order->customId) && !empty($order->customId)) {
-
                 $amount = $order->actPrice;
                 ShopClass::customKdAddBalance($shop, $amount, $order, $capitalType);
-
             }
             //门店和朋友圈订单并且没有填写收花人的直接将订单置为自取并且是完成状态
             if (in_array($order->fromType, [dict::getDict("fromType", "shop"), dict::getDict("fromType", "friend")])) {