From a22de0f4f57b2fbab4a4bb46edbd84363a40b28d Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sun, 27 Mar 2022 23:32:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=B5=A0=E9=80=81=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/Crontab.php |  6 +++++-
 app/service/CrontabService.php | 29 +++++++++++++++++------------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/app/api/controller/Crontab.php b/app/api/controller/Crontab.php
index 66d5403cd..fc341c729 100644
--- a/app/api/controller/Crontab.php
+++ b/app/api/controller/Crontab.php
@@ -70,7 +70,11 @@ class Crontab extends Common
     public function GoodsGiveIntegral()
     {
         $ret = CrontabService::GoodsGiveIntegral();
-        return 'sucs:'.$ret['data']['sucs'].', fail:'.$ret['data']['fail'];
+        if($ret['code'] == 0)
+        {
+            return 'sucs:'.$ret['data']['sucs'].', fail:'.$ret['data']['fail'];
+        }
+        return $ret['msg'];
     }
 }
 ?>
\ No newline at end of file
diff --git a/app/service/CrontabService.php b/app/service/CrontabService.php
index aa215cafd..f3e2503c6 100644
--- a/app/service/CrontabService.php
+++ b/app/service/CrontabService.php
@@ -212,21 +212,26 @@ class CrontabService
                 Db::startTrans();
                 if(Db::name('GoodsGiveIntegralLog')->where(['id'=>$v['id'], 'status'=>0])->update($upd_data))
                 {
-                    // 扣减用户锁定积分
-                    if(!Db::name('User')->where(['id'=>$v['user_id']])->dec('locking_integral', $v['integral'])->update())
+                    // 用户是否存在
+                    $count = (int) Db::name('User')->where(['id'=>$v['user_id']])->count();
+                    if($count > 0)
                     {
-                        return DataReturn('用户锁定积分扣减失败['.$v['id'].'-'.$v['user_id'].']', -2);
-                    }
+                        // 扣减用户锁定积分
+                        if(!Db::name('User')->where(['id'=>$v['user_id']])->dec('locking_integral', $v['integral'])->update())
+                        {
+                            return DataReturn('用户锁定积分扣减失败['.$v['id'].'-'.$v['user_id'].']', -2);
+                        }
 
-                    // 增加用户有效积分
-                    $user_integral = Db::name('User')->where(['id'=>$v['user_id']])->value('integral');
-                    if(!Db::name('User')->where(['id'=>$v['user_id']])->inc('integral', $v['integral'])->update())
-                    {
-                        return DataReturn('用户有效积分增加失败['.$v['id'].'-'.$v['user_id'].']', -3);
-                    }
+                        // 增加用户有效积分
+                        $user_integral = Db::name('User')->where(['id'=>$v['user_id']])->value('integral');
+                        if(!Db::name('User')->where(['id'=>$v['user_id']])->inc('integral', $v['integral'])->update())
+                        {
+                            return DataReturn('用户有效积分增加失败['.$v['id'].'-'.$v['user_id'].']', -3);
+                        }
 
-                    // 积分日志
-                    IntegralService::UserIntegralLogAdd($v['user_id'], $user_integral, $v['integral'], '订单商品赠送', 1);
+                        // 积分日志
+                        IntegralService::UserIntegralLogAdd($v['user_id'], $user_integral, $v['integral'], '订单商品赠送', 1);
+                    }
 
                     // 提交事务
                     Db::commit();