From 12a1a30bedfc30b33d82eace8a7d8a3c3dba67ab Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 14 Sep 2020 11:27:41 +0800 Subject: [PATCH 1/3] cuser --- .../migration/V202009041200__commercialPreferential.sql | 6 ++++++ .../controller/WxMsgValidationcodeController.java | 1 + .../com/iformall/controller/WxUserGrantController.java | 1 + .../java/com/iformall/domain/vo/WxCouponChannelVo.java | 3 +++ .../src/main/java/com/iformall/mapper/WxCUserMapper.java | 3 +++ .../main/java/com/iformall/service/WxCUserService.java | 2 ++ .../com/iformall/service/impl/WxCUserServiceImpl.java | 5 +++++ .../src/main/resources/mapper/WxCUserMapper.xml | 9 +++++++++ .../src/main/resources/mapper/WxCouponChannelMapper.xml | 3 ++- 9 files changed, 32 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V202009041200__commercialPreferential.sql b/mallinkAdmin/src/main/resources/db/migration/V202009041200__commercialPreferential.sql index 05bd89902..82cf7c0b9 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202009041200__commercialPreferential.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202009041200__commercialPreferential.sql @@ -24,6 +24,12 @@ update wx_c_user_basic_info set tenant_id = concat(",",final_tenant_id,","); +ALTER TABLE `wx_c_user` +MODIFY COLUMN `tenant_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +MODIFY COLUMN `parent_tenant_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`, +MODIFY COLUMN `open_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信openId' AFTER `parent_tenant_id`, +MODIFY COLUMN `union_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信unionId' AFTER `open_id`, +MODIFY COLUMN `user_id` bigint(20) DEFAULT NULL COMMENT '用户ID' AFTER `active_time`; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java index 92c9f76a4..6cd669fae 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java @@ -87,6 +87,7 @@ public class WxMsgValidationcodeController extends BaseController { user.setVerifyCodePhone(phone); user.setUpdateDate(new Date()); wxCUserService.saveOrUpdate(user); + wxCUserService.delForUserIdOnly(user.getId(),user.getUserId(),user.getTenantId()); // wxCUserService.assureUserIdOnly(user.getId(),); wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_PHONE,user); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index b5b852c56..6c11c18c9 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -681,6 +681,7 @@ public class WxUserGrantController extends BaseController { user.setUserId(userBasicId); } wxCUserService.saveOrUpdate(user); + wxCUserService.delForUserIdOnly(user.getId(),user.getUserId(),user.getTenantId()); wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_PHONE, user); } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java index 34ae78199..aaf95abc9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java @@ -72,6 +72,9 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { @io.swagger.annotations.ApiModelProperty(value="内容类型(0:小程序页面类型,1:富文本类型)",name="contentType") private Integer contentType; + @TableField(exist = false) + private String detail; + @TableField(exist = false) private String salePriceStr; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java index 679bfe3d4..f92554c00 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java @@ -8,6 +8,7 @@ import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.base.BaseCUserEntity; import com.iformall.domain.vo.UserCountVo; +import org.apache.ibatis.annotations.Param; public interface WxCUserMapper extends CommonMapper { @@ -30,4 +31,6 @@ public interface WxCUserMapper extends CommonMapper { List> checkCountByTenantOpenId(); void updateUserId(WxCUser user); + + void delForUserIdOnly(@Param("id")Long id, @Param("userId")Long userId,@Param("tenantId")String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserService.java index a03887bb6..24d99ad84 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserService.java @@ -139,4 +139,6 @@ public interface WxCUserService { int addCredit(WxCUser wxCUser, EnumScoreType enumScoreType); void updateUserId(WxCUser user); + + void delForUserIdOnly(Long id, Long userId, String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java index d66d237b3..b2bbc1abc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java @@ -344,5 +344,10 @@ public class WxCUserServiceImpl implements WxCUserService { wxCUserMapper.updateUserId(user); } + @Override + public void delForUserIdOnly(Long id, Long userId, String tenantId) { + wxCUserMapper.delForUserIdOnly(id,userId,tenantId); + } + } diff --git a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml index 1120ec294..62f26e393 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml @@ -370,4 +370,13 @@ where id = #{id} + + update wx_c_user set update_date=now(), + tenant_id = IF(tenant_id is null ,null,CONCAT(tenant_id,"_del")), + parent_tenant_id = IF(parent_tenant_id is null ,null,CONCAT(parent_tenant_id,"_del")), + open_id = IF(open_id is null ,null,CONCAT(open_id,"_del")), + union_id = IF(union_id is null ,null,CONCAT(union_id,"_del")) + where user_id = #{userId} and tenant_id = #{tenantId} and id != #{id} + + diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 79a12e863..e47d3eba5 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -152,7 +152,7 @@ , - c.remain_inventory,c.inventory,c.cover_img,c.sub_title,c.sale_price, + c.remain_inventory,c.inventory,c.cover_img,c.sub_title,c.sale_price,c.detail, c.use_price,c.price,c.unit,c.use_limit_quantity,c.send_type,c.support_transfer,c.press_limit_num,c.auto_refund,c.conditions, c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.credit_price,c.content_type,c.source_type @@ -181,6 +181,7 @@ + From 2144d23c9afa7cad317bc698aa230221ae9b010c Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 14 Sep 2020 14:36:37 +0800 Subject: [PATCH 2/3] cuser --- .../basic/WxProjectConfigController.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java index 251e252c9..bfd1c2cb7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -285,30 +285,34 @@ public class WxProjectConfigController extends BaseController { wxAppinfoService.saveOrUpdate(wxAppinfo); - WxAuthorizerInfo wxAuthorizerInfo = new WxAuthorizerInfo(); + WxAuthorizerInfo wxAuthorizerInfo = wxAuthorizerInfoService.getByAppId(wxAppinfo.getAppId()); + if(wxAuthorizerInfo == null){ + wxAuthorizerInfo = new WxAuthorizerInfo(); + } wxAuthorizerInfo.updateTenantInfo(wxAppinfo); wxAuthorizerInfo.setType(wxAppinfo.getType()); wxAuthorizerInfo.setAuthorizerAppid(wxAppinfo.getAppId()); - if(wxAppinfo.getId() == null && wxAuthorizerInfo.getAuthorizationStatus() == null){ + + if(wxAuthorizerInfo.getAuthorizationStatus() == null){ wxAuthorizerInfo.setAuthorizationStatus(0);//授权状态,0为已授权,1为已取消授权 wxAuthorizerInfo.setAuthTime(new Date()); } - if(wxAppinfo.getId() == null && wxAuthorizerInfo.getBaseStatus() == null){ + if(wxAuthorizerInfo.getBaseStatus() == null){ wxAuthorizerInfo.setBaseStatus(0);//微信基础版本设置状态,0为已设置,1为设置失败 wxAuthorizerInfo.setBaseTime(new Date()); } - if(wxAppinfo.getId() == null && wxAuthorizerInfo.getDomainStatus() == null){ + if(wxAuthorizerInfo.getDomainStatus() == null){ wxAuthorizerInfo.setDomainStatus(0);//服务器域名设置状态,0为已设置,1为设置失败 wxAuthorizerInfo.setDomainTime(new Date()); } - if(wxAppinfo.getId() == null && wxAuthorizerInfo.getWebdomainStatus() == null){ + if(wxAuthorizerInfo.getWebdomainStatus() == null){ wxAuthorizerInfo.setWebdomainStatus(0);//服务器业务域名设置状态,0为已设置,1为设置失败 wxAuthorizerInfo.setWebdomainTime(new Date()); } - if(wxAppinfo.getId() == null && StringUtils.isBlank(wxAuthorizerInfo.getRefreshToken())){ + if(StringUtils.isBlank(wxAuthorizerInfo.getRefreshToken())){ wxAuthorizerInfo.setRefreshToken(""); } - if(wxAppinfo.getId() == null && StringUtils.isBlank(wxAuthorizerInfo.getAccessToken())){ + if(StringUtils.isBlank(wxAuthorizerInfo.getAccessToken())){ wxAuthorizerInfo.setAccessToken(""); } wxAuthorizerInfoService.saveOrUpdate(wxAuthorizerInfo); From 670164e36026d046d43c656e81a56b8940810ae4 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 14 Sep 2020 17:13:46 +0800 Subject: [PATCH 3/3] cuser --- .../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 afa22da10..b22a6e21b 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -1001,7 +1001,7 @@ left join wx_c_user cu on cubi.id=cu.user_id where cu.id is not null - and cubi.`tenant_id` like concat('%,', #{tenantInfo.tenantId},',%') + and cubi.`tenant_id` like concat('%,', #{tenantId},',%')