Ver código fonte

Merge branch 'master' of https://git.bjtdba.com/shop/php

chengzhiyixia 1 ano atrás
pai
commit
5d23631f8b

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

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