赠送积分模块

@@ -15,10 +15,14 @@ class IntegralController extends HomeBaseController
 {
     public function autoExecute() {
         $model = new IntegralModel;
-        $give = Db::name('zj_integral_give')->where(['balance'=>['neq', 0]])->field('id,uid,balance,ratio')->select();
+        $give = Db::name('zj_integral_give')->where(['balance'=>['neq', 0]])->field('id,uid,balance,total,ratio')->select();
         foreach ($give as $item) {
-            $give_balance = (int)($item['balance'] * $item['ratio'] / 100);
+            $give_balance = (int)($item['total'] * $item['ratio'] / 100);
             $remain_balance = $item['balance'] - $give_balance;
+            if($remain_balance <= $give_balance) {
+                $give_balance = $remain_balance;
+                $remain_balance = 0;
+            }
             Db::name('user')->where(['id'=>$item['uid']])->setInc('balance', $give_balance);
             $model->insertIntegralLog($item['id'], $item['uid'], time(), $give_balance, 1);
             $model->updateIntegralGive($item['id'], $remain_balance);

@@ -38,15 +38,17 @@ class IntegralModel extends Model
      * @param $uid
      * @param $ratio
      * @param $balance
+     * @param $total
      * @param $create_time
-     * @return bool
+     * @return bool|string
      */
-    public function insertIntegralGive($uid, $ratio, $balance, $create_time)
+    public function insertIntegralGive($uid, $ratio, $balance, $total, $create_time)
     {
         $data = [
             'uid' => $uid,
             'create_time' => $create_time,
             'balance' => $balance,
+            'total' => $total,
             'ratio' => $ratio
         ];
         if (Db::name('zj_integral_give')->insert($data)) {

@@ -261,7 +261,7 @@ class PayController extends HomeBaseController
                 //插入配送计划表，先将此积分的一半立刻给用户，剩余一半每日按固定百分比给用户，直到发完为止
                 $integral_half = $integral / 2;
                 Db::startTrans();
-                $integral_give_id = $model->insertIntegralGive(session('user.id'), $ratio, $integral_half, time());
+                $integral_give_id = $model->insertIntegralGive(session('user.id'), $ratio, $integral_half, $integral, time());
                 if ($integral_give_id) {
                     if ($model->insertIntegralLog($integral_give_id, session('user.id'), time(), $integral_half, 1)) {
                         if(Db::name('user')->where(['id'=>session('user.id')])->setInc('balance', $integral_half)) {