apply优化

biz/merchant/classes/MerchantClass.php

@@ -26,11 +26,11 @@ class MerchantClass extends BaseClass
         2 => ['id' => 2, 'url' => '/mall/index?account=12358', 'img' => 'http://a.huahb.com/images/avatar.jpg', 'sign' => 'mall', 'name' => '申请会员'],
         3 => ['id' => 3, 'url' => '/mall/index?account=12358', 'img' => 'http://a.huahb.com/images/avatar.jpg', 'sign' => 'mall', 'name' => '点我付款'],
     ];
-    
-    //零售类型
-    const STYLE_RETAIL = 0;
-    //供货商类型
-    const STYLE_SUPPLIER = 1;
+
+    //零售店
+    const STYLE_RETAIL = 1;
+    //供货商
+    const STYLE_SUPPLIER = 2;
 
     //商家信息组合 shish 2019.12.20
     public static function groupMerchantBaseInfo($list)

sql.sql

@@ -954,7 +954,29 @@ ALTER TABLE xhGhsOrder MODIFY `fromType` TINYINT(4) NOT NULL DEFAULT '1' COMMENT
 
 
 ========
-==
+== shish 20210126
 ALTER TABLE `xhWxBase` ADD `wxPayMerchantId` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '微信支付商户id' AFTER `wxRefreshToken`;
 ALTER TABLE `xhWxBase` ADD `wxPayKey` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '微信支付密钥' AFTER `wxPayMerchantId`;
-相应的值需要补进去
+
+相应的值需要补进去
+
+=========
+==shsish 20210127
+ALTER TABLE `xhApply` ADD `style` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '商家类型 1零售 2供货' AFTER `merchantId`;
+ALTER TABLE `xhMerchant` MODIFY `style` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '商家类型 1零售 2供货';
+ALTER TABLE `xhMerchantApply` RENAME TO `xhApplyInfo`;
+ALTER TABLE `xhApplyInfo` rename to `xhApplyExtend`;
+ALTER TABLE `xhApplyExtend` CHANGE `subjectTitles` `subject` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '商事主体名称';
+ALTER TABLE `xhApplyExtend` CHANGE `businessLicense` `license` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '营业执照';
+ALTER TABLE `xhApplyExtend` ADD `licenseNo` VARCHAR(30) NOT NULL DEFAULT '' COMMENT '营业执照号码' AFTER `license`;
+ALTER TABLE `xhApplyExtend` DROP INDEX `businessLicense`;
+ALTER TABLE `xhApplyExtend` DROP INDEX `bankCardNo`;
+ALTER TABLE `xhApplyExtend` DROP INDEX `email`;
+ALTER TABLE `xhApplyExtend` COMMENT '申请拓展信息';
+ALTER TABLE `xhApply` COMMENT '申请表';
+ALTER TABLE `xhApply` CHANGE `introMerchantId` `introSjId` INT(11) NOT NULL DEFAULT '0' COMMENT '引荐商家';
+ALTER TABLE `xhApply` CHANGE `merchantId` `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '新商家id，0表示还没审核通过';
+ALTER TABLE `xhApply` DROP COLUMN `addTime`;
+ALTER TABLE `xhApply` DROP COLUMN `updateTime`;
+ALTER TABLE `xhApply` ADD `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间' AFTER `status`;
+ALTER TABLE `xhApply` ADD `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间' AFTER `addTime`;