Browse Source

bug

release_toaliyun_real
xhxu 5 years ago
parent
commit
3929eebf91
3 changed files with 5 additions and 15 deletions
  1. +5
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  2. +0
    -8
      mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml
  3. +0
    -6
      mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml

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

@@ -220,7 +220,11 @@ public class WxMerchantServiceImpl implements WxMerchantService {
} }


WxLevelConfig wxLevelConfig = new WxLevelConfig(); WxLevelConfig wxLevelConfig = new WxLevelConfig();
wxLevelConfig.setTenantId(wxMerchant.getTenantId());
if(StringUtils.isNotBlank(wxMerchant.getParentTenantId())){
wxLevelConfig.setTenantId(wxMerchant.getParentTenantId());
}else{
wxLevelConfig.setTenantId(wxMerchant.getTenantId());
}
wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC);
wxMerchant.setLevelConfigList(wxLevelConfigService.listByMerchantId(wxMerchant.getId(),wxLevelConfig)); wxMerchant.setLevelConfigList(wxLevelConfigService.listByMerchantId(wxMerchant.getId(),wxLevelConfig));




+ 0
- 8
mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml View File

@@ -179,14 +179,6 @@
<select id="loginCount" parameterType="com.iformall.domain.po.WxCreditHistory" resultType="java.lang.Integer"> <select id="loginCount" parameterType="com.iformall.domain.po.WxCreditHistory" resultType="java.lang.Integer">
select COUNT(0) from wx_credit_history select COUNT(0) from wx_credit_history
where 1=1 where 1=1
<choose>
<when test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</when>
<otherwise>
and `tenant_id` = #{tenantId}
</otherwise>
</choose>
<if test=" null != cUserId "> <if test=" null != cUserId ">
and `c_user_id` = #{cUserId} and `c_user_id` = #{cUserId}
</if> </if>


+ 0
- 6
mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml View File

@@ -91,12 +91,6 @@
select count(*) select count(*)
from wx_score_history from wx_score_history
where 1=1 where 1=1
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != cUserId "> <if test=" null != cUserId ">
and `c_user_id` = #{cUserId} and `c_user_id` = #{cUserId}
</if> </if>


Loading…
Cancel
Save