Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev

app/common/Enum.php

@@ -19,6 +19,10 @@ class Enum
     const WHOLESALE_ONLY = 1; //仅批发
     const RETAIL_WHOLESALE = 2; //零售和批发
 
+    /** 购物车下单支付**/
+    const  public = 10;//对公账户
+
+
     /** @const MAP */
     const MAP = [
         self::SALE_TYPE_RETAIL => '零售',

app/common/repositories/store/order/StoreOrderCreateRepository.php

@@ -976,6 +976,21 @@ class StoreOrderCreateRepository extends StoreOrderRepository
                 }
             }
         }
+
+        //对公转账
+        if ($pay_type == Enum::public) {
+            $order_extend = [
+                'bank_info' => [
+                    'company_name' => '泸州里海农业科技有限公司',
+                    'corporate_account' => '22170201040004168',
+                    'corporate_bank' => '中国农业银行股份有限公司泸州石洞支行',
+                    'corporate_bank_address' => '泸州市江阳区分水岭镇振兴路03号1－2－1号',
+                ],
+                'corporate_voucher' => '',
+            ];
+        }
+
+
         if ($hasTake) {
             app()->make(UserAddressValidate::class)->scene('take')->check($post);
         }

app/common/repositories/store/order/StoreOrderRepository.php

@@ -83,7 +83,7 @@ class StoreOrderRepository extends BaseRepository
     /**
      * 支付类型 0余额 1 微信 2 小程序 3 微信 4 支付宝 5 支付宝 6 微信 7 四川农信 8 信用购 9 商户余额
      */
-    const PAY_TYPE = ['balance', 'weixin', 'routine', 'h5', 'alipay', 'alipayQr', 'weixinQr', 'scrcu', 'creditBuy', 'merBalance'];
+    const PAY_TYPE = ['balance', 'weixin', 'routine', 'h5', 'alipay', 'alipayQr', 'weixinQr', 'scrcu', 'creditBuy', 'merBalance','public'];
     const PAY_TYPE_FILTEER = [
       0 => 0,
       1 => '1,2,3,6',
@@ -2580,6 +2580,8 @@ class StoreOrderRepository extends BaseRepository
             ->field('a.value_id,a.product_id,a.mer_id,a.sku,a.stock,a.image,a.price,
             a.svip_price,
             a.unique,p.store_name,p.store_info');
+
+
         $list = $data->limit(100)->select();
         $count = $data->count();
         $minMoney = bcsub($money, 600, 2);