|
@@ -1386,7 +1386,6 @@ class OrderClass extends BaseClass
|
|
|
|
|
|
|
|
if (isset($data['list']) && !empty($data['list'])) {
|
|
if (isset($data['list']) && !empty($data['list'])) {
|
|
|
foreach ($data['list'] as $key => $val) {
|
|
foreach ($data['list'] as $key => $val) {
|
|
|
-
|
|
|
|
|
//同个人同地址当天订单数
|
|
//同个人同地址当天订单数
|
|
|
$sameTimeIds = $val['sameTimeIds'] ?? '';
|
|
$sameTimeIds = $val['sameTimeIds'] ?? '';
|
|
|
$sameNum = 0;
|
|
$sameNum = 0;
|
|
@@ -3107,7 +3106,12 @@ XL;
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // 更新同天内的所有订单的 sameTimeIds
|
|
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 更新同天内的所有订单的 sameTimeIds
|
|
|
|
|
+ * @param $order
|
|
|
|
|
+ * @param $date 账单日期
|
|
|
|
|
+ * @throws \Exception
|
|
|
|
|
+ */
|
|
|
public static function updateSameTimeIds($order, $date)
|
|
public static function updateSameTimeIds($order, $date)
|
|
|
{
|
|
{
|
|
|
$id = $order->id ?? 0;
|
|
$id = $order->id ?? 0;
|
|
@@ -3115,7 +3119,7 @@ XL;
|
|
|
$mainId = $order->mainId ?? 0;
|
|
$mainId = $order->mainId ?? 0;
|
|
|
$oldSameTimeIds = $order->sameTimeIds ?? '';
|
|
$oldSameTimeIds = $order->sameTimeIds ?? '';
|
|
|
|
|
|
|
|
- //找到当前订单客户的账单日期为 $date 的所有订单,然后更新同天内的所有订单的 sameTimeIds(加此次要改变的订单的订单号$id)
|
|
|
|
|
|
|
+ //找到当前客户的账单日期为 $date 的所有订单,然后更新同天内的所有订单的 sameTimeIds(加此次要改变的订单的订单号$id)
|
|
|
$startTime = $date . ' 00:00:00';
|
|
$startTime = $date . ' 00:00:00';
|
|
|
$endTime = $date . ' 23:59:59';
|
|
$endTime = $date . ' 23:59:59';
|
|
|
$dayOrders = self::getAllByCondition([
|
|
$dayOrders = self::getAllByCondition([
|
|
@@ -3142,12 +3146,12 @@ XL;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//从原先同天内的订单中删除此次要改变的订单的订单号$id
|
|
//从原先同天内的订单中删除此次要改变的订单的订单号$id
|
|
|
- $oldSameTimeIdsArr = explode(',', $oldSameTimeIds);
|
|
|
|
|
- if (in_array($id, $oldSameTimeIdsArr)) {
|
|
|
|
|
- $oldSameTimeIdsArr = array_diff($oldSameTimeIdsArr, [$id]);
|
|
|
|
|
- $oldSameTimeIdsStr = implode(',', $oldSameTimeIdsArr);
|
|
|
|
|
- if (!empty($oldSameTimeIdsArr)) {
|
|
|
|
|
- self::updateByIds($oldSameTimeIdsArr, ['sameTimeIds' => $oldSameTimeIdsStr]);
|
|
|
|
|
|
|
+ $newSameTimeIdsArr = explode(',', $oldSameTimeIds);
|
|
|
|
|
+ if (in_array($id, $newSameTimeIdsArr)) {
|
|
|
|
|
+ $newSameTimeIdsArr = array_diff($newSameTimeIdsArr, [$id]);
|
|
|
|
|
+ $newSameTimeIdsStr = implode(',', $newSameTimeIdsArr);
|
|
|
|
|
+ if (!empty($newSameTimeIdsArr)) {
|
|
|
|
|
+ self::updateByIds($newSameTimeIdsArr, ['sameTimeIds' => $newSameTimeIdsStr]);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|