Merge branch 'master' into dev

biz-ghs/order/classes/OrderClass.php

@@ -3156,6 +3156,7 @@ XL;
                     self::updateByIds($oldSameTimeIdsArr, ['sameTimeIds' => $oldSameTimeIdsStr]);
                 }
             }
+            noticeUtil::push("orderId = {$id}, oldSameTimeIds: {$oldSameTimeIds}, sameTimeIdsStr: {$sameTimeIdsStr}");
         }
     }
 

biz-ghs/order/services/OrderService.php

@@ -903,7 +903,6 @@ class OrderService extends BaseService
 
         //当天同个人同地址的订单汇总
         OrderClass::updateSameTimeIds($order, date("Y-m-d"));
-
     }
 
     //发起退款