family 1 год назад
Родитель
Сommit
fa6fcbbb49
1 измененных файлов с 4 добавлено и 5 удалено
  1. 4 5
      app/common/repositories/store/order/StoreOrderRepository.php

+ 4 - 5
app/common/repositories/store/order/StoreOrderRepository.php

@@ -10060,8 +10060,6 @@ class StoreOrderRepository extends BaseRepository
10060 10060
             $merchantInfo = $merchant->get($store_order_data['mer_id']);
10061 10061
             // 1企业2个体3个人
10062 10062
             if ($merchantInfo && !empty($store_order_data) && in_array($merchantInfo['type'], [2, 3])) {
10063
-//                $job_par = json_decode($store_order_data['fzone_paytype'], true);
10064
-
10065 10063
                 //商家让利部分的拆分
10066 10064
                 $ylj_pri = round($concession_pri * 0.3, 2); // 让利部分30%给消费者做养老金
10067 10065
                 $pv = round($concession_pri * 0.35, 2); // 35%做业绩PV分配
@@ -10073,8 +10071,9 @@ class StoreOrderRepository extends BaseRepository
10073 10071
                 $score = $user_data['score'] + $pv;
10074 10072
 
10075 10073
                 // 让利部分30%给消费者做养老金{$ylj_pri}
10076
-                $this->bill_user_log($user_data['uid'], $ylj_pri, $store_order_data['order_id'], 5, $group_order['group_order_sn'], '消费获得养老金' . $ylj_pri, $store_order_data['mer_id'], 0);
10077
-                // 消费者购买商品赠送PV等值的积分和贡献值
10074
+                $this->bill_user_log($user_data['uid'], $ylj_pri, $store_order_data['order_id'], 5, $group_order['group_order_sn'], '购买商贸区商品获得养老金' . $ylj_pri, $store_order_data['mer_id'], 0);
10075
+                // @todo 消费者购买商品赠送PV等值的积分和贡献值
10076
+                // 贡献值
10078 10077
                 $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送贡献值");
10079 10078
                 // 积分
10080 10079
                 $this->score_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送积分");
@@ -10174,7 +10173,7 @@ class StoreOrderRepository extends BaseRepository
10174 10173
                         $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 12, "商贸区商品赠送贡献值");
10175 10174
                         //积分
10176 10175
                         $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 12, "商贸区商品赠送积分");
10177
-                        // //推广佣金
10176
+                        //推广佣金
10178 10177
                         $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id'], 0);
10179 10178
                         //养老金
10180 10179
                         $this->bill_user_log($spread_data['uid'], round($pv * 0.05, 2), $store_order_data['order_id'], 5, $group_order['group_order_sn'], '推广获得养老金' . round($pv * 0.05, 2), $store_order_data['mer_id'], 0);