Browse Source

cuser

release_toaliyun_real
xhxu 5 years ago
parent
commit
2380319f3d
4 changed files with 25 additions and 15 deletions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java
  2. +15
    -5
      mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java
  3. +5
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
  4. +4
    -4
      mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java View File

@@ -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")


+ 15
- 5
mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java View File

@@ -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() {


+ 5
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java View File

@@ -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 View File

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


Loading…
Cancel
Save