Просмотр исходного кода

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
1d1d8b90ac
7 измененных файлов: 59 добавлений и 38 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java
  2. +22
    -11
      mallinkAdmin/src/main/resources/db/migration/V202012230001__wx_credit_clear.sql
  3. +6
    -6
      mallinkAdmin/src/main/resources/db/migration/V202012300001__wx_tag.sql
  4. +15
    -5
      mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java
  5. +6
    -6
      mallinkService/src/main/java/com/iformall/enums/EnumTag.java
  6. +5
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
  7. +4
    -4
      mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java Просмотреть файл

@@ -367,7 +367,7 @@ public class WxCUserBasicInfoController extends BaseController {
}

basicInfo.undateFinalTenantId(ifParentUpdateTenantInfo());
wxCUserBasicInfoService.exportData(ifParentUpdateTenantInfo(),basicInfo, request, response);
wxCUserBasicInfoService.exportData(getTenantInfo(),basicInfo, request, response);
}

@RequestMapping("/exportTemplate")


+ 22
- 11
mallinkAdmin/src/main/resources/db/migration/V202012230001__wx_credit_clear.sql Просмотреть файл

@@ -1,12 +1,23 @@
CREATE DEFINER=`root`@`%` PROCEDURE `user_credit_clear`(IN `cutOffDate` VARCHAR(50),IN `finalTableIndex` VARCHAR(50))
CREATE PROCEDURE `user_credit_clear`(IN `cutOffDate` VARCHAR(50),IN `finalTableIndex` VARCHAR(50))
BEGIN
DECLARE done INT DEFAULT 0;
DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET done = -1;
select concat(finalTableIndex,'_',date_format(now(),'%Y%m%d%H%i')) into @tableSuffix;

set @n = 100000;

#START TRANSACTION;

set @backUpSqlb_0 = concat('create table wx_c_user_basic_info',finalTableIndex,@tableSuffix,' like wx_c_user_basic_info',finalTableIndex,';');
PREPARE back_up_sqlb_0 FROM @backUpSqlb_0;
EXECUTE back_up_sqlb_0;
DEALLOCATE PREPARE back_up_sqlb_0;
set @backUpSqlb_1 = concat('insert into wx_c_user_basic_info',finalTableIndex,@tableSuffix,' select * from wx_c_user_basic_info',finalTableIndex,';');
PREPARE back_up_sqlb_1 FROM @backUpSqlb_1;
EXECUTE back_up_sqlb_1;
DEALLOCATE PREPARE back_up_sqlb_1;

set @backUpSql1_0 = concat('CREATE TABLE `wx_credit_clear_md',@tableSuffix,'` ('
,'`id` bigint(20) NOT NULL,'
,'`user_id` bigint(20) DEFAULT NULL,'
@@ -20,24 +31,24 @@ BEGIN
PREPARE back_up_sql1_0 FROM @backUpSql1_0;
EXECUTE back_up_sql1_0;
DEALLOCATE PREPARE back_up_sql1_0;
INSERT into zz_process_log VALUES(NOW(),'user_credit_clear()','创建积分清零数据处理备份表',@backUpSql1_0);
set @backUpSql1_1 = concat('insert into `wx_credit_clear_md',@tableSuffix,'`'
,'(`id`, `user_id`, `final_tenant_id`, `credit`, `sum_credit`, `credit_amount`, `cut_off_date`)'
,' select (select unix_timestamp(now()) + CEILING(RAND()*90000+10000)) id,wcubi.id user_id,wcubi.final_tenant_id,wcubi.credit,ifnull(wch.sum_credit,0) sum_credit,(ifnull(wch.sum_credit,0)-wcubi.credit) credit_amount,\'',cutOffDate,'\''
,' select concat(date_format(now(),\'%Y%m\'),FLOOR(RAND()*1000000),(@n := @n + 1)) id,wcubi.id user_id,wcubi.final_tenant_id,wcubi.credit,ifnull(wch.sum_credit,0) sum_credit,(ifnull(wch.sum_credit,0)-wcubi.credit) credit_amount,\'',cutOffDate,'\''
,' from wx_c_user_basic_info',finalTableIndex,' wcubi'
,' left join (select c_user_id,sum(credit_num) sum_credit from wx_credit_history',finalTableIndex,' where credit_num > 0 and create_date >= \'',cutOffDate,'\' group by c_user_id) wch on wch.c_user_id = wcubi.id'
,' where wcubi.credit > ifnull(wch.sum_credit,0);');
PREPARE back_up_sql1_1 FROM @backUpSql1_1;
EXECUTE back_up_sql1_1;
DEALLOCATE PREPARE back_up_sql1_1;
INSERT into zz_process_log VALUES(NOW(),'user_credit_clear()','添加积分清零数据处理',@backUpSql1_1);
set @backUpSql1_2 = concat('insert into `wx_credit_history',finalTableIndex,'`'
,'(`id`, `tenant_id`, `c_user_id`, `credit_amount`, `credit_num`, `credit_type`, `create_date`, `operator_type`, `operator_id`) '
,'select id,final_tenant_id,user_id,sum_credit,credit_amount,14,now(),4,0'
,'(`id`, `tenant_id`, `c_user_id`, `credit_amount`, `credit_num`, `credit_type`, `create_date`, `operator_type`, `operator_id`, `change_purpose`) '
,'select id,final_tenant_id,user_id,sum_credit,credit_amount,14,now(),4,0,\'积分清零计划\''
,' from `wx_credit_clear_md',@tableSuffix,'`;');
PREPARE back_up_sql1_2 FROM @backUpSql1_2;
EXECUTE back_up_sql1_2;


+ 6
- 6
mallinkAdmin/src/main/resources/db/migration/V202012300001__wx_tag.sql Просмотреть файл

@@ -1,8 +1,8 @@
INSERT INTO `wx_tags_type`(`id`, `name`, `group_id`, `group_name`, `flag`) VALUES (29, '子女', 2, '生活属性', 0);

INSERT INTO `wx_tags`(`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES (166, '婴儿', 2, '生活属性', 29, '子女');
INSERT INTO `wx_tags`(`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES (167, '幼儿', 2, '生活属性', 29, '子女');
INSERT INTO `wx_tags`(`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES (168, '学龄前', 2, '生活属性', 29, '子女');
INSERT INTO `wx_tags`(`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES (169, '学龄初', 2, '生活属性', 29, '子女');
INSERT INTO `wx_tags`(`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES (170, '学龄中', 2, '生活属性', 29, '子女');
INSERT INTO `wx_tags`(`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES (171, '学龄晚', 2, '生活属性', 29, '子女');
INSERT INTO `wx_tags`(`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES (166, '婴儿(0-1岁)', 2, '生活属性', 29, '子女');
INSERT INTO `wx_tags`(`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES (167, '幼儿(1-3岁)', 2, '生活属性', 29, '子女');
INSERT INTO `wx_tags`(`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES (168, '学龄前(3-6岁)', 2, '生活属性', 29, '子女');
INSERT INTO `wx_tags`(`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES (169, '学龄初(6-12岁)', 2, '生活属性', 29, '子女');
INSERT INTO `wx_tags`(`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES (170, '学龄中(12-15岁)', 2, '生活属性', 29, '子女');
INSERT INTO `wx_tags`(`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES (171, '学龄晚(15-18岁)', 2, '生活属性', 29, '子女');

+ 15
- 5
mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java Просмотреть файл

@@ -1,12 +1,10 @@
package com.iformall.domain.po.base;

import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.StringUtils;

import com.iformall.domain.po.WxCUserBasicInfo;

/**
* @author Stormeye
* @date 2019/4/24 14:32
@@ -25,9 +23,14 @@ public class TenantEntity extends BaseEntity {
@TableField(exist = false)
protected String finalTenantId;

@JsonIgnore
@TableField(exist = false)
protected String shardTableSuffix;

@JsonIgnore
@TableField(exist = false)
protected String shardFinalTableSuffix;

public void updateTenantInfo(TenantEntity info) {
setTenantId(info.getTenantId());
setParentTenantId(null);
@@ -54,11 +57,18 @@ public class TenantEntity extends BaseEntity {
}

public String getShardTableSuffix() {
if(StringUtils.isNotBlank(tenantId)){
shardTableSuffix = "_" + Integer.parseInt(this.getTenantId())%100;
if(StringUtils.isNotBlank(getTenantId())){
shardTableSuffix = "_" + Integer.parseInt(getTenantId())%100;
}
return shardTableSuffix;
}

public String getShardFinalTableSuffix(){
if(StringUtils.isNotBlank(getFinalTenantId())){
shardFinalTableSuffix = "_" + Integer.parseInt(getFinalTenantId())%100;
}
return shardFinalTableSuffix;
}
public String getTenantId() {


+ 6
- 6
mallinkService/src/main/java/com/iformall/enums/EnumTag.java Просмотреть файл

@@ -204,12 +204,12 @@ public enum EnumTag {
ID_164(164L, EnumTagType.ID_28, "鞋尺码"),
ID_165(165L, EnumTagType.ID_28, "鞋尺码"),

ID_166(166L, EnumTagType.ID_29, "婴儿"),
ID_167(167L, EnumTagType.ID_29, "幼儿"),
ID_168(168L, EnumTagType.ID_29, "学龄前"),
ID_169(169L, EnumTagType.ID_29, "学龄初"),
ID_170(170L, EnumTagType.ID_29, "学龄中"),
ID_171(171L, EnumTagType.ID_29, "学龄晚"),
ID_166(166L, EnumTagType.ID_29, "婴儿(0-1岁)"),
ID_167(167L, EnumTagType.ID_29, "幼儿(1-3岁)"),
ID_168(168L, EnumTagType.ID_29, "学龄前(3-6岁)"),
ID_169(169L, EnumTagType.ID_29, "学龄初(6-12岁)"),
ID_170(170L, EnumTagType.ID_29, "学龄中(12-15岁)"),
ID_171(171L, EnumTagType.ID_29, "学龄晚(15-18岁)"),

ID_1000(1000L, EnumTagType.ID_50,"一天以内"),
ID_1001(1001L, EnumTagType.ID_50,"一周以内"),


+ 5
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java Просмотреть файл

@@ -1274,11 +1274,11 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
List<WxCUserBasicInfoVo> list = new ArrayList<WxCUserBasicInfoVo>();
basicInfo.setBegin((page-1)*10000);
basicInfo.setLimit(10000);
if(StringUtils.isNotBlank(tenantInfo.getParentTenantId())){
//list = wxCUserBasicInfoMapper.findVoList1(tenantInfo,basicInfo);
}else{
basicInfo.undateFinalTenantId(tenantInfo);
}
// if(StringUtils.isNotBlank(tenantInfo.getParentTenantId())){
// //list = wxCUserBasicInfoMapper.findVoList1(tenantInfo,basicInfo);
// }else{
// basicInfo.undateFinalTenantId(tenantInfo);
// }
list = wxCUserBasicInfoMapper.findVoList1(tenantInfo,basicInfo);
if (null == list || list.size() <= 0 ) {
return null;


+ 4
- 4
mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml Просмотреть файл

@@ -822,8 +822,8 @@
<select id="findVoList1" resultMap="VoBaseResultMap">
select
<include refid="allVoColumns"/>
,(select ifnull(sum(credit.credit_num),0) amount from wx_credit_history credit
where credit.`tenant_id` = #{tenantInfo.tenantId}
,(select ifnull(sum(credit.credit_num),0) amount from wx_credit_history${tenantEntity.shardFinalTableSuffix} credit
where credit.`tenant_id` = #{tenantInfo.finalTenantId}
and credit.credit_num &gt; 0 and credit.c_user_id = cu.id
<if test=" null != basicInfo.creditStartTime ">
and credit.create_date &gt;= #{basicInfo.creditStartTime}
@@ -831,8 +831,8 @@
<if test=" null != basicInfo.creditEndTime">
and credit.create_date &lt; #{basicInfo.creditEndTime}
</if>) as addCredit,
(select ifnull(sum(credit.credit_num),0) amount from wx_credit_history credit
where credit.`tenant_id` = #{tenantInfo.tenantId}
(select ifnull(sum(credit.credit_num),0) amount from wx_credit_history${tenantEntity.shardFinalTableSuffix} credit
where credit.`tenant_id` = #{tenantInfo.finalTenantId}
and credit.credit_num &lt; 0 and credit.c_user_id = cu.id
<if test=" null != basicInfo.creditStartTime ">
and credit.create_date &gt;= #{basicInfo.creditStartTime}


Загрузка…
Отмена
Сохранить