|
|
@@ -7,13 +7,10 @@ use biz\goods\services\GoodsService;
|
|
|
use biz\goods\services\GoodsStyleService;
|
|
|
use biz\merchant\services\MerchantCapitalService;
|
|
|
use biz\merchant\services\MerchantExtendService;
|
|
|
-use biz\merchant\services\MerchantService;
|
|
|
use biz\order\services\OrderGoodsService;
|
|
|
use biz\order\services\OrderService;
|
|
|
-use biz\stat\models\StatOrderMonth;
|
|
|
use biz\stat\services\StatIncomeMonthService;
|
|
|
use biz\stat\services\StatIncomeSourceMonthService;
|
|
|
-use biz\stat\services\StatIncomeSourceService;
|
|
|
use biz\stat\services\StatOrderMonthService;
|
|
|
use biz\stat\services\StatOrderService;
|
|
|
use biz\user\services\UserAssetService;
|
|
|
@@ -22,27 +19,29 @@ use biz\user\services\UserGrowthService;
|
|
|
use biz\user\services\UserService;
|
|
|
use common\components\dirUtil;
|
|
|
use common\components\util;
|
|
|
+use common\services\xhMerchantService;
|
|
|
+use common\services\xhWxMenuService;
|
|
|
use Yii;
|
|
|
use yii\console\Controller;
|
|
|
|
|
|
class UpgradeController extends Controller
|
|
|
{
|
|
|
-
|
|
|
- //正式环境 shish
|
|
|
- //yii upgrade/init 2
|
|
|
- public function actionInit($num = 0)
|
|
|
- {
|
|
|
- if($env == 'dev'){
|
|
|
- util::stop('开发环境不允许再初始化');
|
|
|
- }
|
|
|
|
|
|
- //更新积分 shish 2019.11.22
|
|
|
- $sql = "ALTER TABLE xhUserAsset ADD growth INT NOT NULL DEFAULT 0 COMMENT '成长值' AFTER `point`;";
|
|
|
- $sql .= "UPDATE `xhUserAsset` SET `growth`=`integral`;";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
- //shish 2019.11.23
|
|
|
- $sql = "DROP TABLE IF EXISTS xhAuth;
|
|
|
+ //正式环境 shish
|
|
|
+ //yii upgrade/init 2
|
|
|
+ public function actionInit($num = 0)
|
|
|
+ {
|
|
|
+ if (getenv('YII_ENV') == 'dev') {
|
|
|
+ util::stop('开发环境不允许再初始化');
|
|
|
+ }
|
|
|
+
|
|
|
+ //更新积分 shish 2019.11.22
|
|
|
+ $sql = "ALTER TABLE xhUserAsset ADD growth INT NOT NULL DEFAULT 0 COMMENT '成长值' AFTER `point`;";
|
|
|
+ $sql .= "UPDATE `xhUserAsset` SET `growth`=`integral`;";
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+ //shish 2019.11.23
|
|
|
+ $sql = "DROP TABLE IF EXISTS xhAuth;
|
|
|
CREATE TABLE xhAuth(
|
|
|
id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
|
|
|
endId TINYINT NOT NULL DEFAULT 0 COMMENT '业务端，零售1',
|
|
|
@@ -66,20 +65,20 @@ roleId INT NOT NULL DEFAULT 0 COMMENT '角色id',
|
|
|
auth VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '权限',
|
|
|
`addTime` INT(11) NOT NULL DEFAULT '0' COMMENT '添加时间'
|
|
|
)COMMENT='员工角色权限';";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
- $sql = "ALTER TABLE xhAdminRoleAuth ADD endId TINYINT NOT NULL DEFAULT 0 COMMENT '业务端id' AFTER roleId;
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+ $sql = "ALTER TABLE xhAdminRoleAuth ADD endId TINYINT NOT NULL DEFAULT 0 COMMENT '业务端id' AFTER roleId;
|
|
|
ALTER TABLE xhMerchant ADD setId TINYINT NOT NULL DEFAULT 0 COMMENT '套餐id' AFTER `wxRefreshToken`;
|
|
|
ALTER TABLE xhMerchant ADD setDeadline INT NOT NULL DEFAULT 0 COMMENT '套餐到期时间' AFTER `setId`;
|
|
|
ALTER TABLE xhAuth CHANGE front_url frontUrl VARCHAR(30) NOT NULL DEFAULT '' COMMENT '前端路由';
|
|
|
ALTER TABLE xhAuth CHANGE back_url backUrl VARCHAR(30) NOT NULL DEFAULT '' COMMENT '后端路由';
|
|
|
ALTER TABLE xhAdminRole CHANGE authority auth VARCHAR(500) NOT NULL DEFAULT '' COMMENT '权限id列表，存在*表示有所有权限';";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
- //!!!!!!!!!!注意第一家全部订单已经完成，并将全部订单置为已完成
|
|
|
- $sql = "ALTER TABLE xhOrder MODIFY `status` TINYINT NOT NULL DEFAULT 0 COMMENT '订单状态 0待付款 1待配送 2配送中 3待通知 4已取消 5已完成';";
|
|
|
- $sql .= "update xhOrder set `status`=5;";
|
|
|
- $sql .= "DROP TABLE IF EXISTS xhCategoryRelate;
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+ //!!!!!!!!!!注意第一家全部订单已经完成，并将全部订单置为已完成
|
|
|
+ $sql = "ALTER TABLE xhOrder MODIFY `status` TINYINT NOT NULL DEFAULT 0 COMMENT '订单状态 0待付款 1待配送 2配送中 3待通知 4已取消 5已完成';";
|
|
|
+ $sql .= "update xhOrder set `status`=5;";
|
|
|
+ $sql .= "DROP TABLE IF EXISTS xhCategoryRelate;
|
|
|
ALTER TABLE xhCategory ADD merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id' AFTER parentId;
|
|
|
DROP TABLE IF EXISTS xhGoodsUsage;
|
|
|
DROP TABLE IF EXISTS xhUsage;
|
|
|
@@ -170,9 +169,9 @@ ALTER TABLE xhCoupon DROP COLUMN `targetId`;
|
|
|
ALTER TABLE xhCoupon MODIFY deadline INT NOT NULL DEFAULT 0 COMMENT '过期时间；值4102416000表示永不过期，即2100-01-01 00:00:00';
|
|
|
ALTER TABLE xhCoupon ADD INDEX userId(userId,`status`);
|
|
|
ALTER TABLE xhCoupon ADD INDEX merchantId(merchantId,`status`);";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
- $sql = "ALTER TABLE xhGoods CHANGE `style` `goodsStyle` TINYINT NOT NULL DEFAULT 0 COMMENT '商品款式 0单款式 1多款式';
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+ $sql = "ALTER TABLE xhGoods CHANGE `style` `goodsStyle` TINYINT NOT NULL DEFAULT 0 COMMENT '商品款式 0单款式 1多款式';
|
|
|
ALTER TABLE xhGoodsStyle CHANGE `order` `inTurn` INT NOT NULL DEFAULT 0 COMMENT '排序';
|
|
|
ALTER TABLE xhGoodsStyle DROP COLUMN `softDel`;
|
|
|
UPDATE xhUserAsset SET `discount`=1;
|
|
|
@@ -242,10 +241,10 @@ ALTER TABLE xhGoodsCategory ADD `status` TINYINT NOT NULL DEFAULT 1 COMMENT '上
|
|
|
ALTER TABLE xhCategory ADD goodsNum INT NOT NULL DEFAULT 0 COMMENT '商品数' AFTER `cover`;
|
|
|
ALTER TABLE xhCategory ADD sold INT NOT NULL DEFAULT 0 COMMENT '销量' AFTER `goodsNum`;
|
|
|
ALTER TABLE xhCategory CHANGE cover `img` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '分类图片';";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
- //商品设置 员工 角色
|
|
|
- $sql = "ALTER TABLE xhGoodsSetting DROP COLUMN `startRiseTime`;
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+ //商品设置 员工 角色
|
|
|
+ $sql = "ALTER TABLE xhGoodsSetting DROP COLUMN `startRiseTime`;
|
|
|
ALTER TABLE xhGoodsSetting DROP COLUMN `endRiseTime`;
|
|
|
ALTER TABLE xhGoodsSetting CHANGE `goodSIntroduce` `goodsIntroduce` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '商品说明';
|
|
|
ALTER TABLE xhGoodsSetting DROP COLUMN `createTime`;
|
|
|
@@ -287,9 +286,9 @@ id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
|
|
|
adminId INT NOT NULL DEFAULT 0 COMMENT '员工id；管理员id',
|
|
|
`addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间'
|
|
|
)COMMENT='员工操作日志';";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
- $sql = "ALTER TABLE xhCoupon MODIFY getType TINYINT NOT NULL DEFAULT 0 COMMENT '获取方式，0新人领券 1邀请领券';
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+ $sql = "ALTER TABLE xhCoupon MODIFY getType TINYINT NOT NULL DEFAULT 0 COMMENT '获取方式，0新人领券 1邀请领券';
|
|
|
DROP TABLE IF EXISTS `xhCouponAsset`;
|
|
|
CREATE TABLE IF NOT EXISTS `xhCouponAsset`(
|
|
|
id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
|
|
|
@@ -338,9 +337,9 @@ ALTER TABLE xhOrder ADD `gradeService` TINYINT NOT NULL DEFAULT 0 COMMENT '服
|
|
|
ALTER TABLE xhOrder ADD `gradeQuality` TINYINT NOT NULL DEFAULT 0 COMMENT '鲜花品质评分' AFTER `gradeService`;
|
|
|
ALTER TABLE xhOrder ADD `gradeSend` TINYINT NOT NULL DEFAULT 0 COMMENT '配送服务评分' AFTER `gradeQuality`;
|
|
|
ALTER TABLE xhOrder ADD `evaluate` VARCHAR(800) NOT NULL DEFAULT '' COMMENT '评语' AFTER `gradeSend`;";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
- $sql = "update xhMerchantExtend set gradeList='1_2000_0.9I2_5000_0.88I3_10000_0.85I4_20000_0.8';
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+ $sql = "update xhMerchantExtend set gradeList='1_2000_0.9I2_5000_0.88I3_10000_0.85I4_20000_0.8';
|
|
|
DROP TABLE IF EXISTS `xhAgentLevel`;
|
|
|
CREATE TABLE IF NOT EXISTS xhAgentLevel(
|
|
|
id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
|
|
|
@@ -394,9 +393,9 @@ ALTER TABLE xhOrderSend ADD inTurn INT NOT NULL DEFAULT 0 COMMENT '排序' AFTER
|
|
|
ALTER TABLE xhOrderSend MODIFY `orderId` CHAR(32) NOT NULL DEFAULT '' COMMENT '订单号';
|
|
|
ALTER TABLE xhOrderGoods MODIFY `orderId` CHAR(32) NOT NULL DEFAULT '' COMMENT '订单号';
|
|
|
ALTER TABLE xhOrder MODIFY `id` CHAR(32) NOT NULL DEFAULT '' COMMENT '订单号';";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
- $sql = "ALTER TABLE xhOrder ADD totalFlow TINYINT NOT NULL DEFAULT 5 COMMENT '总流程数' AFTER `evaluate`;
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+ $sql = "ALTER TABLE xhOrder ADD totalFlow TINYINT NOT NULL DEFAULT 5 COMMENT '总流程数' AFTER `evaluate`;
|
|
|
ALTER TABLE xhOrder ADD currentFlow TINYINT NOT NULL DEFAULT 0 COMMENT '当前流程数' AFTER `totalFlow`;
|
|
|
UPDATE xhOrder SET totalFlow=5,currentFlow=5;
|
|
|
ALTER TABLE `xhOrder` DROP PRIMARY KEY;
|
|
|
@@ -426,9 +425,9 @@ ALTER TABLE xhOrder MODIFY `receiveFloor` VARCHAR(50) NOT NULL DEFAULT '' COMMEN
|
|
|
ALTER TABLE xhOrder MODIFY `sendType` TINYINT NOT NULL DEFAULT 0 COMMENT '配送方式 0免配送 1自己送 2别人送，快递送';
|
|
|
ALTER TABLE xhOrder ADD `sendSide` TINYINT NOT NULL DEFAULT 0 COMMENT '配送方 0没有 1达达' AFTER `sendType`;
|
|
|
ALTER TABLE xhOrder MODIFY `sendStatus` TINYINT NOT NULL DEFAULT 0 COMMENT '配送状态：0未发货，待接单 1已发货，已接单 2已送达' AFTER `sendSide`;";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
- $sql = "ALTER TABLE xhOrder ADD `reachDate` DATE DEFAULT NULL COMMENT '客户要求送到的日期' AFTER `sendDistance`;
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+ $sql = "ALTER TABLE xhOrder ADD `reachDate` DATE DEFAULT NULL COMMENT '客户要求送到的日期' AFTER `sendDistance`;
|
|
|
ALTER TABLE xhOrder DROP COLUMN `reachTime`;
|
|
|
ALTER TABLE xhOrder MODIFY `reachPeriod` TINYINT NOT NULL DEFAULT 0 COMMENT '客户要求送到的时段：0上午1下午2晚上';
|
|
|
ALTER TABLE xhOrder ADD sendTip DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '运费里增加的小费' AFTER `sendCost`;
|
|
|
@@ -468,9 +467,9 @@ ALTER TABLE `xhOrder` ADD `classify` TINYINT NOT NULL DEFAULT 0 COMMENT '是否
|
|
|
ALTER TABLE xhUsage ADD `inTurn` INT NOT NULL DEFAULT 0 COMMENT '排序' AFTER `usageName`;
|
|
|
ALTER TABLE `xhInvite` ADD amount DECIMAL(9,2) NOT NULL DEFAULT 0.00 COMMENT '下单金额' AFTER `couponId`;
|
|
|
ALTER TABLE `xhInvite` ADD giveTime INT NOT NULL DEFAULT 0 COMMENT '兑奖时间' AFTER `orderTime`;";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
- $sql = "DROP TABLE IF EXISTS `xhCouponAsset`;
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+ $sql = "DROP TABLE IF EXISTS `xhCouponAsset`;
|
|
|
CREATE TABLE IF NOT EXISTS `xhCouponAsset`(
|
|
|
id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
|
|
|
merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
|
|
|
@@ -520,9 +519,9 @@ RENAME TABLE `xhDrawCash` TO `xhWithdraw`;
|
|
|
RENAME TABLE `xhActive` TO `xhAct`;
|
|
|
RENAME TABLE `xhActiveOrder` TO `xhActOrder`;
|
|
|
RENAME TABLE `xhActiveTicketClass` TO `xhActTicket`;";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
- $sql = "ALTER TABLE `xhMerchantAsset` MODIFY `totalOrder` INT NOT NULL DEFAULT 0 COMMENT '订单数；已付款订单数';
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+ $sql = "ALTER TABLE `xhMerchantAsset` MODIFY `totalOrder` INT NOT NULL DEFAULT 0 COMMENT '订单数；已付款订单数';
|
|
|
ALTER TABLE `xhMerchantAsset` ADD cancelOrder INT NOT NULL DEFAULT 0 COMMENT '已取消订单数' AFTER `totalOrder`;
|
|
|
ALTER TABLE `xhMerchantAsset` ADD unNoticeOrder INT NOT NULL DEFAULT 0 COMMENT '待通知订单数' AFTER `totalOrder`;
|
|
|
ALTER TABLE `xhMerchantAsset` ADD sendingOrder INT NOT NULL DEFAULT 0 COMMENT '配送中订单数' AFTER `totalOrder`;
|
|
|
@@ -536,9 +535,9 @@ ALTER TABLE `xhMerchantAsset` MODIFY `totalOrder` INT NOT NULL DEFAULT 0 COMMENT
|
|
|
ALTER TABLE `xhMerchantAsset` ADD `payOrder` INT NOT NULL DEFAULT 0 COMMENT '付款订单数' AFTER `totalOrder`;
|
|
|
ALTER TABLE `xhMerchant` ADD `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间' AFTER `status`;
|
|
|
ALTER TABLE `xhAdmin` ADD `avatar` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '头像' AFTER `adminName`;";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
- $sql = "ALTER TABLE `xhMerchant` MODIFY `status` TINYINT NOT NULL DEFAULT 0 COMMENT '商家状态 0待审 1审核通过，取消冻结，正常 2审核未通过 3冻结 4过期';
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+ $sql = "ALTER TABLE `xhMerchant` MODIFY `status` TINYINT NOT NULL DEFAULT 0 COMMENT '商家状态 0待审 1审核通过，取消冻结，正常 2审核未通过 3冻结 4过期';
|
|
|
ALTER TABLE `xhMerchantExtend` ADD miniVersion INT NOT NULL DEFAULT 0 COMMENT '小程序当前版本' AFTER `miniRefreshToken`;
|
|
|
DROP TABLE IF EXISTS `xhMiniUpgrade`;
|
|
|
CREATE TABLE `xhMiniUpgrade`(
|
|
|
@@ -591,9 +590,9 @@ CREATE TABLE IF NOT EXISTS `xhRetailAsset` (
|
|
|
`totalExpend` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计消费',
|
|
|
`addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间'
|
|
|
) COMMENT='平台零售业资产';";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
- $sql = "ALTER TABLE `xhRetailAsset` ADD onGoods INT NOT NULL DEFAULT 0 COMMENT '上架商品数' AFTER `totalGoods`;
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+ $sql = "ALTER TABLE `xhRetailAsset` ADD onGoods INT NOT NULL DEFAULT 0 COMMENT '上架商品数' AFTER `totalGoods`;
|
|
|
ALTER TABLE `xhRetailAsset` ADD offGoods INT NOT NULL DEFAULT 0 COMMENT '下架商品数' AFTER `totalGoods`;
|
|
|
ALTER TABLE `xhMerchantAsset` ADD onGoods INT NOT NULL DEFAULT 0 COMMENT '上架商品数' AFTER `totalGoods`;
|
|
|
ALTER TABLE `xhMerchantAsset` ADD offGoods INT NOT NULL DEFAULT 0 COMMENT '下架商品数' AFTER `totalGoods`;
|
|
|
@@ -615,9 +614,9 @@ CREATE TABLE `xhFestRise` (
|
|
|
) COMMENT='涨价节日';
|
|
|
ALTER TABLE `xhSetMeal` ADD num INT NOT NULL DEFAULT 0 COMMENT '花店数量' AFTER `price`;
|
|
|
ALTER TABLE `xhSetMeal` DROP COLUMN `manageStyle`;";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
- $sql = "ALTER TABLE `xhApply` ADD UNIQUE INDEX `mobile`(`mobile`);
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+ $sql = "ALTER TABLE `xhApply` ADD UNIQUE INDEX `mobile`(`mobile`);
|
|
|
ALTER TABLE `xhRenew` ADD `orderSn` CHAR(30) NOT NULL DEFAULT '' COMMENT '订单编号' AFTER `id`;
|
|
|
ALTER TABLE `xhWxOpenAdmin` DROP COLUMN `roleId`;
|
|
|
ALTER TABLE `xhWxOpenAdmin` DROP COLUMN `province`;
|
|
|
@@ -663,9 +662,9 @@ ALTER TABLE `xhCouponAsset` ADD `unUseNum` INT NOT NULL DEFAULT 0 COMMENT '待
|
|
|
ALTER TABLE `xhCouponAsset` ADD `useNum` INT NOT NULL DEFAULT 0 COMMENT '已使用数' AFTER `unUseNum`;
|
|
|
ALTER TABLE `xhCouponAsset` ADD `invalidNum` INT NOT NULL DEFAULT 0 COMMENT '已失效数' AFTER `useNum`;
|
|
|
ALTER TABLE `xhOrder` MODIFY `sourceType` TINYINT NOT NULL DEFAULT 0 COMMENT '订单来源，0商城 1门店 2微信朋友圈 3美团';";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
- $sql = "ALTER TABLE `xhAdmin` ADD platUserId INT NOT NULL DEFAULT 0 COMMENT '管理员对应的花卉宝id' AFTER `userId`;
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+ $sql = "ALTER TABLE `xhAdmin` ADD platUserId INT NOT NULL DEFAULT 0 COMMENT '管理员对应的花卉宝id' AFTER `userId`;
|
|
|
ALTER TABLE `xhAdmin` ADD openId VARCHAR(100) NOT NULL DEFAULT '' COMMENT '管理员对应商家公众号openId' AFTER `userId`;
|
|
|
ALTER TABLE `xhAdmin` DROP COLUMN `openId`;
|
|
|
ALTER TABLE `xhAdmin` ADD `delStatus` TINYINT NOT NULL DEFAULT 0 COMMENT '软删除标识 0未删除 1已删除' AFTER `super`;
|
|
|
@@ -688,9 +687,9 @@ ALTER TABLE `xhRecharge` AUTO_INCREMENT=135736;
|
|
|
UPDATE `xhRecharge` SET id=id+135736;
|
|
|
ALTER TABLE `xhRecharge` DROP COLUMN `createTime`;
|
|
|
ALTER TABLE `xhRecharge` DROP COLUMN `updateTime`;";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
- $sql = "ALTER TABLE `xhUserAsset` MODIFY `memberLevel` SMALLINT NOT NULL DEFAULT -1 COMMENT '会员等级 -1普通用户 0普通会员，登记了手机号 1 一级会员';
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+ $sql = "ALTER TABLE `xhUserAsset` MODIFY `memberLevel` SMALLINT NOT NULL DEFAULT -1 COMMENT '会员等级 -1普通用户 0普通会员，登记了手机号 1 一级会员';
|
|
|
ALTER TABLE `xhUserAsset` CHANGE `memberLevel` `member` SMALLINT NOT NULL DEFAULT -1 COMMENT '会员等级 -1普通用户 0普通会员，登记了手机号 1 一级会员';
|
|
|
ALTER TABLE `xhUserAsset` DROP COLUMN `isMember`;
|
|
|
ALTER TABLE `xhUser` DROP COLUMN `isMember`;
|
|
|
@@ -725,309 +724,299 @@ ALTER TABLE `xhMerchantCapital` MODIFY `capitalType` TINYINT NOT NULL DEFAULT 0
|
|
|
ALTER TABLE `xhMerchantCapital` MODIFY `payWay` TINYINT NOT NULL DEFAULT 0 COMMENT '付款方式；支付方式';
|
|
|
ALTER TABLE `xhMerchantCapital` MODIFY `sourceType` TINYINT NOT NULL DEFAULT 0 COMMENT '来源';
|
|
|
ALTER TABLE `xhMerchantCapital` MODIFY `io` TINYINT NOT NULL DEFAULT 0 COMMENT '收支类型 0支出 1收入';";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
- $sql = "ALTER TABLE `xhMerchant` ADD `deadline` INT NOT NULL DEFAULT 0 COMMENT '帐号过期时间' AFTER `status`;UPDATE `xhMerchant` SET `deadline`=1607589778;";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
-
|
|
|
- //导入省市区
|
|
|
- $root = dirUtil::getRootDir();
|
|
|
- $sql = file_get_contents($root . '/region.sql');
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
-
|
|
|
- //将订单商品表的订单id换成自增id
|
|
|
- $orderGoods = OrderGoodsService::getAllByCondition([], null, '*');
|
|
|
- if (!empty($orderGoods)) {
|
|
|
- $ids = array_column($orderGoods, 'orderId');
|
|
|
- $orderList = OrderService::getAllByCondition(['orderSn' => ['in', $ids]], null, '*', 'orderSn');
|
|
|
- foreach ($orderList as $orderSn => $val) {
|
|
|
- $id = $val['id'];
|
|
|
- OrderGoodsService::updateByCondition(['orderId' => $orderSn], ['orderId' => $id]);
|
|
|
- }
|
|
|
- }
|
|
|
- $sql = "alter table `xhOrderGoods` modify orderId int not null default 0 comment '订单id';";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
- //商品多款式同步
|
|
|
- $goodsList = GoodsService::getAllByCondition([], null, '*');
|
|
|
- if (!empty($goodsList)) {
|
|
|
- foreach ($goodsList as $goods) {
|
|
|
- $multiPrice = $goods['multiPrice'];
|
|
|
- if (!empty($multiPrice)) {
|
|
|
- $currentIds = explode(',', trim($multiPrice));
|
|
|
- if (!empty($currentIds)) {
|
|
|
- $currentIds = array_filter(array_unique($currentIds));
|
|
|
- $goodsId = $goods['id'];
|
|
|
- foreach ($currentIds as $currentId) {
|
|
|
- GoodsStyleService::updateByCondition(['id' => $currentId], ['goodsId' => $goodsId]);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- $sql = "ALTER TABLE xhGoods DROP COLUMN `multiPrice`;";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
- //商家流水
|
|
|
- $mCapital = MerchantCapitalService::getAllByCondition([], null, '*');
|
|
|
- if (!empty($mCapital)) {
|
|
|
- foreach ($mCapital as $capital) {
|
|
|
- $relateId = $capital['relateId'];
|
|
|
- $id = $capital['id'];
|
|
|
- if (!empty($relateId)) {
|
|
|
- $order = OrderService::getByCondition(['orderSn' => $relateId]);
|
|
|
- if (!empty($order)) {
|
|
|
- $orderId = $order['id'];
|
|
|
- MerchantCapitalService::updateById($id, ['relateId' => $orderId]);
|
|
|
- } else {
|
|
|
- MerchantCapitalService::updateById($id, ['relateId' => 0]);
|
|
|
- }
|
|
|
- } else {
|
|
|
- MerchantCapitalService::updateById($id, ['relateId' => 0]);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- $sql = "ALTER TABLE `xhMerchantCapital` MODIFY `relateId` INT NOT NULL DEFAULT 0 COMMENT '关联id；订单id';";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
- //客户流水
|
|
|
- $uCapital = UserCapitalService::getAllByCondition([], null, '*');
|
|
|
- if (!empty($uCapital)) {
|
|
|
- foreach ($uCapital as $capital) {
|
|
|
- $relateId = $capital['relateId'];
|
|
|
- $id = $capital['id'];
|
|
|
- if (!empty($relateId)) {
|
|
|
- $order = OrderService::getByCondition(['orderSn' => $relateId]);
|
|
|
- if (!empty($order)) {
|
|
|
- $orderId = $order['id'];
|
|
|
- UserCapitalService::updateById($id, ['relateId' => $orderId]);
|
|
|
- } else {
|
|
|
- UserCapitalService::updateById($id, ['relateId' => 0]);
|
|
|
- }
|
|
|
- } else {
|
|
|
- UserCapitalService::updateById($id, ['relateId' => 0]);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- $sql = "ALTER TABLE `xhUserCapital` MODIFY `relateId` INT NOT NULL DEFAULT 0 COMMENT '关联id；订单id';";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
- //客户成长值
|
|
|
- $userGrowth = UserGrowthService::getAllByCondition([], null, '*');
|
|
|
- if (!empty($userGrowth)) {
|
|
|
- foreach ($userGrowth as $relateId => $growth) {
|
|
|
- $relateId = $growth['relateId'];
|
|
|
- $id = $growth['id'];
|
|
|
- if (!empty($relateId)) {
|
|
|
- $order = OrderService::getByCondition(['orderSn' => $relateId]);
|
|
|
- if (!empty($order)) {
|
|
|
- $orderId = $order['id'];
|
|
|
- UserGrowthService::updateById($id, ['relateId' => $orderId]);
|
|
|
- } else {
|
|
|
- UserGrowthService::updateById($id, ['relateId' => 0]);
|
|
|
- }
|
|
|
- } else {
|
|
|
- UserGrowthService::updateById($id, ['relateId' => 0]);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- $sql = "ALTER TABLE `xhUserGrowth` MODIFY `relateId` INT NOT NULL DEFAULT 0 COMMENT '关联id';";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
-
|
|
|
- //统计相关
|
|
|
- //xhStatIncomeMonth
|
|
|
- $list = StatIncomeMonthService::getAllByCondition([], null, '*');
|
|
|
- if (!empty($list)) {
|
|
|
- foreach ($list as $val) {
|
|
|
- $year = $val['year'];
|
|
|
- $month = $val['month'];
|
|
|
- $date = date("Ym", strtotime($year . '-' . $month . '-' . '1'));
|
|
|
- $id = $val['id'];
|
|
|
- StatIncomeMonthService::updateById($id, ['time' => $date]);
|
|
|
- }
|
|
|
- }
|
|
|
- //xhStatIncomeSourceMonth
|
|
|
- $list = StatIncomeSourceMonthService::getAllByCondition([], null, '*');
|
|
|
- if (!empty($list)) {
|
|
|
- foreach ($list as $val) {
|
|
|
- $year = $val['year'];
|
|
|
- $month = $val['month'];
|
|
|
- $date = date("Ym", strtotime($year . '-' . $month . '-' . '1'));
|
|
|
- $id = $val['id'];
|
|
|
- StatIncomeSourceMonthService::updateById($id, ['time' => $date]);
|
|
|
- }
|
|
|
- }
|
|
|
- //xhStatOrder
|
|
|
- $list = StatOrderService::getAllByCondition([], null, '*');
|
|
|
- if (!empty($list)) {
|
|
|
- foreach ($list as $val) {
|
|
|
- $id = $val['id'];
|
|
|
- $date = date("Ymd", $val['time']);
|
|
|
- StatOrderService::updateById($id, ['time' => $date]);
|
|
|
- }
|
|
|
- }
|
|
|
- //xhStatOrderMonth
|
|
|
- $list = StatOrderMonthService::getAllByCondition([], null, '*');
|
|
|
- if (!empty($list)) {
|
|
|
- foreach ($list as $val) {
|
|
|
- $year = $val['year'];
|
|
|
- $month = $val['month'];
|
|
|
- $date = date("Ym", strtotime($year . '-' . $month . '-' . '1'));
|
|
|
- $id = $val['id'];
|
|
|
- StatOrderMonthService::updateById($id, ['time' => $date]);
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- if ($num == 2) {
|
|
|
- $this->actionInit2();
|
|
|
- }
|
|
|
-
|
|
|
- if ($num == 3) {
|
|
|
- $this->actionInit2();
|
|
|
- $this->actionSyncAvatar();
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- public function actionInit2()
|
|
|
- {
|
|
|
- //更新管理员
|
|
|
- $sql = 'update `xhAdmin` set password="' . password_hash('123456', PASSWORD_BCRYPT) . '",confirmPassword="' . password_hash('123456', PASSWORD_BCRYPT) . '";update `xhAdmin` set merchantId=12358,platUserId=12543212 where id=1;update `xhAdmin` set merchantId=12359,platUserId=12540901 where id=3;update `xhAdmin` set merchantId=12360 where id=4;update `xhAdmin` set merchantId=12361,platUserId=12540861 where id=5;update `xhStaff` set `password`="' . password_hash('123456', PASSWORD_BCRYPT) . '"';
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
- //生产环境国兰密码要更新进去
|
|
|
- if (getenv('YII_ENV') == 'production') {
|
|
|
- $password = password_hash('glhs610000', PASSWORD_BCRYPT);
|
|
|
- $confirmPassword = password_hash('454588', PASSWORD_BCRYPT);
|
|
|
- $sql = "update `xhAdmin` set password='{$password}',confirmPassowrd='{$confirmPassword}' where id=1";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
- }
|
|
|
-
|
|
|
- //国兰老客户导入
|
|
|
- $oldUserList = Yii::$app->db2->createCommand('select * from xhUserOldData where `status`=0')->queryAll();
|
|
|
- if (!empty($oldUserList)) {
|
|
|
- foreach ($oldUserList as $user) {
|
|
|
- $mobile = $user['mobile'];
|
|
|
- $exists = UserService::getByCondition(['mobile' => $mobile, 'merchantId' => 12358]);
|
|
|
- if (!empty($exists)) {
|
|
|
- echo "老客户：'.$mobile.'已经导入过了。\n";
|
|
|
- continue;
|
|
|
- }
|
|
|
- $user['realName'] = $user['userName'];
|
|
|
- $user['growth'] = $user['integral'];
|
|
|
- $insertUser = UserService::addUser($user);
|
|
|
- $id = $user['id'];
|
|
|
- Yii::$app->db2->createCommand("update xhUserOldData set `status`=1 where id={$id}")->execute();
|
|
|
- echo "老客户导入生成userId:" . $insertUser['id'] . "\n";
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- //更新国兰的菜单分类
|
|
|
- $sql = "truncate `xhCategory`;insert into `xhCategory`(`id`,`parentId`,`merchantId`,`categoryName`,`description`,`img`,`goodsNum`,`sold`,`inTurn`,`status`) values (1,0,12358,'花束','唯美花束','',0,0,15,1),(2,0,12358,'花盒','时尚花盒','',0,0,14,1),(3,0,12358,'开业花篮','开业花篮','',0,0,0,1),(4,0,12358,'婚礼用花','婚礼用花','',0,0,0,1),(5,0,12358,'会议用花','会议用花','',0,0,0,1),(9,0,12358,'蝴蝶兰专区','蝴蝶兰','',0,0,4,1),(87,0,12358,'花篮','时尚礼篮','',0,0,4,1),(88,0,12358,'植物-微景观','植物-微景观','',0,0,4,1);";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
-
|
|
|
- //更新菜单与商品对应关系
|
|
|
- Yii::$app->db->createCommand("truncate `xhGoodsCategory`;")->execute();
|
|
|
- $goodsCategory = Yii::$app->db2->createCommand('select * from `xhGoodsCategory` where `merchantId`=12358')->queryAll();
|
|
|
- if (!empty($goodsCategory)) {
|
|
|
- foreach ($goodsCategory as $val) {
|
|
|
- $cId = $val['cId'];
|
|
|
- $gId = $val['gId'];
|
|
|
- $inTurn = $val['inTurn'];
|
|
|
- $merchantId = $val['merchantId'];
|
|
|
- GoodsCategoryService::add(['gId' => $gId, 'cId' => $cId, 'inTurn' => $inTurn, 'status' => 1, 'merchantId' => $merchantId]);
|
|
|
- echo $cId . ' ' . $gId . "\n";
|
|
|
-
|
|
|
- }
|
|
|
- }
|
|
|
- $goodsUsage = Yii::$app->db2->createCommand('select * from `xhGoodsUsage` where `merchantId`=12358')->queryAll();
|
|
|
- if (!empty($goodsUsage)) {
|
|
|
- foreach ($goodsUsage as $val) {
|
|
|
- $usageId = $val['usageId'];
|
|
|
- $goodsId = $val['goodsId'];
|
|
|
- $inTurn = $val['inTurn'];
|
|
|
- $merchantId = $val['merchantId'];
|
|
|
- GoodsCategoryService::add(['gId' => $goodsId, 'cId' => $usageId, 'inTurn' => $inTurn, 'status' => 1, 'merchantId' => $merchantId]);
|
|
|
- echo $usageId . ' ' . $goodsId . "\n";
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- //会员打折和会员等级要同步，要先导老客户 shish 2020.1.12
|
|
|
- $merchantList = MerchantExtendService::getAllByCondition([], null, '*', 'merchantId');
|
|
|
- $userAssetList = UserAssetService::getAllByCondition([], null, '*');
|
|
|
- if (!empty($userAssetList)) {
|
|
|
- foreach ($userAssetList as $asset) {
|
|
|
- $id = $asset['userId'];
|
|
|
- $merchantId = $asset['merchantId'];
|
|
|
- $growth = $asset['growth'];
|
|
|
- $currentMember = $asset['member'];
|
|
|
- UserService::updateById($id, ['member' => $currentMember]);
|
|
|
- if (!empty($merchantId) && isset($merchantList[$merchantId])) {
|
|
|
- $extend = $merchantList[$merchantId];
|
|
|
- if (!empty($extend)) {
|
|
|
- $gradeList = MerchantExtendService::getGradeList($extend);
|
|
|
- $member = null;
|
|
|
- foreach ($gradeList as $grade) {
|
|
|
- if ($grade['growth'] < $growth) {
|
|
|
- $member = $grade['level'];
|
|
|
- continue;
|
|
|
- }
|
|
|
- }
|
|
|
- if (!empty($member)) {
|
|
|
- UserAssetService::updateByUserId($id, ['member' => $member]);
|
|
|
- UserService::updateById($id, ['member' => $member]);
|
|
|
- echo '客户id:' . $id . '会员等级：' . $member . "已更新\n";
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- $sql = "ALTER TABLE xhGoods ADD `briefContent` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '简单内容介绍，移动端添加商品' AFTER `content`;";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+ $sql = "ALTER TABLE `xhMerchant` ADD `deadline` INT NOT NULL DEFAULT 0 COMMENT '帐号过期时间' AFTER `status`;UPDATE `xhMerchant` SET `deadline`=1607589778;";
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+
|
|
|
+ //导入省市区
|
|
|
+ $root = dirUtil::getRootDir();
|
|
|
+ $sql = file_get_contents($root . '/region.sql');
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+
|
|
|
+ //将订单商品表的订单id换成自增id
|
|
|
+ $orderGoods = OrderGoodsService::getAllByCondition([], null, '*');
|
|
|
+ if (!empty($orderGoods)) {
|
|
|
+ $ids = array_column($orderGoods, 'orderId');
|
|
|
+ $orderList = OrderService::getAllByCondition(['orderSn' => ['in', $ids]], null, '*', 'orderSn');
|
|
|
+ foreach ($orderList as $orderSn => $val) {
|
|
|
+ $id = $val['id'];
|
|
|
+ OrderGoodsService::updateByCondition(['orderId' => $orderSn], ['orderId' => $id]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $sql = "alter table `xhOrderGoods` modify orderId int not null default 0 comment '订单id';";
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+ //商品多款式同步
|
|
|
+ $goodsList = GoodsService::getAllByCondition([], null, '*');
|
|
|
+ if (!empty($goodsList)) {
|
|
|
+ foreach ($goodsList as $goods) {
|
|
|
+ $multiPrice = $goods['multiPrice'];
|
|
|
+ if (!empty($multiPrice)) {
|
|
|
+ $currentIds = explode(',', trim($multiPrice));
|
|
|
+ if (!empty($currentIds)) {
|
|
|
+ $currentIds = array_filter(array_unique($currentIds));
|
|
|
+ $goodsId = $goods['id'];
|
|
|
+ foreach ($currentIds as $currentId) {
|
|
|
+ GoodsStyleService::updateByCondition(['id' => $currentId], ['goodsId' => $goodsId]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $sql = "ALTER TABLE xhGoods DROP COLUMN `multiPrice`;";
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+ //商家流水
|
|
|
+ $mCapital = MerchantCapitalService::getAllByCondition([], null, '*');
|
|
|
+ if (!empty($mCapital)) {
|
|
|
+ foreach ($mCapital as $capital) {
|
|
|
+ $relateId = $capital['relateId'];
|
|
|
+ $id = $capital['id'];
|
|
|
+ if (!empty($relateId)) {
|
|
|
+ $order = OrderService::getByCondition(['orderSn' => $relateId]);
|
|
|
+ if (!empty($order)) {
|
|
|
+ $orderId = $order['id'];
|
|
|
+ MerchantCapitalService::updateById($id, ['relateId' => $orderId]);
|
|
|
+ } else {
|
|
|
+ MerchantCapitalService::updateById($id, ['relateId' => 0]);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ MerchantCapitalService::updateById($id, ['relateId' => 0]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $sql = "ALTER TABLE `xhMerchantCapital` MODIFY `relateId` INT NOT NULL DEFAULT 0 COMMENT '关联id；订单id';";
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+ //客户流水
|
|
|
+ $uCapital = UserCapitalService::getAllByCondition([], null, '*');
|
|
|
+ if (!empty($uCapital)) {
|
|
|
+ foreach ($uCapital as $capital) {
|
|
|
+ $relateId = $capital['relateId'];
|
|
|
+ $id = $capital['id'];
|
|
|
+ if (!empty($relateId)) {
|
|
|
+ $order = OrderService::getByCondition(['orderSn' => $relateId]);
|
|
|
+ if (!empty($order)) {
|
|
|
+ $orderId = $order['id'];
|
|
|
+ UserCapitalService::updateById($id, ['relateId' => $orderId]);
|
|
|
+ } else {
|
|
|
+ UserCapitalService::updateById($id, ['relateId' => 0]);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ UserCapitalService::updateById($id, ['relateId' => 0]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $sql = "ALTER TABLE `xhUserCapital` MODIFY `relateId` INT NOT NULL DEFAULT 0 COMMENT '关联id；订单id';";
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+ //客户成长值
|
|
|
+ $userGrowth = UserGrowthService::getAllByCondition([], null, '*');
|
|
|
+ if (!empty($userGrowth)) {
|
|
|
+ foreach ($userGrowth as $relateId => $growth) {
|
|
|
+ $relateId = $growth['relateId'];
|
|
|
+ $id = $growth['id'];
|
|
|
+ if (!empty($relateId)) {
|
|
|
+ $order = OrderService::getByCondition(['orderSn' => $relateId]);
|
|
|
+ if (!empty($order)) {
|
|
|
+ $orderId = $order['id'];
|
|
|
+ UserGrowthService::updateById($id, ['relateId' => $orderId]);
|
|
|
+ } else {
|
|
|
+ UserGrowthService::updateById($id, ['relateId' => 0]);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ UserGrowthService::updateById($id, ['relateId' => 0]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $sql = "ALTER TABLE `xhUserGrowth` MODIFY `relateId` INT NOT NULL DEFAULT 0 COMMENT '关联id';";
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+
|
|
|
+ //统计相关
|
|
|
+ //xhStatIncomeMonth
|
|
|
+ $list = StatIncomeMonthService::getAllByCondition([], null, '*');
|
|
|
+ if (!empty($list)) {
|
|
|
+ foreach ($list as $val) {
|
|
|
+ $year = $val['year'];
|
|
|
+ $month = $val['month'];
|
|
|
+ $date = date("Ym", strtotime($year . '-' . $month . '-' . '1'));
|
|
|
+ $id = $val['id'];
|
|
|
+ StatIncomeMonthService::updateById($id, ['time' => $date]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //xhStatIncomeSourceMonth
|
|
|
+ $list = StatIncomeSourceMonthService::getAllByCondition([], null, '*');
|
|
|
+ if (!empty($list)) {
|
|
|
+ foreach ($list as $val) {
|
|
|
+ $year = $val['year'];
|
|
|
+ $month = $val['month'];
|
|
|
+ $date = date("Ym", strtotime($year . '-' . $month . '-' . '1'));
|
|
|
+ $id = $val['id'];
|
|
|
+ StatIncomeSourceMonthService::updateById($id, ['time' => $date]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //xhStatOrder
|
|
|
+ $list = StatOrderService::getAllByCondition([], null, '*');
|
|
|
+ if (!empty($list)) {
|
|
|
+ foreach ($list as $val) {
|
|
|
+ $id = $val['id'];
|
|
|
+ $date = date("Ymd", $val['time']);
|
|
|
+ StatOrderService::updateById($id, ['time' => $date]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //xhStatOrderMonth
|
|
|
+ $list = StatOrderMonthService::getAllByCondition([], null, '*');
|
|
|
+ if (!empty($list)) {
|
|
|
+ foreach ($list as $val) {
|
|
|
+ $year = $val['year'];
|
|
|
+ $month = $val['month'];
|
|
|
+ $date = date("Ym", strtotime($year . '-' . $month . '-' . '1'));
|
|
|
+ $id = $val['id'];
|
|
|
+ StatOrderMonthService::updateById($id, ['time' => $date]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if ($num == 2) {
|
|
|
+ $this->actionInit2();
|
|
|
+ }
|
|
|
+
|
|
|
+ if ($num == 3) {
|
|
|
+ $this->actionInit2();
|
|
|
+ $this->actionSyncAvatar();
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ public function actionInit2()
|
|
|
+ {
|
|
|
+ //更新管理员
|
|
|
+ $sql = 'update `xhAdmin` set password="' . password_hash('123456', PASSWORD_BCRYPT) . '",confirmPassword="' . password_hash('123456', PASSWORD_BCRYPT) . '";update `xhAdmin` set merchantId=12358,platUserId=12543212 where id=1;update `xhAdmin` set merchantId=12359,platUserId=12540901 where id=3;update `xhAdmin` set merchantId=12360 where id=4;update `xhAdmin` set merchantId=12361,platUserId=12540861 where id=5;update `xhStaff` set `password`="' . password_hash('123456', PASSWORD_BCRYPT) . '"';
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+ //生产环境国兰密码要更新进去
|
|
|
+ if (getenv('YII_ENV') == 'production') {
|
|
|
+ $password = password_hash('glhs610000', PASSWORD_BCRYPT);
|
|
|
+ $confirmPassword = password_hash('454588', PASSWORD_BCRYPT);
|
|
|
+ $sql = "update `xhAdmin` set password='{$password}',confirmPassowrd='{$confirmPassword}' where id=1";
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+ }
|
|
|
+
|
|
|
+ //国兰老客户导入
|
|
|
+ $oldUserList = Yii::$app->db2->createCommand('select * from xhUserOldData where `status`=0')->queryAll();
|
|
|
+ if (!empty($oldUserList)) {
|
|
|
+ foreach ($oldUserList as $user) {
|
|
|
+ $mobile = $user['mobile'];
|
|
|
+ $exists = UserService::getByCondition(['mobile' => $mobile, 'merchantId' => 12358]);
|
|
|
+ if (!empty($exists)) {
|
|
|
+ echo "老客户：'.$mobile.'已经导入过了。\n";
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ $user['realName'] = $user['userName'];
|
|
|
+ $user['growth'] = $user['integral'];
|
|
|
+ $insertUser = UserService::addUser($user);
|
|
|
+ $id = $user['id'];
|
|
|
+ Yii::$app->db2->createCommand("update xhUserOldData set `status`=1 where id={$id}")->execute();
|
|
|
+ echo "老客户导入生成userId:" . $insertUser['id'] . "\n";
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ //更新国兰的菜单分类
|
|
|
+ $sql = "truncate `xhCategory`;insert into `xhCategory`(`id`,`parentId`,`merchantId`,`categoryName`,`description`,`img`,`goodsNum`,`sold`,`inTurn`,`status`) values (1,0,12358,'花束','唯美花束','',0,0,15,1),(2,0,12358,'花盒','时尚花盒','',0,0,14,1),(3,0,12358,'开业花篮','开业花篮','',0,0,0,1),(4,0,12358,'婚礼用花','婚礼用花','',0,0,0,1),(5,0,12358,'会议用花','会议用花','',0,0,0,1),(9,0,12358,'蝴蝶兰专区','蝴蝶兰','',0,0,4,1),(87,0,12358,'花篮','时尚礼篮','',0,0,4,1),(88,0,12358,'植物-微景观','植物-微景观','',0,0,4,1);";
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+
|
|
|
+ //更新菜单与商品对应关系
|
|
|
+ Yii::$app->db->createCommand("truncate `xhGoodsCategory`;")->execute();
|
|
|
+ $goodsCategory = Yii::$app->db2->createCommand('select * from `xhGoodsCategory` where `merchantId`=12358')->queryAll();
|
|
|
+ if (!empty($goodsCategory)) {
|
|
|
+ foreach ($goodsCategory as $val) {
|
|
|
+ $cId = $val['cId'];
|
|
|
+ $gId = $val['gId'];
|
|
|
+ $inTurn = $val['inTurn'];
|
|
|
+ $merchantId = $val['merchantId'];
|
|
|
+ GoodsCategoryService::add(['gId' => $gId, 'cId' => $cId, 'inTurn' => $inTurn, 'status' => 1, 'merchantId' => $merchantId]);
|
|
|
+ echo $cId . ' ' . $gId . "\n";
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $goodsUsage = Yii::$app->db2->createCommand('select * from `xhGoodsUsage` where `merchantId`=12358')->queryAll();
|
|
|
+ if (!empty($goodsUsage)) {
|
|
|
+ foreach ($goodsUsage as $val) {
|
|
|
+ $usageId = $val['usageId'];
|
|
|
+ $goodsId = $val['goodsId'];
|
|
|
+ $inTurn = $val['inTurn'];
|
|
|
+ $merchantId = $val['merchantId'];
|
|
|
+ GoodsCategoryService::add(['gId' => $goodsId, 'cId' => $usageId, 'inTurn' => $inTurn, 'status' => 1, 'merchantId' => $merchantId]);
|
|
|
+ echo $usageId . ' ' . $goodsId . "\n";
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ //会员打折和会员等级要同步，要先导老客户 shish 2020.1.12
|
|
|
+ $merchantList = MerchantExtendService::getAllByCondition([], null, '*', 'merchantId');
|
|
|
+ $userAssetList = UserAssetService::getAllByCondition([], null, '*');
|
|
|
+ if (!empty($userAssetList)) {
|
|
|
+ foreach ($userAssetList as $asset) {
|
|
|
+ $id = $asset['userId'];
|
|
|
+ $merchantId = $asset['merchantId'];
|
|
|
+ $growth = $asset['growth'];
|
|
|
+ $currentMember = $asset['member'];
|
|
|
+ UserService::updateById($id, ['member' => $currentMember]);
|
|
|
+ if (!empty($merchantId) && isset($merchantList[$merchantId])) {
|
|
|
+ $extend = $merchantList[$merchantId];
|
|
|
+ if (!empty($extend)) {
|
|
|
+ $gradeList = MerchantExtendService::getGradeList($extend);
|
|
|
+ $member = null;
|
|
|
+ foreach ($gradeList as $grade) {
|
|
|
+ if ($grade['growth'] < $growth) {
|
|
|
+ $member = $grade['level'];
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (!empty($member)) {
|
|
|
+ UserAssetService::updateByUserId($id, ['member' => $member]);
|
|
|
+ UserService::updateById($id, ['member' => $member]);
|
|
|
+ echo '客户id:' . $id . '会员等级：' . $member . "已更新\n";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ $sql = "ALTER TABLE xhGoods ADD `briefContent` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '简单内容介绍，移动端添加商品' AFTER `content`;";
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
|
|
|
- //各个环境开放平台的更新
|
|
|
- $env = getenv("YII_ENV");
|
|
|
- //花美灵
|
|
|
- if($env == 'dev'){
|
|
|
- $sql = "delete from `xhMerchant`;delete from `xhWxOpen`;";
|
|
|
- $sql .= "insert into `xhWxOpen`(`id`,`appId`,`openName`,`appSecret`,`merchantId`,`adminId`,`token`,`verifyTicket`,`verifyTicketTime`,`componentAccessToken`,`componentAccessTokenTime`,`aesKey`,`preAuthCode`,`preAuthCodeTime`,`createTime`,`updateTime`) values (1,'wxe4428cfe08fc74d6','花美灵','cdbcb1ea6bf2249b269c542c870bd96d',0,0,'XH11464773308','ticket@@@mUTfkCa6p-W5fIB_YvWDiSzUvsCVJNN6fELjsHnZ07Nvz5hfRMyfHzmjn3ZPK9Gi5aqY2_H7ruxnX2cdYdjRIg','2020-01-09 21:04:50','29_RQZoasQKtSPVa754Inhu3aKiAfou3KYGJT5SGtqWy74cHoL3aEfPt0xTR6JMuULyDN4-25fBDTE-VS_jtalbq6WTbb5d7B-K4dUSS3zDbKykNtctzFnBBnDzkbGRXcw2b8OS8JY_HHblIlFZTVLcAGAGIY','2020-01-09 21:36:26','Gm2BIikJaExAbiyafGoJGFbEsECb4mDEnyEYgl9WXW5','preauthcode@@@IJXez4FxmgNRLow1rmxhAxM2eaKQYY6g1ocsK8Koe4v9mx7mr07arTNZTLxe2Sf2','2019-12-19 16:13:58','2019-04-17 14:49:19','2020-01-09 12:54:50');";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
- }
|
|
|
- //花掌柜助手
|
|
|
- if($env == 'test'){
|
|
|
- $sql = "delete from `xhMerchant`;delete from `xhWxOpen`;";
|
|
|
- $sql .= "insert into `xhWxOpen`(`id`,`appId`,`openName`,`appSecret`,`merchantId`,`adminId`,`token`,`verifyTicket`,`verifyTicketTime`,`componentAccessToken`,`componentAccessTokenTime`,`aesKey`,`preAuthCode`,`preAuthCodeTime`,`createTime`,`updateTime`) values (1,'wx364800c320a0cf53','花掌柜助手','6a83bfa98f3ff5e66b1a85a19c54ebdb',0,0,'XH11464773308','ticket@@@mUTfkCa6p-W5fIB_YvWDiSzUvsCVJNN6fELjsHnZ07Nvz5hfRMyfHzmjn3ZPK9Gi5aqY2_H7ruxnX2cdYdjRIg','2020-01-09 21:04:50','29_RQZoasQKtSPVa754Inhu3aKiAfou3KYGJT5SGtqWy74cHoL3aEfPt0xTR6JMuULyDN4-25fBDTE-VS_jtalbq6WTbb5d7B-K4dUSS3zDbKykNtctzFnBBnDzkbGRXcw2b8OS8JY_HHblIlFZTVLcAGAGIY','2020-01-09 21:36:26','Gm2BIikJaExAbiyafGoJGFbEsECb4mDEnyEYgl9WXW5','preauthcode@@@IJXez4FxmgNRLow1rmxhAxM2eaKQYY6g1ocsK8Koe4v9mx7mr07arTNZTLxe2Sf2','2019-12-19 16:13:58','2019-04-17 14:49:19','2020-01-09 12:54:50');";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
- }
|
|
|
- }
|
|
|
+ //各个环境开放平台的更新
|
|
|
+ $env = getenv("YII_ENV");
|
|
|
+ //花美灵
|
|
|
+ if ($env == 'dev') {
|
|
|
+ $sql = "delete from `xhMerchant`;delete from `xhWxOpen`;";
|
|
|
+ $sql .= "insert into `xhWxOpen`(`id`,`appId`,`openName`,`appSecret`,`merchantId`,`adminId`,`token`,`verifyTicket`,`verifyTicketTime`,`componentAccessToken`,`componentAccessTokenTime`,`aesKey`,`preAuthCode`,`preAuthCodeTime`,`createTime`,`updateTime`) values (1,'wxe4428cfe08fc74d6','花美灵','cdbcb1ea6bf2249b269c542c870bd96d',0,0,'XH11464773308','ticket@@@mUTfkCa6p-W5fIB_YvWDiSzUvsCVJNN6fELjsHnZ07Nvz5hfRMyfHzmjn3ZPK9Gi5aqY2_H7ruxnX2cdYdjRIg','2020-01-09 21:04:50','29_RQZoasQKtSPVa754Inhu3aKiAfou3KYGJT5SGtqWy74cHoL3aEfPt0xTR6JMuULyDN4-25fBDTE-VS_jtalbq6WTbb5d7B-K4dUSS3zDbKykNtctzFnBBnDzkbGRXcw2b8OS8JY_HHblIlFZTVLcAGAGIY','2020-01-09 21:36:26','Gm2BIikJaExAbiyafGoJGFbEsECb4mDEnyEYgl9WXW5','preauthcode@@@IJXez4FxmgNRLow1rmxhAxM2eaKQYY6g1ocsK8Koe4v9mx7mr07arTNZTLxe2Sf2','2019-12-19 16:13:58','2019-04-17 14:49:19','2020-01-09 12:54:50');";
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+ }
|
|
|
+ //花掌柜助手
|
|
|
+ if ($env == 'test') {
|
|
|
+ $sql = "delete from `xhMerchant`;delete from `xhWxOpen`;";
|
|
|
+ $sql .= "insert into `xhWxOpen`(`id`,`appId`,`openName`,`appSecret`,`merchantId`,`adminId`,`token`,`verifyTicket`,`verifyTicketTime`,`componentAccessToken`,`componentAccessTokenTime`,`aesKey`,`preAuthCode`,`preAuthCodeTime`,`createTime`,`updateTime`) values (1,'wx364800c320a0cf53','花掌柜助手','6a83bfa98f3ff5e66b1a85a19c54ebdb',0,0,'XH11464773308','ticket@@@mUTfkCa6p-W5fIB_YvWDiSzUvsCVJNN6fELjsHnZ07Nvz5hfRMyfHzmjn3ZPK9Gi5aqY2_H7ruxnX2cdYdjRIg','2020-01-09 21:04:50','29_RQZoasQKtSPVa754Inhu3aKiAfou3KYGJT5SGtqWy74cHoL3aEfPt0xTR6JMuULyDN4-25fBDTE-VS_jtalbq6WTbb5d7B-K4dUSS3zDbKykNtctzFnBBnDzkbGRXcw2b8OS8JY_HHblIlFZTVLcAGAGIY','2020-01-09 21:36:26','Gm2BIikJaExAbiyafGoJGFbEsECb4mDEnyEYgl9WXW5','preauthcode@@@IJXez4FxmgNRLow1rmxhAxM2eaKQYY6g1ocsK8Koe4v9mx7mr07arTNZTLxe2Sf2','2019-12-19 16:13:58','2019-04-17 14:49:19','2020-01-09 12:54:50');";
|
|
|
+ Yii::$app->db->createCommand($sql)->execute();
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
- //重新拉取并保存国兰客户的头像和图片 shish 2020.1.12
|
|
|
- public function actionSyncAvatar()
|
|
|
- {
|
|
|
- UserService::syncAvatar(12358);
|
|
|
- }
|
|
|
+ //重新拉取并保存国兰客户的头像和图片 shish 2020.1.12
|
|
|
+ public function actionSyncAvatar()
|
|
|
+ {
|
|
|
+ UserService::syncAvatar(12358);
|
|
|
+ }
|
|
|
|
|
|
- //更新开放平台 shish 2020.1.16
|
|
|
- public function actionUpdateOpen()
|
|
|
- {
|
|
|
- //各个环境开放平台的更新
|
|
|
- $env = getenv("YII_ENV");
|
|
|
- //花美灵
|
|
|
- if($env == 'dev'){
|
|
|
- $sql = "delete from `xhMerchant`;delete from `xhWxOpen`;";
|
|
|
- $sql .= "insert into `xhWxOpen`(`id`,`appId`,`openName`,`appSecret`,`merchantId`,`adminId`,`token`,`verifyTicket`,`verifyTicketTime`,`componentAccessToken`,`componentAccessTokenTime`,`aesKey`,`preAuthCode`,`preAuthCodeTime`,`createTime`,`updateTime`) values (1,'wxe4428cfe08fc74d6','花美灵','cdbcb1ea6bf2249b269c542c870bd96d',0,0,'XH11464743308','ticket@@@mUTfkCa6p-W5fIB_YvWDiSzUvsCVJNN6fELjsHnZ07Nvz5hfRMyfHzmjn3ZPK9Gi5aqY2_H7ruxnX2cdYdjRIg','2020-01-09 21:04:50','29_RQZoasQKtSPVa754Inhu3aKiAfou3KYGJT5SGtqWy74cHoL3aEfPt0xTR6JMuULyDN4-25fBDTE-VS_jtalbq6WTbb5d7B-K4dUSS3zDbKykNtctzFnBBnDzkbGRXcw2b8OS8JY_HHblIlFZTVLcAGAGIY','2020-01-09 21:36:26','Gm2BIikJaExAbiyafGoJGFbEsECb4mDEnyEYgl9WXW5','preauthcode@@@IJXez4FxmgNRLow1rmxhAxM2eaKQYY6g1ocsK8Koe4v9mx7mr07arTNZTLxe2Sf2','2019-12-19 16:13:58','2019-04-17 14:49:19','2020-01-09 12:54:50');";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
- }
|
|
|
- //花掌柜助手
|
|
|
- if($env == 'test'){
|
|
|
- $sql = "delete from `xhMerchant`;delete from `xhWxOpen`;";
|
|
|
- $sql .= "insert into `xhWxOpen`(`id`,`appId`,`openName`,`appSecret`,`merchantId`,`adminId`,`token`,`verifyTicket`,`verifyTicketTime`,`componentAccessToken`,`componentAccessTokenTime`,`aesKey`,`preAuthCode`,`preAuthCodeTime`,`createTime`,`updateTime`) values (1,'wx364800c320a0cf53','花掌柜助手','6a83bfa98f3ff5e66b1a85a19c54ebdb',0,0,'wt11464773309','ticket@@@mUTfkCa6p-W5fIB_YvWDiSzUvsCVJNN6fELjsHnZ07Nvz5hfRMyfHzmjn3ZPK9Gi5aqY2_H7ruxnX2cdYdjRIg','2020-01-09 21:04:50','29_RQZoasQKtSPVa754Inhu3aKiAfou3KYGJT5SGtqWy74cHoL3aEfPt0xTR6JMuULyDN4-25fBDTE-VS_jtalbq6WTbb5d7B-K4dUSS3zDbKykNtctzFnBBnDzkbGRXcw2b8OS8JY_HHblIlFZTVLcAGAGIY','2020-01-09 21:36:26','Gm2BIikJaExAbiyafGoJGFbEsECb4mDEnyEYgl9WXW5','preauthcode@@@IJXez4FxmgNRLow1rmxhAxM2eaKQYY6g1ocsK8Koe4v9mx7mr07arTNZTLxe2Sf2','2019-12-19 16:13:58','2019-04-17 14:49:19','2020-01-09 12:54:50');";
|
|
|
- Yii::$app->db->createCommand($sql)->execute();
|
|
|
- }
|
|
|
- }
|
|
|
+ //可以重复初始化的一些东西 shish 2020.1.21
|
|
|
+ public function actionRepeatInit()
|
|
|
+ {
|
|
|
+ $id = Yii::$app->request->get('id');
|
|
|
+ //初始化微信菜单
|
|
|
+ $merchant = xhMerchantService::getById($id);
|
|
|
+ xhWxMenuService::applyInit($merchant);
|
|
|
+ }
|
|
|
|
|
|
}
|
