Merge remote-tracking branch 'origin/develop' into develop

application/api/model/GiveGift.php

@@ -1041,6 +1041,9 @@ class GiveGift extends Model
      */
     public function give_gift($uid,$to_uid,$gid,$num,$from_type,$type,$from_id = 0,$pit_number = 0,$change_type = 0,$ext = [])
     {
+        $res = model("api/SendGift")->send_gift($uid,$to_uid,$gid,$num,$num,$from_id);
+        return $res;
+
         return ['code' => 0, 'msg' => '送礼失败，请更新APP！', 'data' => null];
 
 

application/cron/controller/Subsidy.php

@@ -161,7 +161,7 @@ class Subsidy
                     'createtime' => time(),
                 ];
 //                echo "工会".$value['id']."生成数据:流水金额：{$transaction} 补贴比例：{$subsidy_ratio}% 补贴金额：{$subsidy_amount}\n";
-                 $subsidy_id = Db::name('vs_guild_subsidy_1')->insertGetId($data);
+                 $subsidy_id = Db::name('vs_guild_subsidy')->insertGetId($data);
                  if ($subsidy_id) {
                      echo "工会".$value['id']."生成成功(补贴ID：".$subsidy_id." 补贴金额：".$subsidy_amount.")\n";
                      $data_count++;