|
|
@@ -178,7 +178,7 @@ class StoreGroupOrderRepository extends BaseRepository
|
|
178
|
178
|
}
|
|
179
|
179
|
|
|
180
|
180
|
// 3、逻辑处理
|
|
181
|
|
- (new \think\facade\Db)->startTrans();
|
|
|
181
|
+ Db::startTrans();
|
|
182
|
182
|
try {
|
|
183
|
183
|
// 软 删除订单组
|
|
184
|
184
|
$storeGroupOrderEntity->setIsDel(StoreGroupOrderEnum::IS_DEL['Yes']['code']);
|
|
|
@@ -189,9 +189,9 @@ class StoreGroupOrderRepository extends BaseRepository
|
|
189
|
189
|
$storeOrderRepository->closeStoreOrder($storeOrderEntity, $uid, $changeMessage, $remark);
|
|
190
|
190
|
}
|
|
191
|
191
|
|
|
192
|
|
- (new \think\facade\Db)->commit();
|
|
|
192
|
+ Db::commit();
|
|
193
|
193
|
} catch (DbException $e) {
|
|
194
|
|
- (new \think\facade\Db)->rollback();
|
|
|
194
|
+ Db::rollback();
|
|
195
|
195
|
}
|
|
196
|
196
|
|
|
197
|
197
|
// $groupOrder = $this->search(['paid' => 0, 'uid' => $uid ?: ''])->where('group_order_id', $id)->with(['orderList'])->find();
|
|
|
@@ -798,7 +798,7 @@ class StoreGroupOrderRepository extends BaseRepository
|
|
798
|
798
|
->setFzonePaytype($storeOrderCreateRequestEntity->getFzonePayType());
|
|
799
|
799
|
|
|
800
|
800
|
// 4、写入数据
|
|
801
|
|
- (new \think\facade\Db)->startTrans();
|
|
|
801
|
+ Db::startTrans();
|
|
802
|
802
|
try {
|
|
803
|
803
|
// 4.1 更细库存
|
|
804
|
804
|
foreach ($productStockList as $item) {
|
|
|
@@ -878,9 +878,9 @@ class StoreGroupOrderRepository extends BaseRepository
|
|
878
|
878
|
$storeGroupOrderRepository->storeGroupOrderPaySuccess($storeGroupOrderEntity->getGroupOrderId());
|
|
879
|
879
|
}
|
|
880
|
880
|
|
|
881
|
|
- (new \think\facade\Db)->commit();
|
|
|
881
|
+ Db::commit();
|
|
882
|
882
|
} catch (DbException $e) {
|
|
883
|
|
- (new \think\facade\Db)->rollback();
|
|
|
883
|
+ Db::rollback();
|
|
884
|
884
|
Log::error('StoreGroupOrderRepository-createStoreGroupOrder:' . $e->getMessage());
|
|
885
|
885
|
}
|
|
886
|
886
|
return ['order_id' => $storeGroupOrderEntity->getGroupOrderId(), 'groupOrder' => $storeGroupOrderEntity->toArray()];
|