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

fix wx_c_user_basic_info

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
cff456ae44
5 измененных файлов: 17 добавлений и 13 удалений
  1. +3
    -3
      mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java
  3. +5
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  5. +7
    -5
      mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml

+ 3
- 3
mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java Просмотреть файл

@@ -64,12 +64,12 @@ public interface WxCUserBasicInfoMapper extends CommonMapper<WxCUserBasicInfo, S


long findGrowUserCount(@Param("finalTenantId")String finalTenantId);
long findGrowUserCount1(@Param("tenantId")String tenantId,@Param("parentTenantId")String parentTenantId);
long findGrowUserCount1(@Param("tenantId")String tenantId,@Param("finalTenantId")String finalTenantId);

//long findImportUserCount(@Param("finalTenantId")String finalTenantId);
//long findImportUserCount1(@Param("tenantId")String tenantId,@Param("parentTenantId")String parentTenantId);

void incActRecordById(Long id);
void incActRecordById(@Param("id")Long id,@Param("finalTenantId")String finalTenantId);

/**
* 查找wx_c_user中不存在的用户
@@ -77,7 +77,7 @@ public interface WxCUserBasicInfoMapper extends CommonMapper<WxCUserBasicInfo, S
*/
// List<WxCUserBasicInfo> selectNotCUserList();

void cuserOldToNew(@Param(value = "oldCuserId")Long oldCuserId, @Param(value = "newCuserId")Long newCuserId);
void cuserOldToNew(@Param(value = "oldCuserId")Long oldCuserId, @Param(value = "newCuserId")Long newCuserId,@Param("tableIndex")Integer tableIndex);

}


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

@@ -169,6 +169,6 @@ public interface WxCUserBasicInfoService {

List<WxCUserBasicInfo> findBirthdayList(TenantEntity tenantEntity, String format, String format1);

void cuserOldToNew(Long oldCuserId, Long newCuserId);
void cuserOldToNew(Long oldCuserId, Long newCuserId,TenantEntity tenantinfo);
}


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

@@ -1142,7 +1142,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
public long findGrowUserCount(TenantEntity tenantEntity) {
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){
//关联微信表查询
return wxCUserBasicInfoMapper.findGrowUserCount1(tenantEntity.getTenantId(),tenantEntity.getParentTenantId());
return wxCUserBasicInfoMapper.findGrowUserCount1(tenantEntity.getTenantId(),tenantEntity.getFinalTenantId());
}else{
//直接查询本表
String finalTenantId = tenantEntity.getTenantId();
@@ -1214,8 +1214,10 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
}

@Override
public void cuserOldToNew(Long oldCuserId, Long newCuserId) {
wxCUserBasicInfoMapper.cuserOldToNew(oldCuserId,newCuserId);
public void cuserOldToNew(Long oldCuserId, Long newCuserId,TenantEntity tenantinfo) {
String finalTenantId = tenantinfo.getFinalTenantId();
Integer tableIndex = Integer.parseInt(String.valueOf(Long.parseLong(finalTenantId)%100));
wxCUserBasicInfoMapper.cuserOldToNew(oldCuserId,newCuserId,tableIndex);
}

@Override


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

@@ -1416,7 +1416,7 @@ public class WxOrderServiceImpl implements WxOrderService {
}
if (jo != null) {
if (jo.getIntValue("type") == EnumCouponConditionType.NEW_MEMBER.getCode()) {
wxCUserBasicInfoMapper.incActRecordById(basicUser.getId());
wxCUserBasicInfoMapper.incActRecordById(basicUser.getId(),coupon.getFinalTenantId());
}
}



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

@@ -1021,8 +1021,9 @@

<select id="findGrowUserCount" resultType="java.lang.Long">
SELECT count(distinct cubi.id) FROM wx_c_user_basic_info cubi
left join wx_c_user cu on cubi.id=cu.user_id
where cu.id is not null
<!-- left join wx_c_user cu on cubi.id=cu.user_id
where cu.id is not null -->
where 1 =1
<if test=" null != finalTenantId and '' != finalTenantId">
and cubi.`final_tenant_id` = #{finalTenantId}
</if>
@@ -1030,15 +1031,16 @@

<select id="findGrowUserCount1" resultType="java.lang.Long">
SELECT count(distinct cubi.id) FROM wx_c_user_basic_info cubi
left join wx_c_user cu on cubi.id=cu.user_id
where cu.id is not null
<!-- left join wx_c_user cu on cubi.id=cu.user_id
where cu.id is not null -->
where final_tenant_id = #{finalTenantId}
<if test=" null != tenantId and '' != tenantId">
and cubi.`tenant_id` like concat('%,', #{tenantId},',%')
</if>
</select>

<update id="incActRecordById" parameterType="java.lang.Long">
UPDATE wx_c_user_basic_info set act_record = act_record +1 where id = #{id}
UPDATE wx_c_user_basic_info set act_record = act_record +1 where id = #{id} and final_tenant_id = #{finalTenantId}
</update>

<!--<select id="selectNotCUserList" resultMap="BaseResultMap">


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