diff --git a/app/common/repositories/store/order/StoreOtherOrderRepository.php b/app/common/repositories/store/order/StoreOtherOrderRepository.php index 355c6a7b..e7fafff6 100755 --- a/app/common/repositories/store/order/StoreOtherOrderRepository.php +++ b/app/common/repositories/store/order/StoreOtherOrderRepository.php @@ -188,7 +188,7 @@ class StoreOtherOrderRepository extends BaseRepository $order->transaction_id = $subOrders[$order->order_sn]['transaction_id']; } $presell = false; - + // 订单的类型 0 发货 1 自提 if ($order->order_type == 1 && $order->status != 10) { $order->verify_code = $this->verifyCode(); @@ -231,7 +231,7 @@ class StoreOtherOrderRepository extends BaseRepository $_order_rate = 0; - //平台手续费 + //平台手续费 if ($order['commission_rate'] > 0) { $commission_rate = ($order['commission_rate'] / 100); @@ -244,7 +244,7 @@ class StoreOtherOrderRepository extends BaseRepository } if (!$presell) { - + if ($order['commission_rate'] > 0) { $finance[] = [ 'order_id' => $order->order_id, @@ -320,7 +320,7 @@ class StoreOtherOrderRepository extends BaseRepository $this->giveIntegral($groupOrder); $financialRecordRepository->insertAll($finance); $storeOrderStatusRepository->batchCreateLog($orderStatus); - $groupOrder->save(); + $groupOrder->save(); Db::commit(); return true; @@ -332,7 +332,7 @@ class StoreOtherOrderRepository extends BaseRepository } } - + /** * @return string @@ -957,10 +957,10 @@ class StoreOtherOrderRepository extends BaseRepository return $data; } - - + + public function runDelivery($id, $merId, $data, $split, $method, $service_id = 0) { return Db::transaction(function () use ($id, $merId, $data, $split, $method, $service_id) { @@ -1063,7 +1063,7 @@ class StoreOtherOrderRepository extends BaseRepository return $data; } - + public function getOne($id, ?int $merId) @@ -1280,10 +1280,12 @@ class StoreOtherOrderRepository extends BaseRepository 'order_charge_lv'=>$item->merchant->commission_rate?round($item->merchant->commission_rate,2):0, ]; if(in_array($status,[4,5])){ - $item['merchant']= Db::name('merchant')->where('mer_id',$item['mer_id'])->field('mer_id,mer_name,is_trader,financial_bank,auto_margin_rate,commission_rate')->find(); + $merchant = Db::name('merchant')->where('mer_id',$item['mer_id'])->field('mer_id,mer_name,is_trader,financial_bank,auto_margin_rate,commission_rate')->find(); }else{ - $item['merchant']= Db::name('merchant')->where('uid',$item['uid'])->where('status',1)->field('mer_id,mer_name,is_trader,financial_bank,auto_margin_rate,commission_rate')->find(); + $merchant = Db::name('merchant')->where('uid',$item['uid'])->where('status',1)->field('mer_id,mer_name,is_trader,financial_bank,auto_margin_rate,commission_rate')->find(); } + $merchant['financial_bank'] = json_decode($merchant['financial_bank'], true); + $item['merchant'] = $merchant; }); return compact('count', 'list'); } @@ -1504,7 +1506,7 @@ class StoreOtherOrderRepository extends BaseRepository return ExpressService::express($order->delivery_id, $order->delivery_name, $order->user_phone); } - + public function batchPrinter(int $id, int $merId) { $order = $this->dao->getWhere(['order_id' => $id], '*', ['orderProduct', 'merchant' => function ($query) { @@ -1662,7 +1664,7 @@ class StoreOtherOrderRepository extends BaseRepository return $count - $count_ - $count__; } - + /** * @param $id @@ -1738,7 +1740,7 @@ class StoreOtherOrderRepository extends BaseRepository return $query->select(); } - + public function create_product_import_log($data, $status = 1) { $data = [