Merge branch 'master' into dev

biz-ghs/cg/classes/CgMergeClass.php

@@ -0,0 +1,14 @@
+<?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';
+
+}

biz-ghs/cg/classes/CgMergeSnClass.php

@@ -0,0 +1,14 @@
+<?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';
+
+}

biz-ghs/cg/models/CgMerge.php

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

biz-ghs/cg/models/CgMergeSn.php

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

biz-ghs/order/classes/OrderMergeClass.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace bizGhs\order\classes;
+
+use Yii;
+use bizGhs\base\classes\BaseClass;
+
+class OrderMergeClass extends BaseClass
+{
+	
+	public static $baseFile = '\bizGhs\order\models\OrderMerge';
+	
+}

biz-ghs/order/classes/OrderMergeSnClass.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace bizGhs\order\classes;
+
+use Yii;
+use bizGhs\base\classes\BaseClass;
+
+class OrderMergeSnClass extends BaseClass
+{
+	
+	public static $baseFile = '\bizGhs\order\models\OrderMergeSn';
+	
+}

biz-ghs/order/models/OrderMerge.php

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

biz-ghs/order/models/OrderMergeSn.php

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

biz-ghs/order/services/OrderService.php

@@ -224,7 +224,7 @@ class OrderService extends BaseService
         $xj = $data['xj'] ?? '';
         $treeData = $data['treeData'] ?? [];
         $book = $data['book'] ?? 0;
-		//后端开单，涉及花材满减，关键词 back_order_reach_discount_price
+        //后端开单，涉及花材满减，关键词 back_order_reach_discount_price
         $reachDiscountPrice = $data['reachDiscountPrice'] ?? 0;
         $wlName = $data['wlName'] ?? '';
         $cgMainId = $ghs['ownMainId'] ?? 0;
@@ -310,16 +310,6 @@ class OrderService extends BaseService
             PurchaseService::payAfter($purchase, $payWay);
             self::payAfter($returnOrder, $payWay);
 
-            //开历史订单
-            if (!empty($historyDate)) {
-                //$returnOrder->payTime = $currentPayTime;
-                //$returnOrder->save();
-                //有修改账单日期需要更新到欠款变动明细，财务好对账，多个地方要同步修改，关键词 to_change_custom_debt_pay_time
-
-                //找到当前订单客户的账单日期为 $date 的所有订单，然后更新同天内的所有订单的 sameTimeIds（加此次要改变的订单的订单号$id），有多处调用，关键词 update_same_ids
-                //OrderClass::updateSameTimeIds($returnOrder, $historyDate);
-            }
-
             //不是预订单，并且供货商不是源花汇、小明鲜花、淄博花超、云漫梦金鹏、海翔，则订单直接完成掉。是预订单，则确认发货时直接完成掉。有多个地方要修改，请搜索关键词zjFinish
             if (isset($returnOrder->book) && $returnOrder->book == 0) {
                 $ghsShopId = $ghs['shopId'] ?? 0;
@@ -912,7 +902,8 @@ class OrderService extends BaseService
         StatKhCgClass::replace($order, $amount);
 
         //当天同个人同地址的订单汇总
-        OrderClass::updateSameTimeIds($order, substr($order->payTime, 0, 10));
+        $prefixDate = substr($order->payTime, 0, 10);
+        OrderClass::updateSameTimeIds($order, $prefixDate);
     }
 
     //发起退款