Commit d59a585c by jack

更新

parent d5a103f5
...@@ -69,6 +69,7 @@ public function handle(array $input) ...@@ -69,6 +69,7 @@ public function handle(array $input)
Log::add('分账给平台成功', ['recond_id' => $recordObj->id]); Log::add('分账给平台成功', ['recond_id' => $recordObj->id]);
$recordObj->remark = $remark; $recordObj->remark = $remark;
$recordObj->payconfirm_no = $result['order_no']; $recordObj->payconfirm_no = $result['order_no'];
$recordObj->is_div = 1;
$recordObj->save(); $recordObj->save();
} }
......
...@@ -50,11 +50,10 @@ public function add(Request $request) ...@@ -50,11 +50,10 @@ public function add(Request $request)
Log::add('订单商品评论' . $og_id, ['num' => $count]); Log::add('订单商品评论' . $og_id, ['num' => $count]);
if ($count == 0) { if ($count == 0) {
if ($useObj->spuid || $useObj->merchant_id) { if ($useObj->spuid || $useObj->merchant_id) {
$orderObj->is_commission = 1; //$orderObj->is_commission = 1;
$orderObj->order_status = 4; $orderObj->order_status = 4;
$orderObj->save(); $orderObj->save();
} }
// Log::add('调用分佣', $orderObj->toArray());
// $this->dispatch(new AutoCompleteOrder($orderObj, 10)); // $this->dispatch(new AutoCompleteOrder($orderObj, 10));
} }
DB::commit(); DB::commit();
......
...@@ -140,7 +140,7 @@ public function CreateBuyOrder(Request $request) ...@@ -140,7 +140,7 @@ public function CreateBuyOrder(Request $request)
$orderObj->delivery_type = $delivery_type; $orderObj->delivery_type = $delivery_type;
$orderObj->merchant_id = $merchant_id; $orderObj->merchant_id = $merchant_id;
$orderObj->store_id = $store_id; $orderObj->store_id = $store_id;
$orderObj->is_commission = ($spuid || $merchant_id) ? 1 : 0; //$orderObj->is_commission = ($spuid || $merchant_id) ? 1 : 0;
if ($orderObj->save()) { if ($orderObj->save()) {
$order_id = $orderObj->id; $order_id = $orderObj->id;
foreach ($orderGoods as $key => $item) { foreach ($orderGoods as $key => $item) {
...@@ -250,7 +250,7 @@ public function CreateOrder(Request $request) ...@@ -250,7 +250,7 @@ public function CreateOrder(Request $request)
$orderObj->delivery_type = $delivery_type; $orderObj->delivery_type = $delivery_type;
$orderObj->merchant_id = $merchant_id; $orderObj->merchant_id = $merchant_id;
$orderObj->store_id = $store_id; $orderObj->store_id = $store_id;
$orderObj->is_commission = ($spuid || $merchant_id) ? 1 : 0; //$orderObj->is_commission = ($spuid || $merchant_id) ? 1 : 0;
if ($orderObj->save()) { if ($orderObj->save()) {
$order_id = $orderObj->id; $order_id = $orderObj->id;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment