|
|
@@ -728,6 +728,12 @@ class StoreOrderRepository extends BaseRepository
|
|
728
|
728
|
$address_datas = Db::name("user_address")->where("address_id", $addressId)->find();
|
|
729
|
729
|
|
|
730
|
730
|
|
|
|
731
|
+ //计算用户选择的规格商品,根据商品计算商品利润
|
|
|
732
|
+
|
|
|
733
|
+ $cartId_datas = Db::name("store_cart")->where("cart_id", implode(',', array_column($cartInfo['list'], 'cart_id')))->find();
|
|
|
734
|
+
|
|
|
735
|
+ $product_attr_unique_datas = Db::name("store_product_attr_value")->where("unique", $cartId_datas['product_attr_unique'])->find();
|
|
|
736
|
+
|
|
731
|
737
|
|
|
732
|
738
|
//TODO 生成订单
|
|
733
|
739
|
$_order = [
|
|
|
@@ -770,7 +776,8 @@ class StoreOrderRepository extends BaseRepository
|
|
770
|
776
|
'seckill' => 0,
|
|
771
|
777
|
'youhui_price' => $order['youhui_price'],
|
|
772
|
778
|
'douhuomall' => 0,
|
|
773
|
|
- 'fzone_paytype' =>$fzone_paytype
|
|
|
779
|
+ 'fzone_paytype' =>$fzone_paytype,
|
|
|
780
|
+ 'con_pri' =>$product_attr_unique_datas['plate_mer_profit'],//计算商品选中的产品规格,然后计算利润,这个利润会在每周分红中进行分润
|
|
774
|
781
|
];
|
|
775
|
782
|
|
|
776
|
783
|
|
|
|
@@ -1136,7 +1143,7 @@ class StoreOrderRepository extends BaseRepository
|
|
1136
|
1143
|
$storeOrderProductRepository->insertAll($orderProduct);
|
|
1137
|
1144
|
|
|
1138
|
1145
|
//如果是组合支付就执行分润
|
|
1139
|
|
- if( $paystage_status = 1){
|
|
|
1146
|
+ if( $paystage_status == 1){
|
|
1140
|
1147
|
$this->dis_of($groupOrder->group_order_id,$group_sn1);
|
|
1141
|
1148
|
}
|
|
1142
|
1149
|
|
|
|
@@ -9003,7 +9010,8 @@ class StoreOrderRepository extends BaseRepository
|
|
9003
|
9010
|
$user_data = Db::name('user')->where('uid',$store_order_data['uid'])->find();
|
|
9004
|
9011
|
//var_dump($user_data['spread_uid']);
|
|
9005
|
9012
|
|
|
9006
|
|
- $concession_pri = $store_product_data['concession_pri'];//商家让利金额
|
|
|
9013
|
+ //$concession_pri = $store_product_data['concession_pri'];//商家让利金额
|
|
|
9014
|
+ $concession_pri = $store_order_data['con_pri'];
|
|
9007
|
9015
|
|
|
9008
|
9016
|
|
|
9009
|
9017
|
$spread_uid = 0;//下单用户上级uid
|