diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php index 8ced1098..17bcd32a 100644 --- a/app/common/repositories/store/order/StoreOrderCreateRepository.php +++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php @@ -1061,7 +1061,16 @@ class StoreOrderCreateRepository extends StoreOrderRepository $order_cart['active'] = $cart['productDiscount']; $order_cart['activeSku'] = $cart['productDiscountAttr']; } - + $product_source_id=0; + $product_mer_id=0; + if($cart['source']==103){ + $old_product_id=Db::name('product')->where('product_id',$cart['product_id'])->value('old_product_id'); + if($old_product_id){ + $old_mer_id=Db::name('product')->where('product_id',$old_product_id)->value('mer_id'); + $product_mer_id=$old_mer_id; + $product_source_id=$old_product_id; + } + } $orderProduct[] = [ 'order_id' => $_order->order_id, 'cart_id' => $cart['cart_id'], @@ -1086,7 +1095,9 @@ class StoreOrderCreateRepository extends StoreOrderRepository 'product_type' => $cart['product_type'], 'source' => $cart['source'], 'source_id' => $cart['source_id'], - 'cart_info' => json_encode($order_cart) + 'cart_info' => json_encode($order_cart), + 'product_source_id' => $product_source_id, + 'product_mer_id' => $product_mer_id, ]; } diff --git a/app/controller/api/store/order/StoreProcessing.php b/app/controller/api/store/order/StoreProcessing.php new file mode 100644 index 00000000..87551f36 --- /dev/null +++ b/app/controller/api/store/order/StoreProcessing.php @@ -0,0 +1,36 @@ + 4) { + // $merchant_two = Db::name('merchant')->where('street_id', $codes[3])->where('type_id', 17)->where('category_id', $merchant['category_id'])->find(); + if ($order['source']==103) { + $datas = [ + 'master_mer_id' => $order['mer_id'], + 'mer_id' => $merchant_two['mer_id'], + 'order_id' => $order['order_id'], + 'status' => 0 + ]; + Db::name('store_order_behalf')->insert($datas); + } + // } + // } + } +} diff --git a/app/listener/paySuccess.php b/app/listener/paySuccess.php index 97934d87..048cd3e2 100644 --- a/app/listener/paySuccess.php +++ b/app/listener/paySuccess.php @@ -43,23 +43,7 @@ class paySuccess $storeConsumptionUserDao->check($event['groupOrder']['group_order_id']); } foreach ($orderList as $k => $order) { - // $merchant = Merchant::find($order['mer_id']); - //添加到代发订单表里 - // if ($merchant['type_id'] == Merchant::TypeSupplyChain) { - // $codes = explode(',', $order['user_address_code']); - // if (count($codes) > 4) { - // $merchant_two = Db::name('merchant')->where('street_id', $codes[3])->where('type_id', 17)->where('category_id', $merchant['category_id'])->find(); - // if ($merchant_two) { - // $datas = [ - // 'master_mer_id' => $order['mer_id'], - // 'mer_id' => $merchant_two['mer_id'], - // 'order_id' => $order['order_id'], - // 'status' => 0 - // ]; - // Db::name('store_order_behalf')->insert($datas); - // } - // } - // } + $this->recordOrderAddr($order); } } catch (\Exception $e) {