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

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

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
f5f001214e
4 измененных файлов: 17 добавлений и 17 удалений
  1. +11
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java
  2. +0
    -12
      mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
  4. +5
    -5
      mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml

+ 11
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java Просмотреть файл

@@ -32,6 +32,17 @@ public class WxCUserBasicInfo extends TenantEntityWithoutFinalTenantId {
@io.swagger.annotations.ApiModelProperty(value="如果是集团版的,存集团版的tenantId,如果是商场,则存商场",name="sex")
private String finalTenantId;

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

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

@Excel(name="姓名",width = 20,orderNum = "1")
@NotNull
@io.swagger.annotations.ApiModelProperty(value="用户姓名",name="name")


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

@@ -27,10 +27,6 @@ public class TenantEntity extends BaseEntity {
@TableField(exist = false)
protected String shardTableSuffix;

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

public void updateTenantInfo(TenantEntity info) {
setTenantId(info.getTenantId());
setParentTenantId(null);
@@ -62,14 +58,6 @@ public class TenantEntity extends BaseEntity {
}
return shardTableSuffix;
}

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


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

@@ -1279,6 +1279,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
// }else{
// basicInfo.undateFinalTenantId(tenantInfo);
// }

list = wxCUserBasicInfoMapper.findVoList1(tenantInfo,basicInfo);
if (null == list || list.size() <= 0 ) {
return null;


+ 5
- 5
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${tenantEntity.shardFinalTableSuffix} credit
where credit.`tenant_id` = #{tenantInfo.finalTenantId}
,(select ifnull(sum(credit.credit_num),0) amount from wx_credit_history${basicInfo.shardFinalTableSuffix} credit
where credit.`tenant_id` = #{basicInfo.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${tenantEntity.shardFinalTableSuffix} credit
where credit.`tenant_id` = #{tenantInfo.finalTenantId}
(select ifnull(sum(credit.credit_num),0) amount from wx_credit_history${basicInfo.shardFinalTableSuffix} credit
where credit.`tenant_id` = #{basicInfo.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}
@@ -841,7 +841,7 @@
and credit.create_date &lt; #{basicInfo.creditEndTime}
</if>) as lesCredit
from wx_c_user_basic_info cu
left join wx_c_user_tags cut on cut.`id` = cu.`tag_id`
left join wx_c_user_tags${basicInfo.shardFinalTableSuffix} cut on cut.`id` = cu.`tag_id`
<include refid="dynamicVoWhereConditions1"/>
<if test=" null != basicInfo.begin ">
limit #{basicInfo.begin}, #{basicInfo.limit}


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