Merge branch 'develop' of ssh://8.134.10.79:222/Leadfyy.co/hainan into develop

MySQL_change.sql

@@ -282,6 +282,8 @@ ALTER TABLE `suppliers`
 ALTER TABLE `orders`
 	ADD COLUMN `pay_user_id` INT NOT NULL DEFAULT 0 COMMENT '支付用户的user_id（跳转到外部小程序支付时用到）' AFTER `agent_cloud_price`;
 
+
+
 # 18:47 2021/9/11
 ALTER TABLE `agents`
 	CHANGE COLUMN `appid` `appid` VARCHAR(30) NULL COMMENT '微信AppID' COLLATE 'utf8_general_ci' AFTER `remember_token`,
@@ -289,6 +291,34 @@ ALTER TABLE `agents`
 	CHANGE COLUMN `mchid` `mchid` VARCHAR(32) NULL COMMENT '微信支付mch_id' COLLATE 'utf8_general_ci' AFTER `appsecret`,
 	CHANGE COLUMN `mchkey` `mchkey` CHAR(32) NULL COMMENT '微信支付key' COLLATE 'utf8_general_ci' AFTER `mchid`;
 
+CREATE TABLE `mini_program_drafts` (
+	`draft_id` INT(10) NOT NULL COMMENT '腾讯开放平台的草稿ID',
+	`user_version` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '版本号' COLLATE 'utf8_general_ci',
+	`user_desc` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '描述' COLLATE 'utf8_general_ci',
+	`source_miniprogram_appid` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '模板小程序APPID' COLLATE 'utf8_general_ci',
+	`source_miniprogram` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '来源小程序' COLLATE 'utf8_general_ci',
+	`developer` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '开发者' COLLATE 'utf8_general_ci',
+	`create_time` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT '草稿创建时间',
+	`is_create_template` TINYINT(3) NOT NULL DEFAULT '0' COMMENT '是否已创建模板，0:否，1:是',
+	PRIMARY KEY (`draft_id`) USING BTREE
+)
+COMMENT='第三方平台草稿列表'
+COLLATE='utf8_general_ci'
+ENGINE=InnoDB;
+
+CREATE TABLE `mini_program_events` (
+	`id` BIGINT(19) NOT NULL AUTO_INCREMENT,
+	`type` TINYINT(3) NOT NULL DEFAULT '0' COMMENT '0:授权事件接收；1:消息与事件接收',
+	`response` TEXT NULL DEFAULT NULL COMMENT '所有请求信息' COLLATE 'utf8mb4_bin',
+	`event` VARCHAR(255) NULL DEFAULT NULL COLLATE 'utf8mb4_bin',
+	`appid` VARCHAR(50) NULL DEFAULT NULL COMMENT 'msg_event时才会记录' COLLATE 'utf8mb4_bin',
+	`created_at` TIMESTAMP NULL DEFAULT NULL,
+	PRIMARY KEY (`id`) USING BTREE
+)
+COMMENT='第三方平台事件接收记录'
+COLLATE='utf8mb4_bin'
+ENGINE=InnoDB;
+
 CREATE TABLE `mini_program_templates` (
 	`template_id` INT(10) NOT NULL,
 	`user_version` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '版本号' COLLATE 'utf8_general_ci',
@@ -300,7 +330,7 @@ CREATE TABLE `mini_program_templates` (
 	`create_time` INT(10) UNSIGNED NOT NULL DEFAULT '0',
 	PRIMARY KEY (`template_id`) USING BTREE
 )
-COMMENT='小程序模板列表'
+COMMENT='第三方平台模板列表'
 COLLATE='utf8_general_ci'
 ENGINE=InnoDB;
 
@@ -308,9 +338,13 @@ CREATE TABLE `mini_program_upload_logs` (
 	`id` INT(10) NOT NULL AUTO_INCREMENT,
 	`agent_id` INT(10) NOT NULL COMMENT '代理商ID',
 	`appid` VARCHAR(50) NOT NULL COMMENT '代理商APPID' COLLATE 'utf8_general_ci',
+	`user_version` VARCHAR(20) NOT NULL COMMENT '版本号' COLLATE 'utf8_general_ci',
 	`template_id` INT(10) NOT NULL COMMENT '小程序template_id',
 	`qrcode` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '小程序上传后获取到的二维码' COLLATE 'utf8_general_ci',
-	`created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+	`audit_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0' COMMENT '审核ID',
+	`is_success` TINYINT(3) NOT NULL DEFAULT '-1' COMMENT '0:审核成功； 1:审核被拒绝； 2:审核中； 3:已撤回； 4:审核延后',
+	`created_at` TIMESTAMP NULL DEFAULT NULL,
+	`updated_at` TIMESTAMP NULL DEFAULT NULL,
 	PRIMARY KEY (`id`) USING BTREE,
 	INDEX `agent_id` (`agent_id`) USING BTREE
 )
@@ -324,10 +358,6 @@ ALTER TABLE `agents`
 	ADD COLUMN `legal_persona_name` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '法人姓名' AFTER `contact_phone`,
 	ADD COLUMN `legal_persona_wechat` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '法人微信号' AFTER `legal_persona_name`;
 
-# 15:34 2021/9/13
-ALTER TABLE `auth_event`
-	ADD COLUMN `appid` VARCHAR(50) NULL DEFAULT NULL AFTER `id`;
-
 # 17:02 2021/9/13
 ALTER TABLE `user_money_logs`
 	CHANGE COLUMN `money` `money` DECIMAL(20,2) NOT NULL COMMENT '变动金额，正数=平台收入，负数=平台支出' AFTER `agent_id`;

app/Admin/Controllers/AgentController.php

@@ -3,6 +3,7 @@
 namespace App\Admin\Controllers;
 
 use App\Admin\Extensions\Grid\AuditAgent;
+use App\Admin\Extensions\Grid\MiniProgramAuditStatus;
 use App\Admin\Extensions\Grid\MiniProgramReg;
 use App\Admin\Extensions\Grid\MiniProgramUpload;
 use App\Admin\Repositories\Agent;
@@ -25,7 +26,7 @@ class AgentController extends AdminController
      */
     protected function grid()
     {
-        return Grid::make(new Agent(), function (Grid $grid) {
+        return Grid::make(new Agent(['miniUpload']), function (Grid $grid) {
 			$grid->disableDeleteButton();
 
 			//如果是审核页面，多加where条件判断
@@ -47,6 +48,7 @@ class AgentController extends AdminController
 			$grid->column('created_at');
 
 			$grid->column('status', '状态')
+				->style('min-width:7em;')
 				->help('新用户入驻时，请先注册小程序。待企业法人认证通过之后，再上传小程序即可')
 				->using(UserStatus::array())
 				->dot([
@@ -67,8 +69,12 @@ class AgentController extends AdminController
 					if (empty($this->appid)) { //注册小程序
 						$column->append((new MiniProgramReg(null, 1))->setKey($this->id))->append(' ');
 						$column->append((new MiniProgramReg(null, 2))->setKey($this->id));
-					} else {
+					} else if (empty($this->miniUpload)) {
 						$column->append((new MiniProgramUpload(null, 1))->setKey($this->id));
+					} else if ($this->miniUpload->is_success == 0) {
+						$column->append("已发布{$this->miniUpload->template_id}");
+					} else {
+						$column->append((new MiniProgramAuditStatus(null, 1))->setKey($this->id));
 					}
 				});
 

app/Admin/Extensions/Grid/MiniProgramAuditStatus.php

@@ -1,20 +1,16 @@
 <?php
 
 namespace App\Admin\Extensions\Grid;
-use App\Common\UserStatus;
 use App\Models\AdminSetting;
 use App\Models\Agent;
 use App\Models\MiniProgramTemplate;
 use App\Models\MiniProgramUploadLog;
-use App\Models\Supplier;
-use Dcat\Admin\Admin;
 use Dcat\Admin\Grid\RowAction;
 use EasyWeChat\Factory;
 use EasyWeChat\Kernel\Exceptions\InvalidConfigException;
 use EasyWeChat\OpenPlatform\Authorizer\MiniProgram\Code\Client;
 use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
 
 /**
  * 查询小程序发布后某个版本的审核状态
@@ -52,6 +48,8 @@ class MiniProgramAuditStatus extends RowAction
 		$log = MiniProgramUploadLog::where(['agent_id' => $agent->id, 'template_id' => $template_id])->orderBy('id', 'desc')->first();
 		if (!$log) {
 			return $this->response()->error('该代理商未上传及发布过最新版本的小程序');
+		} else if (!$log->audit_id){
+			return $this->response()->error('未找到审核记录audit_id');
 		}
 
 		try {
@@ -76,7 +74,10 @@ class MiniProgramAuditStatus extends RowAction
 
 			$res = $code->getAuditStatus($log->audit_id);
 			if (isset($res['errcode'], $res['errmsg'], $res['status']) && $res['errcode'] == 0 && $res['errmsg'] == 'ok') {
-				$statusArr = ['审核成功', '审核被拒绝', '审核中', '已撤回', '审核延后'];
+				$statusArr = [0 => '审核成功', 1 => '审核被拒绝', 2 => '审核中', 3 => '已撤回', 4 => '审核延后'];
+				//保存审核状态
+				$log->is_success = $res['status'];
+				$log->save();
 				if (isset($statusArr[$res['status']])) {
 					return $this->response()->success($statusArr[$res['status']])->refresh();
 				} else {

app/Http/Controllers/Api/MiniProgramController.php

@@ -18,7 +18,13 @@ class MiniProgramController extends Controller
 	// 第三方平台授权事件通知
 	public function authEvent(Request $request)
 	{
-		DB::table('mini_program_events')->insert(['response' => json_encode($request->all()), 'created_at' => now()]);
+		DB::table('mini_program_events')
+			->insert([
+				'type' => 0,
+				'response' => json_encode($request->all()),
+				'event' => 'all',
+				'created_at' => now(),
+			]);
 
 		$setting = AdminSetting::val(['service_appid', 'service_appsecret', 'service_token', 'service_aeskey']);
 		$config = [ // 第三方平台信息
@@ -35,7 +41,9 @@ class MiniProgramController extends Controller
 		// 处理授权更新事件：Guard::EVENT_UPDATE_AUTHORIZED
 		// 处理授权取消事件：Guard::EVENT_UNAUTHORIZED
 		$server->push(function ($message) {
-			DB::table('mini_program_events')->insert([
+			DB::table('mini_program_events')
+				->insert([
+					'type' => 0,
 					'response' => json_encode($message),
 					'event' => $message['InfoType'] ?? '',
 					'created_at' => now()
@@ -55,8 +63,15 @@ class MiniProgramController extends Controller
 
 	public function msgEvent(Request $request)
 	{
-		$appid = $request->route('appid');
-		DB::table('mini_program_events')->insert(['appid' => $appid, 'response' => json_encode($request->all()), 'created_at' => now()]);
+		$appid = $request->route('appid', '');
+		DB::table('mini_program_events')
+			->insert([
+				'type' => 1,
+				'response' => json_encode($request->all()),
+				'appid' => $appid,
+				'event' => 'all',
+				'created_at' => now(),
+			]);
 
 		$setting = AdminSetting::val(['service_appid', 'service_appsecret', 'service_token', 'service_aeskey']);
 		$config = [

app/Models/Agent.php

@@ -29,6 +29,11 @@ class Agent extends BaseModel
 		return $this->hasMany(AgentProduct::class);
 	}
 
+	public function miniUpload()
+	{
+		return $this->hasOne(MiniProgramUploadLog::class)->orderBy('id', 'desc');
+	}
+
 	public function demand()
 	{
 		return $this->morphOne('App\Models\Demand', 'publisher');

config/admin-settled.php

@@ -59,7 +59,7 @@ return [
     'route' => [
         'domain' => env('ADMIN_ROUTE_DOMAIN'),
 
-        'prefix' => 'admin-settled',
+        'prefix' => 'enter',
 
         'namespace' => 'App\\AdminSettled\\Controllers',
 

config/admin.php

@@ -66,7 +66,7 @@ return [
     'route' => [
         'domain' => env('ADMIN_ROUTE_DOMAIN'),
 
-        'prefix' => env('ADMIN_ROUTE_PREFIX', 'admin'),
+        'prefix' => env('ADMIN_ROUTE_PREFIX', 'yiyouzonghoutai'),
 
         'namespace' => 'App\\Admin\\Controllers',
 

ready.md

@@ -5,31 +5,54 @@
 4、演示产品、公告、专题、产品分类；
 5、关于我们、注册协议、购买协议等信息；
 6、启动订单超时定时器；
+7、后台设置->提交；
 
 ```sql
 # 11:12 2021/8/26
 TRUNCATE `advertisings`;
+TRUNCATE `agents`;
+TRUNCATE `agent_infos`;
 TRUNCATE `agent_products`;
 TRUNCATE `agent_product_items`;
+TRUNCATE `agent_settings`;
 TRUNCATE `articles`;
+TRUNCATE `categories`;
+TRUNCATE `channels`;
 TRUNCATE `coupons`;
+TRUNCATE `demand`;
+TRUNCATE `demand_bidding`;
+TRUNCATE `demand_products`;
+TRUNCATE `guides`;
 TRUNCATE `messages`;
 TRUNCATE `message_reads`;
+TRUNCATE `mini_program_drafts`;
+TRUNCATE `mini_program_events`;
+TRUNCATE `mini_program_templates`;
+TRUNCATE `mini_program_upload_logs`;
 TRUNCATE `notices`;
 TRUNCATE `orders`;
+TRUNCATE `order_product_items`;
+TRUNCATE `pay_debugs`;
 TRUNCATE `products`;
 TRUNCATE `specials`;
+TRUNCATE `statement`;
+TRUNCATE `statement_admin`;
+TRUNCATE `suppliers`;
 TRUNCATE `users`;
 TRUNCATE `user_channels`;
 TRUNCATE `user_favs`;
 TRUNCATE `user_money_logs`;
-TRUNCATE `agents`;
+TRUNCATE `workorder`;
+TRUNCATE `workorder_item`;
+
 TRUNCATE `admin_agent_role_users`;
-TRUNCATE `suppliers`;
 TRUNCATE `admin_supplier_role_users`;
-TRUNCATE `guides`;
 TRUNCATE `admin_guide_role_users`;
 
+ALTER TABLE `products`
+	AUTO_INCREMENT=1000;
+
+
 # 代理商管理员 lingfeng16888
 INSERT INTO `agents` (`id`, `username`, `password`, `name`, `avatar`, `remember_token`, `appid`, `appsecret`, `mchid`, `mchkey`, `status`, `type`, `company_name`, `logo`, `address`, `license_pic`, `director`, `contact_phone`, `rate`, `created_at`, `updated_at`, `deleted_at`)
 	VALUES (1, '领峰云', '$2y$10$7liU0oe8arMoM9hs992bJeqhlSyn6krdpaeX8zGJSp1RzcHO1qKvq', '总管理员', NULL, NULL, '', '', '', '', 1, 1, '总管理员', '', '', '', '总管理员', '13988889999', 0.00, NOW(), NOW(), NULL);
@@ -93,8 +116,4 @@ INSERT INTO `channels` (`id`, `agent_id`, `pid`, `name`, `icon`, `sort`, `delete
 INSERT INTO `channels` (`id`, `agent_id`, `pid`, `name`, `icon`, `sort`, `deleted_at`) VALUES (40, 0, 5, '有问必答', 'images/icon.jpg', 255, NULL);
 INSERT INTO `channels` (`id`, `agent_id`, `pid`, `name`, `icon`, `sort`, `deleted_at`) VALUES (41, 0, 5, '热门笔记', 'images/icon.jpg', 255, NULL);
 
-ALTER TABLE `products`
-	AUTO_INCREMENT=1000;
-
-
 ```