From 051535effeacd4d8e267de1644117f84360d3aee Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 17 Jun 2021 17:25:23 +0800 Subject: [PATCH] tt --- .../src/main/resources/db/migration/V202105270001__tt_add_.sql | 3 +++ .../java/com/iformall/service/impl/WxMerchantServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V202105270001__tt_add_.sql b/mallinkAdmin/src/main/resources/db/migration/V202105270001__tt_add_.sql index fb1f04f58..3fb34d93b 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202105270001__tt_add_.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202105270001__tt_add_.sql @@ -14,3 +14,6 @@ UPDATE wx_merchant SET entry_amount = 0 ; ALTER TABLE `wx_merchant` ADD COLUMN `mark_time` datetime(0) COMMENT '记号时间' AFTER `mark`; + +ALTER TABLE `mall_user_info` +ADD COLUMN `merchant_id` bigint(20) AFTER `email`; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 17e0af30d..85479bb4a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -1128,7 +1128,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public ResultData ttstartusing(Long id) { WxMerchant wxMerchant = wxMerchantMapper.selectById(id); - if (wxMerchant == null || wxMerchant.getStatus().equals(EnumYesOrNo.NO.getCode())) { + if (wxMerchant == null || wxMerchant.getStatus().equals(EnumYesOrNo.YES.getCode())) { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"作者信息未找到或者已启用"); } WxMerchant disableMerchant = new WxMerchant();