family 1 anno fa
parent
commit
503f40fa57

+ 2 - 0
app/common/repositories/store/order/StoreOrderRepository.php

@@ -2351,6 +2351,8 @@ class StoreOrderRepository extends BaseRepository
2351
 
2351
 
2352
                 }
2352
                 }
2353
             } else if ($store_product_datas['mer_id'] == 491) {
2353
             } else if ($store_product_datas['mer_id'] == 491) {
2354
+//                $productSku = Db::name('store_product_attr_value')->where('product_id', $good_id)->order('price asc')->find();
2355
+//                $pv = $productSku['plate_mer_profit']??0.00;
2354
                 //复购区
2356
                 //复购区
2355
                 $pv = round($orderpri * 0.3, 2);
2357
                 $pv = round($orderpri * 0.3, 2);
2356
                 $yanglao = round($pv * 0.5, 2);//给预下订单中的商品展示 养老金 显示作用
2358
                 $yanglao = round($pv * 0.5, 2);//给预下订单中的商品展示 养老金 显示作用

+ 2 - 2
app/common/repositories/user/UserThirdRepository.php

@@ -298,7 +298,7 @@ class UserThirdRepository extends BaseRepository
298
     public function repurchaseAreaEstimateAnnuityOrder($order_id, $commission, $pid, $order_sn, $type, $table)
298
     public function repurchaseAreaEstimateAnnuityOrder($order_id, $commission, $pid, $order_sn, $type, $table)
299
     {
299
     {
300
         //用户商家信息
300
         //用户商家信息
301
-        $user_mer = $this->getMer($pid);
301
+//        $user_mer = $this->getMer($pid);
302
         try {
302
         try {
303
             $money=$commission;
303
             $money=$commission;
304
             //返佣比例
304
             //返佣比例
@@ -318,7 +318,7 @@ class UserThirdRepository extends BaseRepository
318
                 "order_sn"=>$order_sn,
318
                 "order_sn"=>$order_sn,
319
                 "order_id"=>$order_id,
319
                 "order_id"=>$order_id,
320
                 "uid"=>$pid,
320
                 "uid"=>$pid,
321
-                "mer_id"=>$user_mer,
321
+                "mer_id"=>Db::name("store_order")->where("order_id",$order_id)->value("mer_id"),
322
                 "total_price"=>$commission,
322
                 "total_price"=>$commission,
323
                 "extension_one"=>$extension_one,
323
                 "extension_one"=>$extension_one,
324
                 "type_shop"=>$type,
324
                 "type_shop"=>$type,