zhaozhen 1 anno fa
parent
commit
7920b46278
1 ha cambiato i file con 6 aggiunte e 6 eliminazioni
  1. 6 6
      app/Service/PopularizService.php

+ 6 - 6
app/Service/PopularizService.php

@@ -144,9 +144,9 @@ class PopularizService
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 150
                         $datum->newPayAvg      = $datum->newPayUv>0 ? round($datum->newPayPv/$datum->newPayUv, 2) : null;
151 151
                     } else {
152 152
                         $datum->viewUv         = null;
@@ -328,9 +328,9 @@ class PopularizService
328 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 334
                         $datum->newPayAvg      = $datum->newPayUv>0 ? round($datum->newPayPv/$datum->newPayUv, 2) : null;
335 335
                     } else {
336 336
                         $datum->viewUv         = 0;