hefei пре 1 година
родитељ
комит
c083660b20

+ 3 - 2
app/command/PensionTasks.php

@@ -95,7 +95,6 @@ class PensionTasks extends Command
95
         if($cursor) {
95
         if($cursor) {
96
             foreach ($cursor as $bill) {
96
             foreach ($cursor as $bill) {
97
                 $type_shop = $bill['type_shop'] ?? 0;
97
                 $type_shop = $bill['type_shop'] ?? 0;
98
-
99
                 switch ($type_shop){
98
                 switch ($type_shop){
100
                     case "0":
99
                     case "0":
101
                         $online = $cursor = Db::table('rrx_store_order')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->where('paid', 1)->find();
100
                         $online = $cursor = Db::table('rrx_store_order')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->where('paid', 1)->find();
@@ -130,7 +129,9 @@ class PensionTasks extends Command
130
                     default:
129
                     default:
131
                         $online = Db::table('rrx_store_order')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->where('paid', 1)->find();
130
                         $online = Db::table('rrx_store_order')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->where('paid', 1)->find();
132
                 }
131
                 }
133
-
132
+                if($bill['uid'] == 1611){
133
+                    var_dump($online);die;
134
+                }
134
                 if (!$online) {
135
                 if (!$online) {
135
                     Log::info($bill['uid'] . '查询不到订单');
136
                     Log::info($bill['uid'] . '查询不到订单');
136
                     continue;
137
                     continue;

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

@@ -9829,7 +9829,7 @@ class StoreOrderRepository extends BaseRepository
9829
                 $pv = bcmul($concession_pri, 0.35, 2); // 35%做业绩PV分配
9829
                 $pv = bcmul($concession_pri, 0.35, 2); // 35%做业绩PV分配
9830
 
9830
 
9831
                 // 让利部分30%给消费者做养老金{$ylj_pri}
9831
                 // 让利部分30%给消费者做养老金{$ylj_pri}
9832
-                $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);
9832
+                $this->bill_user_log($user_data['uid'], $ylj_pri, $store_order_data['order_id'], 5, $store_order_data['order_sn'], '购买商贸区商品获得养老金' . $ylj_pri, $store_order_data['mer_id'], 0);
9833
                 // 购买商贸区赠送贡献值
9833
                 // 购买商贸区赠送贡献值
9834
                 $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送贡献值");
9834
                 $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送贡献值");
9835
                 // 购买商贸区赠送PV值
9835
                 // 购买商贸区赠送PV值
@@ -9857,9 +9857,9 @@ class StoreOrderRepository extends BaseRepository
9857
                         //积分
9857
                         //积分
9858
                         $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 12, "推广商贸区商品赠送积分");
9858
                         $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 12, "推广商贸区商品赠送积分");
9859
                         //推广佣金
9859
                         //推广佣金
9860
-                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
9860
+                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
9861
                         //养老金
9861
                         //养老金
9862
-                        $this->bill_user_log($spread_data['uid'], bcmul($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);
9862
+                        $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.05, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '推广获得养老金' . round($pv * 0.05, 2), $store_order_data['mer_id'], 0);
9863
                     }
9863
                     }
9864
 
9864
 
9865
                     //普通用户推广人
9865
                     //普通用户推广人
@@ -9872,7 +9872,7 @@ class StoreOrderRepository extends BaseRepository
9872
                         $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
9872
                         $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
9873
 
9873
 
9874
                         //推广佣金
9874
                         //推广佣金
9875
-                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
9875
+                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
9876
                         // 贡献值
9876
                         // 贡献值
9877
                         $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 12, "推广商贸区商品赠送贡献值");
9877
                         $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 12, "推广商贸区商品赠送贡献值");
9878
                         // 积分
9878
                         // 积分
@@ -9890,7 +9890,7 @@ class StoreOrderRepository extends BaseRepository
9890
                         $fgj_amount_10 = bcmul($pv * 0.1, 0.05, 2);//推广者的佣金抽10%到个人复购金
9890
                         $fgj_amount_10 = bcmul($pv * 0.1, 0.05, 2);//推广者的佣金抽10%到个人复购金
9891
                         $this->fugou_user_log($merchant_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
9891
                         $this->fugou_user_log($merchant_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
9892
                         //推广佣金
9892
                         //推广佣金
9893
-                        $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
9893
+                        $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
9894
                     }
9894
                     }
9895
                     /** @var OrderMerchantRepository $orderMerchantRepository */
9895
                     /** @var OrderMerchantRepository $orderMerchantRepository */
9896
                     $orderMerchantRepository = app()->make(OrderMerchantRepository::class);
9896
                     $orderMerchantRepository = app()->make(OrderMerchantRepository::class);

+ 2 - 2
app/controller/api/Notify.php

@@ -626,7 +626,7 @@ class Notify
626
                                     $pv = bcmul($concession_pri, 0.35, 2); // 35%做业绩PV分配
626
                                     $pv = bcmul($concession_pri, 0.35, 2); // 35%做业绩PV分配
627
 
627
 
628
                                     // 让利部分30%给消费者做养老金{$ylj_pri}
628
                                     // 让利部分30%给消费者做养老金{$ylj_pri}
629
-                                    $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);
629
+                                    $this->bill_user_log($user_data['uid'], $ylj_pri, $store_order_data['order_id'], 5, $store_order_data['order_sn'], '购买商贸区商品获得养老金' . $ylj_pri, $store_order_data['mer_id'], 0);
630
                                     // 购买商贸区赠送贡献值
630
                                     // 购买商贸区赠送贡献值
631
                                     $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送贡献值");
631
                                     $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送贡献值");
632
                                     // 购买商贸区赠送PV值
632
                                     // 购买商贸区赠送PV值
@@ -682,7 +682,7 @@ class Notify
682
                                             $fgj_amount_10 = bcmul($pv * 0.1, 0.05, 2);//推广者的佣金抽10%到个人复购金
682
                                             $fgj_amount_10 = bcmul($pv * 0.1, 0.05, 2);//推广者的佣金抽10%到个人复购金
683
                                             $this->fugou_user_log($merchant_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
683
                                             $this->fugou_user_log($merchant_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
684
                                             //推广佣金
684
                                             //推广佣金
685
-                                            $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得佣金', $user_data['mer_id'], 0);
685
+                                            $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $user_data['mer_id'], 0);
686
                                         }
686
                                         }
687
                                     }
687
                                     }
688
 
688