From 7d6c41813903ec5fb9b80097d3d7c77a417f3b6a Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 7 Aug 2020 18:59:19 +0800 Subject: [PATCH 1/5] bug --- mallinkService/src/main/resources/mapper/WxCUserMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml index a9d3db838..ec8914b7e 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml @@ -251,7 +251,7 @@ From 952281fee0e578eb70267ec4d3bcb8ab7708941f Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 7 Aug 2020 19:08:38 +0800 Subject: [PATCH 2/5] bug --- .../com/iformall/controller/WxMsgValidationcodeController.java | 2 +- .../main/java/com/iformall/controller/WxPayOrderController.java | 2 +- .../java/com/iformall/controller/WxUserGrantController.java | 2 +- .../java/com/iformall/interceptor/AuthorizationInterceptor.java | 2 +- .../main/java/com/iformall/domain/po/base/BaseCUserEntity.java | 2 +- .../service/pay/wx/miniApp/maPay/WxMiniMaPayAdapterService.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java index 433562efa..a301f36c0 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java @@ -75,7 +75,7 @@ public class WxMsgValidationcodeController extends BaseController { if (rd.code == Result.SUCCESS) { // 更新到basicinfo Long userId = user.getId(); - if (user.isBasicInfo()) { + if (user.basicInfoIs()) { userId = user.getUserId(); } Long basicUserId = saveToBasicInfoByCUser(phone, user.getNickName(), user.getAvatarUrl(), user.getGender(), userId); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java index 0521a7fc7..131a60585 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java @@ -89,7 +89,7 @@ public class WxPayOrderController extends BaseController { } WxCUser user = getWxCUser(); - if (!user.isBasicInfo()) { + if (!user.basicInfoIs()) { logger.error("暂未成为会员,请授权手机号"); return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 2cf94050a..a340ea9b3 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -767,7 +767,7 @@ public class WxUserGrantController extends BaseController { org.springframework.beans.BeanUtils.copyProperties(user, userVo); userVo.setScore(0); userVo.setCredit(0); - if(user.isBasicInfo()){ + if(user.basicInfoIs()){ WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(user.getUserId()); if (wxCUserBasicInfo != null) { userVo.setScore(wxCUserBasicInfo.getPoins()); diff --git a/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java b/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java index 50d904222..85db661bd 100644 --- a/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java +++ b/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java @@ -70,7 +70,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { if (StringUtils.isNotBlank(cUser.getParentTenantId())) { request.setAttribute(Constant.PARENT_TENANT_ID, cUser.getParentTenantId()); } - if(cUser.isBasicInfo()){ + if(cUser.basicInfoIs()){ request.setAttribute(Constant.LOGIN_MEMBER_KEY, cUser.getUserId()); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseCUserEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseCUserEntity.java index 5070f5602..a4d014d35 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseCUserEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseCUserEntity.java @@ -32,7 +32,7 @@ public class BaseCUserEntity extends TenantEntity { * 是否是会员 * @return */ - public boolean isBasicInfo() { + public boolean basicInfoIs() { return UserUtil.CuserIsBasicInfo(this.getUserId()); } } diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/miniApp/maPay/WxMiniMaPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/miniApp/maPay/WxMiniMaPayAdapterService.java index d5fb35713..6e14cc60a 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/miniApp/maPay/WxMiniMaPayAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/miniApp/maPay/WxMiniMaPayAdapterService.java @@ -233,7 +233,7 @@ public class WxMiniMaPayAdapterService extends BaseWxPayAdapterService implement throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(), "微信扫码支付添加微信C端用户失败"); } }else { - if (user1.isBasicInfo()) { + if (user1.basicInfoIs()) { userId = user1.getUserId(); } } From 38f7899a82fdad62e1570cadec75396d6303e712 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 7 Aug 2020 19:22:16 +0800 Subject: [PATCH 3/5] bug --- .../src/main/resources/mapper/WxCUserBasicInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index d9abde672..76e504f52 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -1039,7 +1039,7 @@ - SELECT count(distinct cubi.id) FROM wx_c_user_basic_info cubi left join wx_c_user cu on cubi.id=cu.user_id where cu.id is not null From dcdb2f249f217c91089df0509845765c37dbd86e Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 7 Aug 2020 19:31:15 +0800 Subject: [PATCH 4/5] bug --- .../src/main/resources/mapper/WxCUserBasicInfoMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 76e504f52..d12e56a43 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -1011,8 +1011,8 @@ SELECT count(distinct cubi.id) FROM wx_c_user_basic_info cubi - left join wx_c_user cu on cubi.id=cu.user_id where cu.id is null - where 1=1 + left join wx_c_user cu on cubi.id=cu.user_id + where cu.id is null and cu.`tenant_id` = #{tenantId} From 40f75974d820354b4c2da67c315f4368be3bf52c Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 10 Aug 2020 12:00:34 +0800 Subject: [PATCH 5/5] sql --- .../migration/V202007311142__GROUP__ADD_002.sql | 8 +++++++- .../V202007311200__FOR_MEMBER_ONLY_001.sql | 17 ++++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V202007311142__GROUP__ADD_002.sql b/mallinkAdmin/src/main/resources/db/migration/V202007311142__GROUP__ADD_002.sql index 9724e942a..635e2da0f 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202007311142__GROUP__ADD_002.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202007311142__GROUP__ADD_002.sql @@ -1,4 +1,4 @@ -update mall_sale_type set menus = '[1, 2, 5, 6, 8, 10, 50, 101, 102, 104, 105, 106, 108, 203, 204, 206, 207, 501, 502, 503, 504, 509, 591, 595, 601, 621, 622, 623, 624, 625, 626, 627, 901, 902]' where id=100 +update mall_sale_type set menus = '[1, 2, 5, 6, 8, 10, 50, 101, 102, 104, 105, 106, 108, 203, 204, 206, 207, 501, 502, 503, 504, 505, 506, 507, 511, 512, 522, 523, 509, 591, 595, 601, 621, 622, 623, 624, 625, 626, 627, 901, 902]' where id=100 CREATE DEFINER=`root`@`%` PROCEDURE `init_after_group`(IN tenantId VARCHAR(25),IN subTenantIds VARCHAR(250)) @@ -32,3 +32,9 @@ BEGIN COMMIT; END IF; END; + + +--两张表做手动初始化 +--wx_c_user_basic_info ---final_tenant_id +--wx_c_user_tags ---tenant_id(同final_tenant_id) +---------- diff --git a/mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql b/mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql index d4730c5b0..20ee18f6c 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql @@ -7,24 +7,33 @@ update `wx_c_user` set user_id = id where id in (select id from wx_c_user_basic_ ALTER TABLE `wx_c_user_basic_info` ADD COLUMN `final_tenant_id` varchar(5) NOT NULL COMMENT '归属租户ID' AFTER `parent_tenant_id`; -DROP INDEX `PHONE_UNIQUE`, -ADD UNIQUE INDEX `PHONE_UNIQUE`(`final_tenant_id`, `phone`) USING BTREE; - update wx_c_user_basic_info set final_tenant_id = parent_tenant_id; update wx_c_user_basic_info set final_tenant_id = tenant_id where (parent_tenant_id is null or trim(parent_tenant_id) = ""); +DROP INDEX `PHONE_UNIQUE`, +ADD UNIQUE INDEX `PHONE_UNIQUE`(`final_tenant_id`, `phone`) USING BTREE; + ALTER TABLE `wx_c_user_basic_info` ADD COLUMN `login_count` int(11) DEFAULT 0 COMMENT '登陆次数' AFTER `active_time`; update wx_c_user_basic_info wcubi set wcubi.login_count = (select wcu.login_count from wx_c_user wcu where wcu.id=wcubi.id); + ALTER TABLE `wx_c_user_basic_info` ADD COLUMN `avatar_url` VARCHAR(225) DEFAULT 0 COMMENT '头像地址' AFTER `nick_name`; update wx_c_user_basic_info wcubi set wcubi.avatar_url = (select wcu.avatar_url from wx_c_user wcu where wcu.id=wcubi.id); +ALTER TABLE `wx_c_user_basic_info` +MODIFY COLUMN `phone` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '微信用户绑定的手机号' AFTER `final_tenant_id`; + +ALTER TABLE `wx_c_user_basic_info` +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '租户ID' AFTER `id`; + + + ALTER TABLE `wx_coupon_order` ADD COLUMN `pay_vendor` SMALLINT(3) NOT NULL DEFAULT 1 COMMENT '订单渠道,EnumPayWay.class'; @@ -41,7 +50,5 @@ ADD COLUMN `plat` SMALLINT(3) NOT NULL DEFAULT 1 COMMENT 'app平台 1:微信 2: ALTER TABLE `wx_profit_sharing_receiver` ADD COLUMN `plat` SMALLINT(3) NOT NULL DEFAULT 1 COMMENT '平台 1:微信 2:阿里 3:头条'; -update mall_sale_type set menus = '[1, 2, 5, 6, 8, 10, 50, 101, 102, 104, 105, 106, 108, 203, 204, 206, 207, 501, 502, 503, 504, 505, 506, 507, 511, 512, 522, 523, 509, 591, 595, 601, 621, 622, 623, 624, 625, 626, 627, 901, 902]' where id=100 -