WIN-2308041133\Administrator 3 ماه پیش
والد
کامیت
8d6501920b

+ 2 - 1
app/common/dao/user/AwardIntegralPriceDayDao.php

@@ -17,6 +17,7 @@ namespace app\common\dao\user;
 use app\common\dao\BaseDao;
 use app\common\model\BaseModel;
 use app\common\model\user\AwardIntegralPrice;
+use app\common\model\user\AwardIntegralPriceDay;
 
 /**
  * Class UserLabelDao
@@ -34,7 +35,7 @@ class AwardIntegralPriceDayDao extends BaseDao
      */
     protected function getModel(): string
     {
-        return AwardIntegralPrice::class;
+        return AwardIntegralPriceDay::class;
     }
 
     public function search($where)

+ 6 - 4
app/common/repositories/user/AwardIntegralPriceRepository.php

@@ -75,16 +75,17 @@ class AwardIntegralPriceRepository extends BaseRepository
         $num = $userService->search(['status' => 1])->sum('award_integral');
         $sum_achievement = bcadd((string)$commission, (string)$achievement, 6);
         $rise = $num > 0 ? bcdiv($sum_achievement, $num, 6) : 0;
+        $add_price = 0;
         if ($rise >0){
             //       增长值分成25份
-            $add_price = bcdiv($rise, 25, 6);
+            $day_25_rise = bcdiv($rise, 25, 6);
             /** @var AwardIntegralPriceDayDao $AwardIntegralPriceDayDao */
             $AwardIntegralPriceDayDao = app()->make(AwardIntegralPriceDayDao::class);
-            $AwardIntegralPriceDayDao->create(['day' => strtotime('-25 day'), 'price' => $rise,'add_price'=>$add_price]);  //保存今天增长的总价格和每日增长价格
+            $AwardIntegralPriceDayDao->create(['day' => strtotime('-25 day'), 'price' => $rise,'add_price'=>$day_25_rise]);  //保存今天增长的总价格和每日增长价格
             $day_25 =strtotime('-25 day');
-            $day_25_rise = $AwardIntegralPriceDayDao->search(['day' => $day])->sum('price');
+            $add_price = $AwardIntegralPriceDayDao->search(['day' => $day_25])->sum('price');
         }
-        $price = bcadd($day_25_rise, $basePrice, 6);
+        $price = bcadd($add_price, $basePrice, 6);
 
         @file_put_contents('quanju4.txt', time()."-正常获取走的到这里吗\r\n",8);
         return compact('basePrice', 'price', 'rise', 'achievement', 'commission', 'num','add_price');
@@ -93,6 +94,7 @@ class AwardIntegralPriceRepository extends BaseRepository
     public function setPrice($day, $price, $commission, $achievement, $num,$add_price)
     {
         $add_time = time();
+        @file_put_contents('quanju4.txt', $add_price."-我add_price呢\r\n",8);
         return $this->dao->create(compact('day', 'price', 'commission', 'achievement', 'num', 'add_time','add_price'));
     }
     /**

+ 1 - 0
crmeb/listens/AutoSavePriceListen.php

@@ -34,6 +34,7 @@ class AutoSavePriceListen extends TimerService implements ListenerInterface
             if (!isset($yesterday['basePrice'])) {
                 return;
             }
+
             $service->setPrice($day, $yesterday['price'], $yesterday['commission'], $yesterday['achievement'], $yesterday['num'],$yesterday['add_price']);
         });
     }