Browse Source

暂时关闭登录验证码,新增测试接口

Kirin 1 year ago
parent
commit
b5e778e85e

+ 0 - 4
app/jobs/integral/IntegralJob.php

@@ -18,17 +18,14 @@ class IntegralJob extends BaseJobs
 
     public function dealOrderIntegral($order)
     {
-        Log::info('开始处理积分奖池');
         /** @var UserAwardIntegralServices $awardIntegralService */
         $awardIntegralService = app()->make(UserAwardIntegralServices::class);
         $integral_price = $awardIntegralService->getPrice($order['id']);
         $total_price = $order['total_price'];
-        Log::info('订单金额' . $total_price);
         try {
             //添加静态积分
             $static_integral_ratio = sys_config('static_integral_ratio', 0);
             $give_static_integral = bcdiv(bcmul($total_price, $static_integral_ratio), 100, 2);
-            Log::info('静态积分' . $give_static_integral);
             if ($give_static_integral > 0) {
                 $rate = sys_config('static_integral_rate', 3);
                 $extract_sum = bcmul($total_price, $rate, 2);
@@ -38,7 +35,6 @@ class IntegralJob extends BaseJobs
             //添加奖池
             $lake_ratio = sys_config('lake_ratio', 0);
             $add_lake = bcdiv(bcmul($total_price, $lake_ratio), 100, 2);
-            Log::info('奖池' . $add_lake);
             if ($add_lake > 0) {
                 $mark = '用户' . $order['uid'] . '购买商品,添加资金池';
                 $awardIntegralService->addLake($add_lake, $order['id'], $mark);

+ 8 - 5
app/services/user/UserAwardIntegralServices.php

@@ -84,13 +84,16 @@ class UserAwardIntegralServices extends BaseServices
      */
     public function getPrice(int $link_id = 0)
     {
+        $price = 0;
         if ($link_id > 0) {
             $info = $this->dao->getOne(['link_id' => $link_id]);
-            if ($info) return (string)($info['price'] ?: 0);
+            if ($info) $price = (string)($info['price'] ?: 0);
+        }
+        if ($price <= 0) {
+            $lake_sum = $this->getLake();
+            $sum_integral = $this->getIntegralSum(['status' => 0]);
+            return (string)($sum_integral > 0 ? bcdiv((string)$lake_sum, (string)$sum_integral, 8) : 1);
         }
-        $lake_sum = $this->getLake();
-        $sum_integral = $this->getIntegralSum(['status' => 0]);
-        return (string)($sum_integral > 0 ? bcdiv((string)$lake_sum, (string)$sum_integral, 8) : 1);
     }
 
 
@@ -130,7 +133,7 @@ class UserAwardIntegralServices extends BaseServices
      */
     public function addLake(string $total, int $link_id = 0, string $mark = '')
     {
-        return $this->dao->save([
+        return $this->lake_dao->save([
             'num' => $total,
             'link_id' => $link_id,
             'mark' => $mark