|
|
@@ -2,27 +2,14 @@
|
|
|
|
|
|
namespace app\admin\controller\box;
|
|
|
|
|
|
-
|
|
|
-use app\admin\model\SystemAdmin;
|
|
|
use app\common\model\BoxMidHandleModel;
|
|
|
-use app\common\model\BoxModel;
|
|
|
-use app\common\model\BoxRecordModel;
|
|
|
-use app\common\model\CouponAreaModel;
|
|
|
-use app\common\model\CouponPlanModel;
|
|
|
-use app\common\model\ShopCategory;
|
|
|
use app\admin\traits\Curd;
|
|
|
use app\common\controller\AdminController;
|
|
|
use app\common\model\ShopGoodsModel;
|
|
|
use app\common\model\ThirddataLogModel;
|
|
|
use app\common\model\ThirddataModel;
|
|
|
-use Darabonba\GatewaySpi\Models\InterceptorContext\request;
|
|
|
-use EasyAdmin\annotation\ControllerAnnotation;
|
|
|
-use EasyAdmin\annotation\NodeAnotation;
|
|
|
-use jobs\SystemMiddleOpenBox;
|
|
|
use think\App;
|
|
|
-use utils\Queue;
|
|
|
use think\facade\Db;
|
|
|
-use think\Model;
|
|
|
|
|
|
/**
|
|
|
* Class Admin
|
|
|
@@ -31,9 +18,6 @@ use think\Model;
|
|
|
*/
|
|
|
class HandleBoxAction extends AdminController
|
|
|
{
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
public function __construct(App $app)
|
|
|
{
|
|
|
parent::__construct($app);
|
|
|
@@ -78,20 +62,6 @@ class HandleBoxAction extends AdminController
|
|
|
return json($data);
|
|
|
|
|
|
}
|
|
|
-//
|
|
|
-// if (!Db::name('box_mid_handle')->where('id', '>', 0)->find()){
|
|
|
-// $redis = new \think\cache\driver\Redis();
|
|
|
-// $redis->connect('127.0.0.1', 6379);
|
|
|
-//// has_handle_mapping 是否在进行队列跑数据 0 没有 1 有
|
|
|
-// if ($redis->get('has_handle_mapping') == 0){
|
|
|
-// Queue::instance()->log('确定手动执行匹配福袋')->do('SystemHandleBox')->job(SystemMiddleOpenBox::class)->push([1]);
|
|
|
-// $redis->set('has_handle_mapping',1);
|
|
|
-// return $this->fetch();
|
|
|
-// }
|
|
|
-//
|
|
|
-//
|
|
|
-// }
|
|
|
-
|
|
|
|
|
|
return $this->fetch();
|
|
|
}
|
|
|
@@ -126,22 +96,6 @@ class HandleBoxAction extends AdminController
|
|
|
|
|
|
}
|
|
|
|
|
|
-// if ($box_type == 0){
|
|
|
-//
|
|
|
-//
|
|
|
-// }
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-// // 空盒 原路返回
|
|
|
-// if ($val['pay_type'] == 1){
|
|
|
-// edit_user_score(2, $val['uid'], env('boxsetting.ONE_BOX_PRICE'));
|
|
|
-// }
|
|
|
-// if ($val['pay_type'] == 2){
|
|
|
-// edit_user_money(3, $val['uid'], env('boxsetting.ONE_BOX_PRICE'));
|
|
|
-// }
|
|
|
-
|
|
|
-
|
|
|
// 把记录表改变状态
|
|
|
Db::name('box_record')->where('id', '>', 0)->save([
|
|
|
'status'=>2
|
|
|
@@ -150,14 +104,7 @@ class HandleBoxAction extends AdminController
|
|
|
}
|
|
|
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
|
|
|
|