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 @@ +