shish преди 5 години
родител
ревизия
92a8869a79
променени са 2 файла, в които са добавени 7 реда и са изтрити 9 реда
  1. 0 8
      biz-ty/sj/classes/MerchantClass.php
  2. 7 1
      sql.sql

+ 0 - 8
biz-ty/sj/classes/MerchantClass.php

@@ -76,8 +76,6 @@ class MerchantClass extends BaseClass
         $applyData['accountStyle'] = 0;
         //待审核
         $applyData['status'] = 0;
-        $applyData['createTime'] = $date;
-        $applyData['updateTime'] = $date;
         $applyData['shopLat'] = isset($applyData['lat']) ? $applyData['lat'] : (string)0;
         $applyData['shopLong'] = isset($applyData['long']) ? $applyData['long'] : (string)0;
         $applyData['shopPrecision'] = (string)0;
@@ -149,7 +147,6 @@ class MerchantClass extends BaseClass
             'merchantId' => $merchantId,
             'riseType' => 0,
             'riseAmount' => 0,
-            'addTime' => time(),
         ];
         GoodsSettingClass::add($setData);
 
@@ -157,9 +154,6 @@ class MerchantClass extends BaseClass
         $shopData = [
             'shopName' => $merchant['merchantName'],
             'merchantId' => $merchantId,
-            'addTime' => $time,
-            'createTime' => $date,
-            'updateTime' => $date,
             'openTime' => '8:00 - 23:00',
             'telephone' => $mobile,
             'introduction' => '欢迎光临',
@@ -201,7 +195,6 @@ class MerchantClass extends BaseClass
                         'remind' => 1,
                         'roleId' => $roleId,
                         'default' => 1,
-                        'addTime' => $time,
                     ];
                     ShopAdminClass::add($shopData);
                 }
@@ -234,7 +227,6 @@ class MerchantClass extends BaseClass
                         'remind' => 1,
                         'roleId' => $roleId,
                         'default' => 1,
-                        'addTime' => $time,
                     ];
                     \bizGhs\shop\classes\ShopAdminClass::add($shopData);
                 }

+ 7 - 1
sql.sql

@@ -1218,4 +1218,10 @@ balance DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '当前余额',
 `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
 `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间'
 )COMMENT='提现订单';
-ALTER TABLE `xhCash` ADD `event` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '事项' AFTER `shopId`;
+ALTER TABLE `xhCash` ADD `event` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '事项' AFTER `shopId`;
+ALTER TABLE xhMerchant DROP COLUMN `addTime`;
+ALTER TABLE xhMerchant DROP COLUMN `createTime`;
+ALTER TABLE xhMerchant ADD `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间' AFTER `status`;
+ALTER TABLE xhShopAdmin DROP COLUMN `addTime`;
+ALTER TABLE xhShopAdmin ADD `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间' AFTER `status`;
+ALTER TABLE xhShopAdmin ADD `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间' AFTER `addTime`;