zhaozhen преди 1 година
родител
ревизия
7920b46278
променени са 1 файла, в които са добавени 6 реда и са изтрити 6 реда
  1. 6 6
      app/Service/PopularizService.php

+ 6 - 6
app/Service/PopularizService.php

144
                             }
144
                             }
145
                         }
145
                         }
146
 
146
 
147
-                        $datum->newPayAmount   = round($orderData[$popu_info->playletActivityId]['newPayAmount']/10000, 2);
148
-                        $datum->oldPayAmount   = round($orderData[$popu_info->playletActivityId]['oldPayAmount']/10000, 2);
149
-                        $datum->otherPayAmount = round($otherOrderData[$popu_info->playletActivityId]['otherPayAmount']/10000, 2);
147
+                        $datum->newPayAmount   = round($datum->newPayAmount/10000, 2);
148
+                        $datum->oldPayAmount   = round($datum->oldPayAmount/10000, 2);
149
+                        $datum->otherPayAmount = round($datum->otherPayAmount/10000, 2);
150
                         $datum->newPayAvg      = $datum->newPayUv>0 ? round($datum->newPayPv/$datum->newPayUv, 2) : null;
150
                         $datum->newPayAvg      = $datum->newPayUv>0 ? round($datum->newPayPv/$datum->newPayUv, 2) : null;
151
                     } else {
151
                     } else {
152
                         $datum->viewUv         = null;
152
                         $datum->viewUv         = null;
328
                                 $datum->otherPayAmount += ($otherOrderData[$popu_info->playletActivityId]['otherPayAmount'] ?? 0);
328
                                 $datum->otherPayAmount += ($otherOrderData[$popu_info->playletActivityId]['otherPayAmount'] ?? 0);
329
                             }
329
                             }
330
                         }
330
                         }
331
-                        $datum->newPayAmount   = round($orderData[$popu_info->playletActivityId]['newPayAmount']/10000, 2);
332
-                        $datum->oldPayAmount   = round($orderData[$popu_info->playletActivityId]['oldPayAmount']/10000, 2);
333
-                        $datum->otherPayAmount = round($otherOrderData[$popu_info->playletActivityId]['otherPayAmount']/10000, 2);
331
+                        $datum->newPayAmount   = round($datum->newPayAmount/10000, 2);
332
+                        $datum->oldPayAmount   = round($datum->oldPayAmount/10000, 2);
333
+                        $datum->otherPayAmount = round($datum->otherPayAmount/10000, 2);
334
                         $datum->newPayAvg      = $datum->newPayUv>0 ? round($datum->newPayPv/$datum->newPayUv, 2) : null;
334
                         $datum->newPayAvg      = $datum->newPayUv>0 ? round($datum->newPayPv/$datum->newPayUv, 2) : null;
335
                     } else {
335
                     } else {
336
                         $datum->viewUv         = 0;
336
                         $datum->viewUv         = 0;