shish 2 ヶ月 前
コミット
10f17755b7

+ 0 - 14
biz-ghs/cg/classes/CgMergeClass.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace bizGhs\cg\classes;
-
-use bizGhs\base\classes\BaseClass;
-use common\components\util;
-use Yii;
-
-class CgMergeClass extends BaseClass
-{
-
-    public static $baseFile = '\bizGhs\cg\models\CgMerge';
-
-}

+ 0 - 14
biz-ghs/cg/classes/CgMergeSnClass.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace bizGhs\cg\classes;
-
-use bizGhs\base\classes\BaseClass;
-use common\components\util;
-use Yii;
-
-class CgMergeSnClass extends BaseClass
-{
-
-    public static $baseFile = '\bizGhs\cg\models\CgMergeSn';
-
-}

+ 0 - 13
biz-ghs/cg/models/CgMerge.php

@@ -1,13 +0,0 @@
-<?php
-namespace bizGhs\cg\models;
-use bizGhs\base\models\Base;
-
-class CgMerge extends Base
-{
-
-    public static function tableName()
-    {
-        return 'xhGhsCgMerge';
-    }
-
-}

+ 0 - 13
biz-ghs/cg/models/CgMergeSn.php

@@ -1,13 +0,0 @@
-<?php
-namespace bizGhs\cg\models;
-use bizGhs\base\models\Base;
-
-class CgMergeSn extends Base
-{
-
-    public static function tableName()
-    {
-        return 'xhGhsCgMergeSn';
-    }
-
-}

+ 29 - 0
biz-hd/cg/classes/CgMergeClass.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace bizHd\cg\classes;
+
+use biz\shop\classes\ShopCapitalClass;
+use biz\shop\classes\ShopExtClass;
+use bizHd\ghs\classes\GhsClass;
+use bizHd\purchase\classes\PurchaseClass;
+use bizHd\purchase\classes\PurchaseItemClass;
+use bizHd\shop\classes\MainClass;
+use bizGhs\stock\classes\StockRecordClass;
+use bizHd\shop\classes\ShopClass;
+use bizHd\wx\classes\WxOpenClass;
+use common\components\dict;
+use common\components\noticeUtil;
+use common\components\orderSn;
+use common\components\util;
+use Yii;
+use bizGhs\base\classes\BaseClass;
+use bizGhs\order\traits\OrderTrait;
+use bizGhs\product\classes\ProductClass;
+use common\components\lakala\Lakala;
+
+class CgMergeClass extends BaseClass
+{
+
+    public static $baseFile = '\bizHd\cg\models\CgMerge';
+
+}

+ 29 - 0
biz-hd/cg/classes/CgMergeSnClass.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace bizHd\cg\classes;
+
+use biz\shop\classes\ShopCapitalClass;
+use biz\shop\classes\ShopExtClass;
+use bizHd\ghs\classes\GhsClass;
+use bizHd\purchase\classes\PurchaseClass;
+use bizHd\purchase\classes\PurchaseItemClass;
+use bizHd\shop\classes\MainClass;
+use bizGhs\stock\classes\StockRecordClass;
+use bizHd\shop\classes\ShopClass;
+use bizHd\wx\classes\WxOpenClass;
+use common\components\dict;
+use common\components\noticeUtil;
+use common\components\orderSn;
+use common\components\util;
+use Yii;
+use bizGhs\base\classes\BaseClass;
+use bizGhs\order\traits\OrderTrait;
+use bizGhs\product\classes\ProductClass;
+use common\components\lakala\Lakala;
+
+class CgMergeSnClass extends BaseClass
+{
+
+    public static $baseFile = '\bizHd\cg\models\CgMergeSn';
+
+}

+ 15 - 0
biz-hd/cg/models/CgMerge.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace bizHd\cg\models;
+
+use bizHd\base\models\Base;
+
+class CgMerge extends Base
+{
+
+    public static function tableName()
+    {
+        return 'xhCgMerge';
+    }
+
+}

+ 15 - 0
biz-hd/cg/models/CgMergeSn.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace bizHd\cg\models;
+
+use bizHd\base\models\Base;
+
+class CgMergeSn extends Base
+{
+
+    public static function tableName()
+    {
+        return 'xhCgMergeSn';
+    }
+
+}

+ 26 - 0
common/components/orderSn.php

@@ -12,7 +12,9 @@ use bizGhs\ghs\classes\GhsRechargeSnClass;
 use bizGhs\live\classes\LiveOrderSnClass;
 use bizGhs\order\classes\GiveSnClass;
 use bizGhs\order\classes\OrderClass;
+use bizGhs\order\classes\OrderMergeSnClass;
 use bizHd\cg\classes\AcceptSnClass;
+use bizHd\cg\classes\CgMergeSnClass;
 use bizHd\cg\classes\CgRefundSnClass;
 use bizHd\common\classes\MobileSnClass;
 use bizHd\express\classes\ExpressSnClass;
@@ -39,6 +41,30 @@ use yii\imagine\Image;
 class orderSn
 {
 
+    public static function getGhsOrderMergeId()
+    {
+        $data = [];
+        $data['id'] = null;
+        $respond = OrderMergeSnClass::add($data);
+        $id = $respond['id'] ?? 0;
+        if (empty($id)) {
+            util::fail('单号没有生成');
+        }
+        return $id;
+    }
+
+    public static function getCgMergeId()
+    {
+        $data = [];
+        $data['id'] = null;
+        $respond = CgMergeSnClass::add($data);
+        $id = $respond['id'] ?? 0;
+        if (empty($id)) {
+            util::fail('单号没有生成');
+        }
+        return $id;
+    }
+
     public static function getGhsExpressSn($data)
     {
         $prefix = 'EX_CS';