|
|
@@ -146,8 +146,12 @@ class Notify
|
|
146
|
146
|
|
|
147
|
147
|
//找到对应的商品id(product_id)
|
|
148
|
148
|
$store_order_product_data = Db::name('store_order_product')->where('order_id',$store_order_data['order_id'])->find();
|
|
|
149
|
+
|
|
149
|
150
|
//找到对应的商品让利金额或比例
|
|
150
|
151
|
$store_product_data = Db::name('store_product')->where('product_id',$store_order_product_data['product_id'])->find();
|
|
|
152
|
+ //找到对应的商品id的规格
|
|
|
153
|
+ $store_product_attr_value = Db::name('store_product_attr_value')->where('product_id', $store_order_product_data['product_id'])->find();
|
|
|
154
|
+
|
|
151
|
155
|
//下单用户
|
|
152
|
156
|
$user_data = Db::name('user')->where('uid',$store_order_data['uid'])->find();
|
|
153
|
157
|
|
|
|
@@ -682,7 +686,7 @@ class Notify
|
|
682
|
686
|
}
|
|
683
|
687
|
/** @var OrderMerchantRepository $orderMerchantRepository */
|
|
684
|
688
|
$orderMerchantRepository = app()->make(OrderMerchantRepository::class);
|
|
685
|
|
- $jdAndGonxianConfig = $orderMerchantRepository->getMerchantContribution($store_order_data['extension_one']);
|
|
|
689
|
+ $jdAndGonxianConfig = $orderMerchantRepository->getMerchantContribution($store_product_attr_value['extension_one']);
|
|
686
|
690
|
|
|
687
|
691
|
//商户获得贡献值 ---- 3月29日 商户不再获得贡献值 改为获得分润值
|
|
688
|
692
|
// if ($concession_pri >= 0.01) {
|