Преглед изворни кода

cuser

release_toaliyun_real
xhxu пре 5 година
родитељ
комит
3424dc815f
3 измењених фајлова са 15 додато и 16 уклоњено
  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. +4
    -4
      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") @io.swagger.annotations.ApiModelProperty(value="如果是集团版的,存集团版的tenantId,如果是商场,则存商场",name="sex")
private String finalTenantId; private String finalTenantId;


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

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

@Excel(name="姓名",width = 20,orderNum = "1") @Excel(name="姓名",width = 20,orderNum = "1")
@NotNull @NotNull
@io.swagger.annotations.ApiModelProperty(value="用户姓名",name="name") @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) @TableField(exist = false)
protected String shardTableSuffix; protected String shardTableSuffix;


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

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

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


+ 4
- 4
mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml Прегледај датотеку

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


Loading…
Откажи
Сачувај